From d14be222b8abfbbabb21a7a2eeed4afb56579a6a Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Sun, 15 Apr 2012 01:29:38 +0100
Subject: [PATCH] Fixes cyborgs putting items on Operating Tables and Janitor
 Borgs trashbags.

---
 code/game/machinery/OpTable.dm     | 4 ++++
 code/modules/recycling/disposal.dm | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index ee9041ad4ad..4395fbea8cd 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -83,6 +83,8 @@
 			return 0
 
 	MouseDrop_T(obj/O as obj, mob/user as mob)
+		if(isrobot(user))
+			return
 		if ((!( istype(O, /obj/item/weapon) ) || user.equipped() != O))
 			return
 		user.drop_item()
@@ -110,6 +112,8 @@
 		check_victim()
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(isrobot(user))
+			return
 		if (istype(W, /obj/item/weapon/grab))
 			if(ismob(W:affecting))
 				var/mob/M = W:affecting
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 1b7286af72c..c190f64b6fe 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -45,10 +45,6 @@
 		if(stat & BROKEN || !I || !user)
 			return
 
-		//robots shouldn't be able to grab/carry stuff anyway
-		if(isrobot(user))
-			return
-
 		if(istype(I, /obj/item/weapon/melee/energy/blade))
 			user << "You can't place that item inside the disposal unit."
 			return
@@ -62,6 +58,10 @@
 			update()
 			return
 
+		//robots shouldn't be able to grab/carry stuff anyway
+		if(isrobot(user))
+			return
+
 		if(istype(I, /obj/item/ashtray) && (I.health > 0))
 			user << "\blue You empty the ashtray into [src]."
 			for(var/obj/item/O in I.contents)