Conflicts:
	code/game/machinery/OpTable.dm
This commit is contained in:
Zuhayr
2014-07-12 22:03:55 -04:00
committed by ZomgPonies
parent 9c0a28b9d3
commit d4b954ddc5
+1 -5
View File
@@ -138,10 +138,6 @@
take_victim(W:affecting,usr)
del(W)
return
user.drop_item()
if(W && W.loc)
W.loc = src.loc
return
/obj/machinery/optable/slime
icon_state = "table-slime"
icon_state = "table-slime"