cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +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

7
code/modules/research/xenoarchaeology/artifact/artifact.dm
View File

@@ -108,10 +108,9 @@
. = ..()
if(istype(AM,/mob/living/carbon/human))
var/mob/living/carbon/human/H = AM
if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
attackby(H.l_hand,H)
else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
attackby(H.r_hand,H)
var/obj/item/weapon/pickaxe/P = H.get_inactive_hand()
if(istype(P))
src.attackby(P, H)
else if(istype(AM,/mob/living/silicon/robot))
var/mob/living/silicon/robot/R = AM