From 482d4b2f75796fd2af32dfa9d2a7d83a072bb3bf Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Sun, 10 Mar 2024 18:21:24 +0000 Subject: [PATCH] Adds Lexorin to the Uplink Poison Bottle Bool. Also, Fixes Lexorin. (#24488) * lexorin * Fixes lexorin * sanity --- code/modules/mob/living/carbon/carbon_life.dm | 2 -- code/modules/reagents/chemistry/reagents/toxins.dm | 2 ++ strings/chemistry_tools.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon_life.dm b/code/modules/mob/living/carbon/carbon_life.dm index 34df76d7067..3310c5211dc 100644 --- a/code/modules/mob/living/carbon/carbon_life.dm +++ b/code/modules/mob/living/carbon/carbon_life.dm @@ -50,8 +50,6 @@ //Second link in a breath chain, calls check_breath() /mob/living/carbon/proc/breathe() - if(reagents.has_reagent("lexorin")) - return if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 264b0b6c882..8e0d0b7f3ff 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -264,6 +264,8 @@ /datum/reagent/lexorin/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE + update_flags |= M.LoseBreath(10) // No breathing for you! The effects will linger for a bit after it purges. + update_flags |= M.adjustOxyLoss(5, FALSE) update_flags |= M.adjustToxLoss(1, FALSE) return ..() | update_flags diff --git a/strings/chemistry_tools.json b/strings/chemistry_tools.json index 9c4352d997b..f2ce0773bf0 100644 --- a/strings/chemistry_tools.json +++ b/strings/chemistry_tools.json @@ -468,6 +468,7 @@ "spidereggs", "concentrated_initro", "heartworms", - "bacon_grease" + "bacon_grease", + "lexorin" ] }