FixWaterA G A I N

This commit is contained in:
Mechoid
2020-01-23 13:39:45 -08:00
parent af635d0978
commit 8e0b2f11dc
3 changed files with 16 additions and 1 deletions
@@ -586,6 +586,13 @@ emp_act
converted_protection *= perm
return CLAMP(1-converted_protection, 0, 1)
/mob/living/carbon/human/water_act(amount)
adjust_fire_stacks(-amount * 5)
for(var/atom/movable/AM in contents)
AM.water_act(amount)
remove_modifiers_of_type(/datum/modifier/fire)
species.handle_water_damage(src, amount)
/mob/living/carbon/human/shank_attack(obj/item/W, obj/item/weapon/grab/G, mob/user, hit_zone)
@@ -142,7 +142,8 @@
"Your skin prickles in the heat."
)
var/water_resistance = 0.1 // How wet the species gets from being splashed. Only really useful for Prometheans.
var/water_resistance = 0.1 // How wet the species gets from being splashed.
var/water_damage_mod = 0 // How much water damage is multiplied by when splashing this species.
var/passive_temp_gain = 0 // Species will gain this much temperature every second
var/hazard_high_pressure = HAZARD_HIGH_PRESSURE // Dangerously high pressure.
@@ -461,3 +462,9 @@
// Allow species to display interesting information in the human stat panels
/datum/species/proc/Stat(var/mob/living/carbon/human/H)
return
/datum/species/proc/handle_water_damage(var/mob/living/carbon/human/H, var/amount = 0)
amount *= 1 - H.get_water_protection()
amount *= water_damage_mod
if(amount > 0)
H.adjustToxLoss(amount)
@@ -72,6 +72,7 @@ var/datum/species/shapeshifter/promethean/prometheans
siemens_coefficient = 0.8
water_resistance = 0
water_damage_mod = 0.3
genders = list(MALE, FEMALE, NEUTER, PLURAL)