cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buffs Dihydrogen monoxide

Browse Source
This commit is contained in:
AnturK
2016-01-01 15:03:52 +01:00
parent 907083e071
commit 1ee0c1cbba
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/weapons/extinguisher.dm
View File

@@ -145,12 +145,9 @@
step_towards(W,my_target) step_towards(W,my_target)
if(!W || !W.reagents) return if(!W || !W.reagents) return
W.reagents.reaction(get_turf(W)) W.reagents.reaction(get_turf(W))
for(var/atom/atm in get_turf(W)) for(var/A in get_turf(W))
if(!W) return if(!W) return
W.reagents.reaction(atm) W.reagents.reaction(A)
if(isliving(atm)) //For extinguishing mobs on fire
var/mob/living/M = atm
M.ExtinguishMob()
if(W.loc == my_target) break if(W.loc == my_target) break
sleep(2) sleep(2)

3
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -162,10 +162,11 @@
*/ */
/datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with water can help put them out! /datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with water can help put them out!
if(!istype(M, /mob/living)) if(!istype(M))
return return
if(method == TOUCH) if(method == TOUCH)
M.adjust_fire_stacks(-(reac_volume / 10)) M.adjust_fire_stacks(-(reac_volume / 10))
M.ExtinguishMob()
..() ..()
/datum/reagent/water/holywater /datum/reagent/water/holywater