From c65fa1dd72d2db82104aaefad70dc1ad8740734f Mon Sep 17 00:00:00 2001 From: HugoLuman Date: Fri, 15 Dec 2017 12:37:34 -0800 Subject: [PATCH] Makes it possible to have different modifiers for temperature damage in lungs Signed-off-by: HugoLuman --- code/modules/surgery/organs/lungs.dm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 2cbda10e112..2dbcc729240 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -40,7 +40,10 @@ var/cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_1 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead. var/cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2 var/cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3 - var/cold_damage_type = list(BURN) + var/cold_BRUTE_mod = 0 //If you want to add a damage type, simply set its mod to something besides 0 + var/cold_BURN_mod = 1 + var/cold_OXY_mod = 0 + var/cold_TOX_mod = 0 var/hot_message = "your face burning and a searing heat" var/heat_level_1_threshold = 360 @@ -49,7 +52,10 @@ var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1 var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2 var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3 - var/heat_damage_type = list(BURN) + var/heat_BRUTE_mod = 0 + var/heat_BURN_mod = 1 + var/heat_OXY_mod = 0 + var/heat_TOX_mod = 0 /obj/item/organ/internal/lungs/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0) ..() @@ -278,8 +284,10 @@ if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold) TC = cold_level_1_damage if(TC) - for(var/D in cold_damage_type) - H.apply_damage_type(TC*CM, D) + H.apply_damage_type(TC*CM*cold_BRUTE_mod, BRUTE) + H.apply_damage_type(TC*CM*cold_BURN_mod, BURN) + H.apply_damage_type(TC*CM*cold_OXY_mod, OXY) + H.apply_damage_type(TC*CM*cold_TOX_mod, TOX) if(breath_temperature < cold_level_1_threshold) if(prob(20)) to_chat(H, "You feel [cold_message] in your [name]!") @@ -294,8 +302,10 @@ if(breath_temperature > heat_level_3_threshold) TH = heat_level_3_damage if(TH) - for(var/D in heat_damage_type) - H.apply_damage_type(TH*HM, D) + H.apply_damage_type(TH*HM*heat_BRUTE_mod, BRUTE) + H.apply_damage_type(TH*HM*heat_BURN_mod, BURN) + H.apply_damage_type(TH*HM*heat_OXY_mod, OXY) + H.apply_damage_type(TH*HM*heat_TOX_mod, TOX) if(breath_temperature > heat_level_1_threshold) if(prob(20)) to_chat(H, "You feel [hot_message] in your [name]!") @@ -334,4 +344,7 @@ cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal when the air is cold cold_level_2_damage = -COLD_GAS_DAMAGE_LEVEL_2 cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3 - cold_damage_type = list(BRUTE, BURN) \ No newline at end of file + cold_BRUTE_mod = 1 + cold_BURN_mod = 0.5 + cold_OXY_mod = 0 + cold_TOX_mod = 0 \ No newline at end of file