From d2c6350884ef4df8bbc2aeff1a30071be3882396 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Fri, 3 Oct 2014 23:47:09 +0100 Subject: [PATCH] Extinguishing mob on fire For some reason this was removed. --- code/game/objects/items/weapons/extinguisher.dm | 8 ++++++-- html/changelog.html | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index e05cff16..a8768aae 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -118,6 +118,7 @@ W.reagents = R R.my_atom = W if(!W || !src) return + if(!W.reagents) return src.reagents.trans_to(W,1) for(var/b=0, b<5, b++) step_towards(W,my_target) @@ -126,11 +127,14 @@ for(var/atom/atm in get_turf(W)) if(!W) return W.reagents.reaction(atm) + if(isliving(atm)) //For extinguishing mobs on fire + var/mob/living/M = atm + M.ExtinguishMob() if(W.loc == my_target) break sleep(2) -// spawn(20) + spawn(20) + W.Del() - W.Del() if((istype(usr.loc, /turf/space)) || (usr.lastarea.has_gravity == 0)) user.inertia_dir = get_dir(target, user) step(user, user.inertia_dir) diff --git a/html/changelog.html b/html/changelog.html index 77e1db47..a3bd10bb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,10 +57,17 @@ should be listed in the changelog upon commit though. Thanks. -->
-

2 October 2014

+

10 October 2014

SoundScopes updated: