From adeffe0c47a424e2ae48bbb18a713e0d4965eed6 Mon Sep 17 00:00:00 2001 From: Fermi Date: Fri, 31 May 2019 04:16:18 +0100 Subject: [PATCH] Fixed lungs. --- code/modules/surgery/organs/lungs.dm | 1 - modular_citadel/code/datums/status_effects/chems.dm | 2 +- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 8 ++++---- .../code/modules/reagents/chemistry/recipes/fermi.dm | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 76229b10a5..846f32205d 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -62,7 +62,6 @@ //TODO: lung health affects lung function /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) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 06ca536eee..045d6807bd 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -209,7 +209,7 @@ var/mob/living/carbon/M = owner var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in M.reagents.reagent_list if(!E) - message_admins("WARNING: FermiChem: No master found in thrall, did you bus in the chem? You need to set up the vars manually if it's not reacted. Someone set up the reaction incorrectly if not. Console them with a fermiplush please.") + message_admins("WARNING: FermiChem: No master found in thrall, did you bus in the chem? You need to set up the vars manually if it's not reacted/bussed. Someone set up the reaction incorrectly if not (Don't use donor blood). Console them with a fermiplush maybe?") enthrallID = E.creatorID enthrallGender = E.creatorGender master = get_mob_by_key(enthrallID) 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 1d679b3ecb..1c31ba2a65 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -1365,16 +1365,16 @@ Creating a chem with a low purity will make you permanently fall in love with so color = "#FFFFFF" pH = 0 -/datum/reagent/fermi/fermiAcid/on_mob_life(mob/living/carbon/C, method) +/datum/reagent/fermi/fermiAcid/reaction_mob(mob/living/carbon/C, method) var/target = C.get_bodypart(BODY_ZONE_CHEST) var/acidstr = ((5-C.reagents.pH)*2) - C.adjustFireLoss(acidstr, 0) - if(method==VAPOR) + C.adjustFireLoss(acidstr/2, 0) + if((method==VAPOR) && if(!C.wear_mask)) 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) - C.apply_damage(acidstr/3, BURN, target) + C.apply_damage(acidstr/5, BURN, target) C.acid_act(acidstr, volume) ..() diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index b9383ea430..3ad833f5e4 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -246,7 +246,6 @@ /datum/chemical_reaction/fermi/enthrall/FermiFinish(datum/reagents/holder, var/atom/my_atom) - message_admins("On finish for enthral proc'd") var/datum/reagent/blood/B = locate(/datum/reagent/blood) in my_atom.reagents.reagent_list var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list if(!B.data)