Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864

[MIRROR] Makes thermite a component
This commit is contained in:
LetterJay
2017-10-29 04:23:16 -04:00
committed by GitHub
12 changed files with 143 additions and 97 deletions
@@ -226,6 +226,7 @@
soundloop.start()
wash_turf()
for(var/atom/movable/G in loc)
G.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
if(isliving(G))
var/mob/living/L = G
wash_mob(L)
@@ -295,6 +296,7 @@
/obj/machinery/shower/proc/wash_obj(obj/O)
O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
. = O.clean_blood()
O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
if(isitem(O))
@@ -306,6 +308,7 @@
/obj/machinery/shower/proc/wash_turf()
if(isturf(loc))
var/turf/tile = loc
tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
tile.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
tile.clean_blood()
for(var/obj/effect/E in tile)
@@ -314,6 +317,7 @@
/obj/machinery/shower/proc/wash_mob(mob/living/L)
L.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
L.wash_cream()
L.ExtinguishMob()
L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily