mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 19:44:09 +01:00
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>
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user