From 08e72ba05e7d54554a0aaee4b8adb3f8f48b5978 Mon Sep 17 00:00:00 2001 From: Fermi Date: Fri, 31 May 2019 03:49:25 +0100 Subject: [PATCH] Why does adjustLungLoss not workkkkkkkkkkkkkkkkk --- code/modules/surgery/organs/lungs.dm | 15 ++++++++------- .../reagents/chemistry/reagents/fermi_reagents.dm | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 12e763fafd..76229b10a5 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -61,7 +61,8 @@ var/damage = 0 //TODO: lung health affects lung function -/obj/item/organ/lungs/proc/adjustLungLoss(mob/living/carbon/M, damage_mod) +/obj/item/organ/lungs/proc/adjustLungLoss(damage_mod, mob/living/carbon/M) + message_admins("lung damage: [damage_mod], damage: [damage]") if (maxHealth == "plasma") return if(damage+damage_mod < 0) @@ -405,13 +406,13 @@ var/cold_modifier = H.dna.species.coldmod if(breath_temperature < cold_level_3_threshold) H.apply_damage_type(cold_level_3_damage*cold_modifier, cold_damage_type) - adjustLungLoss(cold_level_3_damage*cold_modifier) + adjustLungLoss(cold_level_3_damage*cold_modifier, H) if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold) H.apply_damage_type(cold_level_2_damage*cold_modifier, cold_damage_type) - adjustLungLoss(cold_level_2_damage*cold_modifier) + adjustLungLoss(cold_level_2_damage*cold_modifier, H) if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold) H.apply_damage_type(cold_level_1_damage*cold_modifier, cold_damage_type) - adjustLungLoss(cold_level_1_damage*cold_modifier) + adjustLungLoss(cold_level_1_damage*cold_modifier, H) if(breath_temperature < cold_level_1_threshold) if(prob(20)) to_chat(H, "You feel [cold_message] in your [name]!") @@ -420,13 +421,13 @@ var/heat_modifier = H.dna.species.heatmod if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold) H.apply_damage_type(heat_level_1_damage*heat_modifier, heat_damage_type) - adjustLungLoss(cold_level_1_damage*heat_modifier) + adjustLungLoss(cold_level_1_damage*heat_modifier, H) if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold) H.apply_damage_type(heat_level_2_damage*heat_modifier, heat_damage_type) - adjustLungLoss(cold_level_1_damage*heat_modifier) + adjustLungLoss(cold_level_1_damage*heat_modifier, H) if(breath_temperature > heat_level_3_threshold) H.apply_damage_type(heat_level_3_damage*heat_modifier, heat_damage_type) - adjustLungLoss(cold_level_1_damage*heat_modifier) + adjustLungLoss(cold_level_1_damage*heat_modifier, H) if(breath_temperature > heat_level_1_threshold) if(prob(20)) to_chat(H, "You feel [hot_message] in your [name]!") diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index f748dd6a33..1d679b3ecb 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -114,10 +114,10 @@ ..() /datum/reagent/fermi/eigenstate/on_mob_delete(mob/living/M) //returns back to original location - do_sparks(5,FALSE,src) + do_sparks(5,FALSE,M) to_chat(M, "You feel your wavefunction collapse!") do_teleport(M, location_return, 0, asoundin = 'sound/effects/phasein.ogg') //Teleports home - do_sparks(5,FALSE,src) + do_sparks(5,FALSE,M) ..() /datum/reagent/fermi/eigenstate/overdose_start(mob/living/M) //Overdose, makes you teleport randomly @@ -1373,8 +1373,8 @@ Creating a chem with a low purity will make you permanently fall in love with so if(prob(20)) to_chat(C, "You can feel your lungs burning!") var/obj/item/organ/lungs/L = C.getorganslot(ORGAN_SLOT_LUNGS) - L.adjustLungLoss(acidstr) - C.apply_damage(acidstr/2, BURN, target) + L.adjustLungLoss(acidstr, C) + C.apply_damage(acidstr/3, BURN, target) C.acid_act(acidstr, volume) ..()