From 2b2bb0d2759d04edb6973af68a6700aee70a641f Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Sat, 11 Jun 2022 20:57:31 -0500 Subject: [PATCH] Gets rid of the Druggy var on `/living`, "fixes" Earthsblood (#67668) Kill the druggy var --- code/modules/mob/living/living_defines.dm | 1 - code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index ae0d8be9ce9..cc9c338caca 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -153,7 +153,6 @@ ///a list of all status effects the mob has var/list/status_effects - var/druggy = 0 var/list/implants = null diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 788ab166511..33cdd29a414 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1154,7 +1154,7 @@ M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * delta_time, 150) if(DT_PROB(5, delta_time)) M.say(pick("Yeah, well, you know, that's just, like, uh, your opinion, man.", "Am I glad he's frozen in there and that we're out here, and that he's the sheriff and that we're frozen out here, and that we're in there, and I just remembered, we're out here. What I wanna know is: Where's the caveman?", "It ain't me, it ain't me...", "Make love, not war!", "Stop, hey, what's that sound? Everybody look what's going down...", "Do you believe in magic in a young girl's heart?"), forced = /datum/reagent/medicine/earthsblood) - M.druggy = clamp(M.druggy + (10 * REM * delta_time), 0, 15 * REM * delta_time) //See above + M.adjust_timed_status_effect(20 SECONDS * REM * delta_time, /datum/status_effect/drugginess, max_duration = 30 SECONDS * REM * delta_time) ..() . = TRUE