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

Merge pull request #5993 from GinjaNinja32/proximity2

Browse Source 
More proximity fixes
This commit is contained in:
Chinsky
2014-08-14 22:55:29 +04:00
parent bcf0a57aa0 95528fb448
commit 07ed87ccd9
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/silicon/robot/robot_items.dm
View File

@@ -6,7 +6,9 @@
name = "RoboTray"
desc = "An autoloading tray specialized for carrying refreshments."
/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob)
/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob, proximity)
if(!proximity)
return
if ( !target )
return
// pick up items, mostly copied from base tray pickup proc