From 9a8d5462aca8d7f43d3849348694cdbf4efc8730 Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Thu, 13 Nov 2025 18:21:34 -0500 Subject: [PATCH] Various skittish fixes (#30994) * skittish fixes * Update code/game/objects/structures/crates_lockers/closets.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> --------- Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/game/objects/structures/crates_lockers/closets.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 4f45de3d156..d0cc5a94a6d 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -179,6 +179,12 @@ var/mob/living/carbon/human/user = AM if(!HAS_TRAIT(user, TRAIT_SKITTISH)) return + if(QDELETED(src)) + return + if(!user.can_use_hands()) + return + if(user.stat != CONSCIOUS) + return if(user.m_intent != MOVE_INTENT_RUN) return if(!COOLDOWN_FINISHED(user, skittish_cooldown)) @@ -188,7 +194,7 @@ return locked = FALSE if(opened || open()) - user.forceMove(src) + user.forceMove(loc) close() COOLDOWN_START(user, skittish_cooldown, 2 SECONDS)