From 0dc8bd5d8318668516827c6900925d3b92a3e1b9 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 5 Oct 2017 02:09:55 -0400 Subject: [PATCH 1/2] Sets turf decal layer --- code/__DEFINES/layers.dm | 1 + code/game/objects/effects/decals/decal.dm | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index d33eaa35da..ee9e97cbd9 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -20,6 +20,7 @@ #define LATTICE_LAYER 2.2 #define DISPOSAL_PIPE_LAYER 2.3 #define GAS_PIPE_HIDDEN_LAYER 2.35 +#define TURF_DECAL_LAYER 2.39 #define WIRE_LAYER 2.4 #define WIRE_TERMINAL_LAYER 2.45 #define GAS_SCRUBBER_LAYER 2.46 diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 14a8e25eba..d9b217b91b 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -1,6 +1,7 @@ /obj/effect/decal name = "decal" anchored = TRUE +<<<<<<< HEAD resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF /obj/effect/decal/ex_act(severity, target) @@ -19,6 +20,27 @@ var/group = TURF_DECAL_PAINT icon = 'icons/turf/decals.dmi' icon_state = "warningline" +======= + resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF + +/obj/effect/decal/ex_act(severity, target) + qdel(src) + +/obj/effect/decal/fire_act(exposed_temperature, exposed_volume) + if(!(resistance_flags & FIRE_PROOF)) //non fire proof decal or being burned by lava + qdel(src) + +/obj/effect/decal/HandleTurfChange(turf/T) + ..() + if(T == loc && (isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || istype(T, /turf/open/chasm))) + qdel(src) + +/obj/effect/turf_decal + var/group = TURF_DECAL_PAINT + icon = 'icons/turf/decals.dmi' + icon_state = "warningline" + layer = TURF_DECAL_LAYER +>>>>>>> 41430d7... Sets decal layer anchored = TRUE //in case we need some special decals From 2b42ad52009c766508d32c7a596e2d8b1b4d4479 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 6 Oct 2017 22:22:35 -0500 Subject: [PATCH 2/2] Update decal.dm --- code/game/objects/effects/decals/decal.dm | 121 +++++++++------------- 1 file changed, 50 insertions(+), 71 deletions(-) diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index d9b217b91b..06333277cd 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -1,26 +1,6 @@ -/obj/effect/decal - name = "decal" +/obj/effect/decal + name = "decal" anchored = TRUE -<<<<<<< HEAD - resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF - -/obj/effect/decal/ex_act(severity, target) - qdel(src) - -/obj/effect/decal/fire_act(exposed_temperature, exposed_volume) - if(!(resistance_flags & FIRE_PROOF)) //non fire proof decal or being burned by lava - qdel(src) - -/obj/effect/decal/HandleTurfChange(turf/T) - ..() - if(T == loc && (isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || istype(T, /turf/open/chasm))) - qdel(src) - -/obj/effect/turf_decal - var/group = TURF_DECAL_PAINT - icon = 'icons/turf/decals.dmi' - icon_state = "warningline" -======= resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF /obj/effect/decal/ex_act(severity, target) @@ -40,65 +20,64 @@ icon = 'icons/turf/decals.dmi' icon_state = "warningline" layer = TURF_DECAL_LAYER ->>>>>>> 41430d7... Sets decal layer anchored = TRUE - -//in case we need some special decals -/obj/effect/turf_decal/proc/get_decal() - return image(icon='icons/turf/decals.dmi',icon_state=icon_state,dir=dir,layer=TURF_LAYER) - -/obj/effect/turf_decal/Initialize() - ..() - var/turf/T = loc - if(!istype(T)) //you know this will happen somehow - CRASH("Turf decal initialized in an object/nullspace") - T.add_decal(get_decal(),group) - return INITIALIZE_HINT_QDEL - -/obj/effect/turf_decal/stripes/line - icon_state = "warningline" - -/obj/effect/turf_decal/stripes/end - icon_state = "warn_end" - -/obj/effect/turf_decal/stripes/corner - icon_state = "warninglinecorner" - -/obj/effect/turf_decal/stripes/asteroid/line - icon_state = "ast_warn" - -/obj/effect/turf_decal/stripes/asteroid/end - icon_state = "ast_warn_end" - -/obj/effect/turf_decal/stripes/asteroid/corner - icon_state = "ast_warn_corner" - -/obj/effect/turf_decal/delivery - icon_state = "delivery" - -/obj/effect/turf_decal/bot - icon_state = "bot" - -/obj/effect/turf_decal/loading_area - icon_state = "loading_area" - -/obj/effect/turf_decal/sand - icon_state = "sandyfloor" - + +//in case we need some special decals +/obj/effect/turf_decal/proc/get_decal() + return image(icon='icons/turf/decals.dmi',icon_state=icon_state,dir=dir,layer=TURF_LAYER) + +/obj/effect/turf_decal/Initialize() + ..() + var/turf/T = loc + if(!istype(T)) //you know this will happen somehow + CRASH("Turf decal initialized in an object/nullspace") + T.add_decal(get_decal(),group) + return INITIALIZE_HINT_QDEL + +/obj/effect/turf_decal/stripes/line + icon_state = "warningline" + +/obj/effect/turf_decal/stripes/end + icon_state = "warn_end" + +/obj/effect/turf_decal/stripes/corner + icon_state = "warninglinecorner" + +/obj/effect/turf_decal/stripes/asteroid/line + icon_state = "ast_warn" + +/obj/effect/turf_decal/stripes/asteroid/end + icon_state = "ast_warn_end" + +/obj/effect/turf_decal/stripes/asteroid/corner + icon_state = "ast_warn_corner" + +/obj/effect/turf_decal/delivery + icon_state = "delivery" + +/obj/effect/turf_decal/bot + icon_state = "bot" + +/obj/effect/turf_decal/loading_area + icon_state = "loading_area" + +/obj/effect/turf_decal/sand + icon_state = "sandyfloor" + /obj/effect/turf_decal/sand/warning icon_state = "sandy_warn" /obj/effect/turf_decal/sand/warning/corner icon_state = "sandy_warn_corner" -/obj/effect/turf_decal/sand/plating - icon_state = "sandyplating" - +/obj/effect/turf_decal/sand/plating + icon_state = "sandyplating" + /obj/effect/turf_decal/sand/plating/warning icon_state = "sandy_plating_warn" /obj/effect/turf_decal/sand/plating/warning/corner icon_state = "sandy_plating_warn_corner" -/obj/effect/turf_decal/plaque - icon_state = "plaque" +/obj/effect/turf_decal/plaque + icon_state = "plaque"