From 15fe8054a0a871e90a77e19b8b725ada831e278d Mon Sep 17 00:00:00 2001 From: Orotheim <81803907+Orotheim@users.noreply.github.com> Date: Fri, 20 Sep 2024 22:36:06 +0100 Subject: [PATCH] _clothing and _status_effects (#6) buge --- .../research/xenobiology/crossbreeding/_clothing.dm | 7 +++++-- .../research/xenobiology/crossbreeding/_status_effects.dm | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index 71bf2cdf..382a313b 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -139,7 +139,10 @@ Slimecrossing Armor /obj/item/clothing/suit/armor/heavy/adamantine/equipped(mob/living/carbon/human/user, slot) //Gives you a trait to prevent increasing speed. . = ..() if(slot == SLOT_WEAR_SUIT) - ADD_TRAIT(user, TRAIT_IMMUTABLE_SLOW, "immutableslow_[REF(src)]") + ADD_TRAIT(user, TRAIT_IMMUTABLE_SLOW, "immutableslow_[REF(src)]") //Adds trait to prevent increases in movespeed + user.unignore_slowdown("slimestatus") //Deletes the stable red trait on equip to prevent bypassing it + if(!(slot == SLOT_WEAR_SUIT)) + REMOVE_TRAIT(user, TRAIT_IMMUTABLE_SLOW, "immutableslow_[REF(src)]") /obj/structure/light_prism/spectral name = "spectral light prism" @@ -155,4 +158,4 @@ Slimecrossing Armor . = ..() color = newcolor light_color = newcolor - set_light(5) \ No newline at end of file + set_light(5) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 8b0b6cc6..5d72fef4 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -772,7 +772,8 @@ datum/status_effect/stabilized/blue/on_remove() if(HAS_TRAIT(owner, TRAIT_IMMUTABLE_SLOW)) return ..() else - owner.ignore_slowdown("slimestatus") + owner.ignore_slowdown("slimestatus") + return ..() /datum/status_effect/stabilized/red/on_remove() owner.unignore_slowdown("slimestatus")