From 8000a0e40b0679d895c36d38e3ed181e7de7cf61 Mon Sep 17 00:00:00 2001 From: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> Date: Mon, 22 May 2023 22:24:53 +0200 Subject: [PATCH] Converts Perfluorodecalin's side-effect into an actual overdose (#21081) * Converts Perfluorodecalin's side-effect into actual overdose * Make Perfluorodecalin heal its own OD again --- code/modules/reagents/chemistry/reagents/medicine.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index f1a3f4cddbe..e602e3e8d83 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -504,6 +504,8 @@ reagent_state = LIQUID color = "#C8A5DC" metabolization_rate = 0.2 + overdose_threshold = 4 + allowed_overdose_process = TRUE addiction_chance = 1 addiction_chance_additional = 20 addiction_threshold = 10 @@ -512,14 +514,18 @@ /datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M) var/update_flags = STATUS_UPDATE_NONE + update_flags |= M.adjustOxyLoss(-25*REAGENTS_EFFECT_MULTIPLIER, FALSE) - if(volume >= 4) - M.LoseBreath(12 SECONDS) if(prob(33)) update_flags |= M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) update_flags |= M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) + return ..() | update_flags +/datum/reagent/medicine/perfluorodecalin/overdose_process(mob/living/M) + M.LoseBreath(12 SECONDS) + return list(0, STATUS_UPDATE_NONE) + /datum/reagent/medicine/ephedrine name = "Ephedrine" id = "ephedrine"