cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1191 from Kelenius/inventoryCleanup

Browse Source 
Mob inventory cleanup
This commit is contained in:
Neerti
2016-03-22 21:42:27 -04:00
parent 9027b0f391 afbc235b96
commit a9ad84da4b
59 changed files with 432 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/objects/objs.dm
View File

@@ -90,11 +90,12 @@
// check for TK users
if (istype(usr, /mob/living/carbon/human))
if(istype(usr.l_hand, /obj/item/tk_grab) || istype(usr.r_hand, /obj/item/tk_grab/))
if(!(usr in nearby))
if(usr.client && usr.machine==src)
var/mob/living/carbon/human/H = usr
if(H.get_type_in_hands(/obj/item/tk_grab))
if(!(H in nearby))
if(H.client && H.machine==src)
is_in_use = 1
src.attack_hand(usr)
src.attack_hand(H)
in_use = is_in_use
/obj/proc/updateDialog()