TGS Test Merge (#8049)

code/game/objects/effects/decals/cleanable/cleanable.dm

@@ -19,6 +19,8 @@ GLOBAL_LIST_EMPTY(cleanable_decal_cache)
 	 */
 	var/cleaned_up = FALSE
 
+	keep_as_object = TRUE
+
 	garbage = TRUE
 
 /obj/effect/decal/cleanable/Initialize(mapload, ...)

code/game/objects/effects/decals/decal.dm

@@ -0,0 +1,32 @@
+//decal parent
+
+/obj/effect/decal
+	name = "you should not be seeing this!"
+	layer = TURF_LAYER
+	plane = FLOOR_PLANE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	var/keep_as_object = FALSE
+
+/obj/effect/decal/Initialize()
+	. = ..()
+	if(keep_as_object)
+		return
+
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/effect/decal/LateInitialize()
+	. = ..()
+	var/turf/applied_turf = get_turf(src)
+
+	if(!applied_turf)
+		qdel(src)
+		return
+	var/image/overlay = image(icon, icon_state = icon_state, dir = dir)
+	if(pixel_x)
+		overlay.pixel_x = pixel_x
+	if(pixel_y)
+		overlay.pixel_y = pixel_y
+	if(color)
+		overlay.color = color
+	applied_turf.overlays += overlay
+	qdel(src)

code/game/objects/effects/decals/hybrisa_decals.dm

@@ -9,215 +9,215 @@
 
 //Roadlines
 
-/obj/effect/hybrisa/decal/road
+/obj/effect/decal/hybrisa/road
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_W1"
-/obj/effect/hybrisa/decal/road/lines1
+/obj/effect/decal/hybrisa/road/lines1
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_W1"
-/obj/effect/hybrisa/decal/road/lines2
+/obj/effect/decal/hybrisa/road/lines2
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_N2"
-/obj/effect/hybrisa/decal/road/lines3
+/obj/effect/decal/hybrisa/road/lines3
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_S3"
-/obj/effect/hybrisa/decal/road/lines4
+/obj/effect/decal/hybrisa/road/lines4
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_E4"
-/obj/effect/hybrisa/decal/road/lines5
+/obj/effect/decal/hybrisa/road/lines5
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_M1"
-/obj/effect/hybrisa/decal/road/lines6
+/obj/effect/decal/hybrisa/road/lines6
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_M2"
-/obj/effect/hybrisa/decal/road/corner
+/obj/effect/decal/hybrisa/road/corner
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_corner"
-/obj/effect/hybrisa/decal/road/roadmiddle
+/obj/effect/decal/hybrisa/road/roadmiddle
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "roadlinesmiddle"
 
 
 // Dam Roadlines smaller
-/obj/effect/hybrisa/decal/road/road_edge
+/obj/effect/decal/hybrisa/road/road_edge
 	name = "road"
 	icon_state = "road_edge_decal1"
-/obj/effect/hybrisa/decal/road/road_stop
+/obj/effect/decal/hybrisa/road/road_stop
 	name = "road"
 	icon_state = "stop_decal1"
 
 // Double Roadlines
-/obj/effect/hybrisa/decal/doubleroad
+/obj/effect/decal/hybrisa/doubleroad
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "ZD_W1"
-/obj/effect/hybrisa/decal/doubleroad/lines1
+/obj/effect/decal/hybrisa/doubleroad/lines1
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "ZD_W1"
-/obj/effect/hybrisa/decal/doubleroad/lines2
+/obj/effect/decal/hybrisa/doubleroad/lines2
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "ZD_N2"
-/obj/effect/hybrisa/decal/doubleroad/lines3
+/obj/effect/decal/hybrisa/doubleroad/lines3
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "ZD_S3"
-/obj/effect/hybrisa/decal/doubleroad/lines4
+/obj/effect/decal/hybrisa/doubleroad/lines4
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "ZD_E4"
-/obj/effect/hybrisa/decal/doubleroad/lines5
+/obj/effect/decal/hybrisa/doubleroad/lines5
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "ZD_M1"
-/obj/effect/hybrisa/decal/doubleroad/lines6
+/obj/effect/decal/hybrisa/doubleroad/lines6
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "ZD_M2"
 
 //Gold lines
-/obj/effect/hybrisa/decal/gold
+/obj/effect/decal/hybrisa/gold
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_S"
-/obj/effect/hybrisa/decal/gold/line1
+/obj/effect/decal/hybrisa/gold/line1
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_S"
-/obj/effect/hybrisa/decal/gold/line2
+/obj/effect/decal/hybrisa/gold/line2
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_E"
-/obj/effect/hybrisa/decal/gold/line3
+/obj/effect/decal/hybrisa/gold/line3
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_N"
-/obj/effect/hybrisa/decal/gold/line4
+/obj/effect/decal/hybrisa/gold/line4
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "Z_W"
 
 // Red & White Warning Stripes
 
-/obj/effect/hybrisa/decal/warning/redandwhite_SEcorner
+/obj/effect/decal/hybrisa/warning/redandwhite_SEcorner
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_SE-out"
-/obj/effect/hybrisa/decal/warning/redandwhite_S
+/obj/effect/decal/hybrisa/warning/redandwhite_S
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_S"
-/obj/effect/hybrisa/decal/warning/redandwhite_SWcorner
+/obj/effect/decal/hybrisa/warning/redandwhite_SWcorner
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_SW-out"
-/obj/effect/hybrisa/decal/warning/redandwhite_E
+/obj/effect/decal/hybrisa/warning/redandwhite_E
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_E"
-/obj/effect/hybrisa/decal/warning/redandwhite_W
+/obj/effect/decal/hybrisa/warning/redandwhite_W
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_W"
-/obj/effect/hybrisa/decal/warning/redandwhite_NEcorner
+/obj/effect/decal/hybrisa/warning/redandwhite_NEcorner
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_NE-out"
-/obj/effect/hybrisa/decal/warning/redandwhite_N
+/obj/effect/decal/hybrisa/warning/redandwhite_N
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_N"
-/obj/effect/hybrisa/decal/warning/redandwhite_NWcorner
+/obj/effect/decal/hybrisa/warning/redandwhite_NWcorner
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "red_NW-out"
 
 // Angled Warning-Stripes
-/obj/effect/hybrisa/decal/warningstripes_angled
+/obj/effect/decal/hybrisa/warningstripes_angled
 	name = "warning stripes"
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "warningstripes_angled"
-/obj/effect/hybrisa/decal/warningstripes_angled_corner
+/obj/effect/decal/hybrisa/warningstripes_angled_corner
 	name = "warning stripes"
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "warningstripes_angled_corner"
 
 // Grate
 
-/obj/effect/hybrisa/decal/grate
+/obj/effect/decal/hybrisa/grate
 	name = "solid metal grate"
 	desc = "A metal grate."
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "zhalfgrate1"
 
 // 64x64 Decals
 
-/obj/effect/hybrisa/decal/WY/WY1
+/obj/effect/decal/hybrisa/WY/WY1
 	icon = 'icons/effects/64x64hybrisa_decals.dmi'
 	icon_state = "weylandyutanilogo1"
 
-/obj/effect/hybrisa/decal/WY/WYworn
+/obj/effect/decal/hybrisa/WY/WYworn
 	icon = 'icons/effects/64x64hybrisa_decals.dmi'
 	icon_state = "weylandyutanilogo2"
 
-/obj/effect/hybrisa/decal/roadcross
+/obj/effect/decal/hybrisa/roadcross
 	icon = 'icons/effects/64x64hybrisa_decals.dmi'
 	icon_state = "roadcross"
-/obj/effect/hybrisa/decal/checkpoint_decal
+/obj/effect/decal/hybrisa/checkpoint_decal
 	icon = 'icons/effects/64x64hybrisa_decals.dmi'
 	icon_state = "checkpoint_decal"
-/obj/effect/hybrisa/decal/workers_decal
+/obj/effect/decal/hybrisa/workers_decal
 	icon = 'icons/effects/64x64hybrisa_decals.dmi'
 	icon_state = "workers_decal"
 
 // 128 x 64 Decals
 
-/obj/effect/hybrisa/decal/wy_huge_logo
+/obj/effect/decal/hybrisa/wy_huge_logo
 	name = "Weyland-Yutani Corp. - Building Better Worlds"
 	icon = 'icons/effects/WY_huge_logo.dmi'
 	icon_state = "wy_huge_logo"
 
-/obj/effect/hybrisa/decal/wy_huge_logo/lines
+/obj/effect/decal/hybrisa/wy_huge_logo/lines
 	icon_state = "wy_huge_logo_lines"
 
 // 64x128 Decals
-/obj/effect/hybrisa/decal/meridianlogo
+/obj/effect/decal/hybrisa/meridianlogo
 	icon = 'icons/effects/meridianlogo.dmi'
 	icon_state = "meridian_left"
-/obj/effect/hybrisa/decal/meridianlogo/meridianlogo_left
+/obj/effect/decal/hybrisa/meridianlogo/meridianlogo_left
 	icon_state = "meridian_left"
-/obj/effect/hybrisa/decal/meridianlogo/meridianlogo_right
+/obj/effect/decal/hybrisa/meridianlogo/meridianlogo_right
 	icon_state = "meridian_right"
 
 /// Dirt & Grime
 
-/obj/effect/hybrisa/decal/dirt
+/obj/effect/decal/hybrisa/dirt
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "dirt"
 
-/obj/effect/hybrisa/decal/dirt_2
+/obj/effect/decal/hybrisa/dirt_2
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "dirt_2"
 
-/obj/effect/hybrisa/decal/bloodtrail
+/obj/effect/decal/hybrisa/bloodtrail
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "bloodtrail"
 
-/obj/effect/hybrisa/decal/tiretrack
+/obj/effect/decal/hybrisa/tiretrack
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "tiremarks"
 
-/obj/effect/hybrisa/decal/trash
+/obj/effect/decal/hybrisa/trash
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "trash_1"
 
 /// Engineer_ship
-/obj/effect/hybrisa/decal/engineership_corners
+/obj/effect/decal/hybrisa/engineership_corners
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "engPlatform_corners"
 
-/obj/effect/hybrisa/decal/hull_angled
+/obj/effect/decal/hybrisa/hull_angled
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "hull_angled"
 
-/obj/effect/hybrisa/decal/hull_angled2
+/obj/effect/decal/hybrisa/hull_angled2
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "hull_angled2"
 
-/obj/effect/hybrisa/decal/plating_angled
+/obj/effect/decal/hybrisa/plating_angled
 	icon = 'icons/effects/hybrisa_decals.dmi'
 	icon_state = "plating_angled"
 
-/obj/effect/hybrisa/decal/egg_base
+/obj/effect/decal/hybrisa/egg_base
 	name = "strange goop"
 	desc = null
 	icon = 'icons/obj/structures/props/hybrisa/misc_props.dmi'
 	icon_state = "egg_base"
 
 // Colorable Rug
 
-/obj/effect/hybrisa/decal/colorable_rug
+/obj/effect/decal/hybrisa/colorable_rug
 	name = "rug"
 	icon = 'icons/obj/structures/props/hybrisa/64x64_props.dmi'
 	desc = null

code/game/objects/effects/decals/misc.dm

@@ -1,19 +1,12 @@
-/obj/effect/decal
-	plane = FLOOR_PLANE
-
-// Used for spray that you spray at walls, tables, hydrovats etc
-/obj/effect/decal/spraystill
-	density = FALSE
-	anchored = TRUE
-	layer = FLY_LAYER
-
 //Used by spraybottles.
 /obj/effect/decal/chempuff
 	name = "chemicals"
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "chempuff"
+	keep_as_object = TRUE
 	var/mob/source_user
 
+
 /obj/effect/decal/chempuff/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()
 	if (PF)

code/game/objects/effects/decals/prints.dm

@@ -5,6 +5,7 @@
 	icon_state = "prints"
 	anchored = TRUE
 	unacidable = TRUE
+	keep_as_object = TRUE
 
 	var/description = null
 

code/game/objects/structures/hybrisa_props.dm

@@ -1961,13 +1961,13 @@
 /obj/structure/prop/hybrisa/misc/fake/lattice/full
 	icon_state = "latticefull"
 
-/obj/effect/hybrisa/decal/hybrisa/lattice
+/obj/effect/decal/hybrisa/lattice
 	name = "structural lattice"
 	icon = 'icons/obj/structures/props/hybrisa/piping_wiring.dmi'
 	icon_state = "latticefull"
 	layer = TURF_LAYER
 
-/obj/effect/hybrisa/decal/hybrisa/lattice/full
+/obj/effect/decal/hybrisa/lattice/full
 	icon_state = "latticefull"
 
 // Cargo Containers extended
@@ -2505,7 +2505,7 @@
 /obj/structure/prop/hybrisa/misc/urinal/dark
 	icon_state = "small_urinal_dark"
 
-/obj/effect/hybrisa/decal/hybrisa/deco_edging
+/obj/effect/decal/hybrisa/deco_edging
 	name = "decorative concrete edging"
 	desc = "Decorative edging for bordering stuff, very fancy."
 	icon = 'icons/obj/structures/props/hybrisa/platforms.dmi'
@@ -2514,7 +2514,7 @@
 	anchored = TRUE
 	layer = TURF_LAYER
 
-/obj/effect/hybrisa/decal/hybrisa/deco_edging/corner
+/obj/effect/decal/hybrisa/deco_edging/corner
 	icon = 'icons/obj/structures/props/hybrisa/platforms.dmi'
 	icon_state = "stone_edging_deco"
 	density = FALSE

colonialmarines.dme

@@ -1095,6 +1095,7 @@
 #include "code\game\objects\effects\spiders.dm"
 #include "code\game\objects\effects\step_triggers.dm"
 #include "code\game\objects\effects\decals\crayon.dm"
+#include "code\game\objects\effects\decals\decal.dm"
 #include "code\game\objects\effects\decals\floor_symbol.dm"
 #include "code\game\objects\effects\decals\hefa_cult_decals.dm"
 #include "code\game\objects\effects\decals\hybrisa_decals.dm"