Merge pull request #6563 from Citadel-Station-13/upstream-merge-37485

[MIRROR] Condenses a check
This commit is contained in:
deathride58
2018-04-29 22:30:41 +00:00
committed by GitHub
+1 -1
View File
@@ -363,7 +363,7 @@
/obj/screen/storage/Click(location, control, params)
if(world.time <= usr.next_move)
return TRUE
if(usr.stat || usr.IsUnconscious() || usr.IsKnockdown() || usr.IsStun())
if(usr.incapacitated())
return TRUE
if (ismecha(usr.loc)) // stops inventory actions in a mech
return TRUE