Merge pull request #278 from Orotheim/master

Xenobio Bug Squashing
This commit is contained in:
evilew
2024-09-22 21:52:54 +02:00
committed by GitHub
3 changed files with 7 additions and 3 deletions
@@ -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)
set_light(5)
@@ -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")
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB