Merge pull request #10765 from Citadel-Station-13/kevinz000-patch-15

skittish sanity checks aka "Kev, this isn't a powergamer trait" they said, and now look where we are at?
2020-01-28 03:01:33 -08:00
parent 8bae366652 a1a2d45be6
commit 8e0a674845
1 changed files with 1 additions and 1 deletions
@@ -532,7 +532,7 @@
 /obj/structure/closet/CtrlShiftClick(mob/living/user)
 	if(!HAS_TRAIT(user, TRAIT_SKITTISH))
 		return ..()
-	if(!user.canUseTopic(src) || !isturf(user.loc))
+	if(!user.canUseTopic(src) || !isturf(user.loc) || !user.Adjacent(src) || !user.CanReach(src))
 		return
 	dive_into(user)