Merge pull request #2452 from Anewbe/muscular_dihydrogen_monoxide

Water is now more useful on burning people
This commit is contained in:
Neerti
2016-09-12 17:38:17 -04:00
committed by GitHub
2 changed files with 38 additions and 2 deletions
@@ -125,10 +125,10 @@
/datum/reagent/water/touch_mob(var/mob/living/L, var/amount)
if(istype(L))
var/needed = L.fire_stacks * 10
var/needed = L.fire_stacks * 5
if(amount > needed)
L.ExtinguishMob()
L.adjust_fire_stacks(-(amount / 10))
L.adjust_fire_stacks(-(amount / 5))
remove_self(needed)
/datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+36
View File
@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Anewbe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Water is now more effective at dousing burning people."