Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809

[MIRROR] Cleans up some istypes not using helpers
This commit is contained in:
LetterJay
2017-10-18 07:37:43 -04:00
committed by GitHub
18 changed files with 26 additions and 24 deletions
@@ -1330,7 +1330,7 @@
taste_description = "carpet" // Your tounge feels furry.
/datum/reagent/carpet/reaction_turf(turf/T, reac_volume)
if(istype(T, /turf/open/floor/plating) || istype(T, /turf/open/floor/plasteel))
if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
var/turf/open/floor/F = T
F.ChangeTurf(/turf/open/floor/carpet)
..()
@@ -54,7 +54,7 @@
. = 1
/datum/reagent/clf3/reaction_turf(turf/T, reac_volume)
if(istype(T, /turf/open/floor/plating))
if(isplatingturf(T))
var/turf/open/floor/plating/F = T
if(prob(10 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed
F.ChangeTurf(F.baseturf)