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

Fixes decals being created on bad turfs (#34121)

Browse Source 
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
This commit is contained in:
Jordan Brown
2018-01-07 16:50:36 -08:00
committed by CitadelStationBot
parent 1f65e222b7
commit 801eab4c3c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/decal.dm
+9 -1
View File
@@ -3,6 +3,14 @@
anchored = TRUE
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/effect/decal/Initialize()
. = ..()
if(!isturf(loc) || NeverShouldHaveComeHere(loc))
return INITIALIZE_HINT_QDEL
/obj/effect/decal/proc/NeverShouldHaveComeHere(turf/T)
return isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || ischasm(T)
/obj/effect/decal/ex_act(severity, target)
qdel(src)
@@ -12,7 +20,7 @@
/obj/effect/decal/HandleTurfChange(turf/T)
..()
if(T == loc && (isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || ischasm(T)))
if(T == loc && NeverShouldHaveComeHere(T))
qdel(src)
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////