From 8954ed7728d8623bcd16fff9e2f8bf02e1b5507e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 22 Feb 2021 03:08:54 +0100 Subject: [PATCH] [MIRROR] Fixes slime heretics being hurt by rust (#3570) * Fixes slime heretics being hurt by rust (#57041) * Fixes slime heretics being hurt by rust Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com> --- code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm | 4 ++-- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index e6600e16f0c..67d802ea715 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -66,7 +66,7 @@ var/mob/living/living_user = user living_user.adjustBruteLoss(-2, FALSE) living_user.adjustFireLoss(-2, FALSE) - living_user.adjustToxLoss(-2, FALSE) + living_user.adjustToxLoss(-2, FALSE, forced = TRUE) living_user.adjustOxyLoss(-0.5, FALSE) living_user.adjustStaminaLoss(-2) living_user.AdjustAllImmobility(-5) @@ -155,7 +155,7 @@ var/mob/living/carbon/human/human_user = user human_user.adjustBruteLoss(-4, FALSE) human_user.adjustFireLoss(-4, FALSE) - human_user.adjustToxLoss(-4, FALSE) + human_user.adjustToxLoss(-4, FALSE, forced = TRUE) human_user.adjustOxyLoss(-2, FALSE) human_user.adjustStaminaLoss(-20) human_user.AdjustAllImmobility(-10) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 5bbdef65fbc..85aff393d90 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2580,7 +2580,7 @@ M.drowsyness = max(M.drowsyness - (5 * REM * delta_time), 0) M.AdjustAllImmobility(-40 * REM * delta_time) M.adjustStaminaLoss(-10 * REM * delta_time, FALSE) - M.adjustToxLoss(-2 * REM * delta_time, FALSE) + M.adjustToxLoss(-2 * REM * delta_time, FALSE, forced = TRUE) M.adjustOxyLoss(-2 * REM * delta_time, FALSE) M.adjustBruteLoss(-2 * REM * delta_time, FALSE) M.adjustFireLoss(-2 * REM * delta_time, FALSE)