shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3177 from Citadel-Station-13/upstream-merge-31333

Browse Source 
[MIRROR] Sets turf decal layer
This commit is contained in:
LetterJay
2017-10-07 01:03:25 -04:00
committed by GitHub
parent 3d0a51e9bb 2b42ad5200
commit f9dcfc6e35
2 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/layers.dm
+1
View File
@@ -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
code/game/objects/effects/decals/decal.dm
+69 -68
View File
@@ -1,82 +1,83 @@
/obj/effect/decal
name = "decal"
/obj/effect/decal
name = "decal"
anchored = TRUE
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)
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
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"