shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-37486

Browse Source
This commit is contained in:
deathride58
2018-05-06 07:15:48 +00:00
committed by GitHub
parent f46a77ba5c 11c1e8fbf7
commit 50f8779fc0
727 changed files with 10369 additions and 18653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/screen_objects.dm
+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