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 #6680 from VOREStation/upstream-merge-6735

Browse Source 
[MIRROR] Fixes custom table placement
This commit is contained in:
Novacat
2020-02-25 09:18:35 -05:00
committed by GitHub
parent c38cbe3c36 18539213c1
commit 75f49ad7a9
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/tables/interactions.dm
View File

@@ -65,13 +65,11 @@
return ..()
if(isrobot(user))
return
user.drop_item()
if (O.loc != src.loc)
step(O, get_dir(O, src))
user.unEquip(O, 0, src.loc)
return
/obj/structure/table/attackby(obj/item/W as obj, mob/user as mob, var/click_parameters)
/obj/structure/table/attackby(obj/item/W as obj, mob/user as mob, var/hit_modifier, var/click_parameters)
if (!W) return
// Handle harm intent grabbing/tabling.