Merge pull request #31809 from ShizCalev/helper-cleanup

Cleans up some istypes not using helpers
This commit is contained in:
Leo
2017-10-17 22:20:42 -02:00
committed by CitadelStationBot
parent 9691c9130f
commit 28656d3347
18 changed files with 26 additions and 24 deletions
@@ -241,7 +241,7 @@
if(T.flags_1 & NOJAUNT_1)
T.flags_1 &= ~NOJAUNT_1
new /obj/effect/temp_visual/revenant(T)
if(!istype(T, /turf/open/floor/plating) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
if(!isplatingturf(T) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
var/turf/open/floor/floor = T
if(floor.intact && floor.floor_tile)
new floor.floor_tile(floor)
@@ -391,7 +391,7 @@
/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/dismantleFloor(var/turf/new_turf)
if(isfloorturf(new_turf))
var/turf/open/floor/T = new_turf
if(!istype(T, /turf/open/floor/plating))
if(!isplatingturf(T))
if(!T.broken && !T.burnt)
new T.floor_tile(T)
T.make_plating()
+1 -1
View File
@@ -12,7 +12,7 @@
/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)))
if(T == loc && (isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || ischasm(T)))
qdel(src)
/obj/effect/turf_decal
+1 -1
View File
@@ -309,7 +309,7 @@
/obj/item/storage/backpack/satchel/flat/secret/Initialize()
. = ..()
if(isfloorturf(loc) && !istype(loc, /turf/open/floor/plating/))
if(isfloorturf(loc) && !isplatingturf(loc))
hide(1)
/obj/item/storage/backpack/satchel/flat/secret/hide(intact)