diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 8aaac08db5..fe5606c369 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -528,7 +528,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 				if (src.canAIHack())
 					src.hack(user)
 					return
-		else if(user)
+		else if(user && !isrobot(user))
 			if(!C)
 				return
 			if(C.in_use)
@@ -542,7 +542,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 				return
 			if(istype(C, /obj/item/device/hacktool/engineer))
 				return
-		else
+		else if(!isrobot(user))
 			world << "ERROR: Mob was null when calling attack_ai on [src.name] at [src.x],[src.y],[src.z]"
 			return
 
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 6e7df37b39..039aac0192 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -140,6 +140,7 @@
 
 
 	process()
+		processing_objects.Remove(src)
 		return
 
 
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 3a4633f21b..f6091cb602 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -45,10 +45,6 @@
 		if(scanning)
 			src.overlays += text("infrared_old2")
 			src.small_icon_state_overlays += text("infrared_on")
-			if(master && istype(master, /obj/item/weapon/chem_grenade))
-				var/obj/item/weapon/chem_grenade/M = master
-				M.c_state(1)
-
 		if(holder)
 			holder.update_icon()
 		return
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index bcb5b31b7e..911ca27f02 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -87,15 +87,9 @@
 		if(timing)
 			overlays += text("prox_timing")
 			small_icon_state_overlays += text("prox_timing")
-			if(master && istype(master, /obj/item/weapon/chem_grenade))
-				var/obj/item/weapon/chem_grenade/M = master
-				M.c_state(1)
 		if(scanning)
 			overlays += text("prox_scanning")
 			small_icon_state_overlays += text("prox_scanning")
-			if(master && istype(master, /obj/item/weapon/chem_grenade))
-				var/obj/item/weapon/chem_grenade/M = master
-				M.c_state(1)
 		if(holder)
 			holder.update_icon()
 
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 2ba02fd7c0..4b942d4a41 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -64,9 +64,6 @@
 		if(timing)
 			overlays += text("timer_timing")
 			small_icon_state_overlays += text("timer_timing")
-			if(master && istype(master, /obj/item/weapon/chem_grenade))
-				var/obj/item/weapon/chem_grenade/M = master
-				M.c_state(1)
 		if(holder)
 			holder.update_icon()
 		return
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 5cef2efbcb..e962e41725 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -289,12 +289,6 @@
 				if(beaker_two)
 					beaker_two.loc = get_turf(src.loc)
 
-		c_state(var/i = 0)
-			if(i)
-				icon_state = initial(icon_state) + "_armed"
-			return
-
-
 	large
 		name = "Large Chem Grenade"
 		desc = "An oversized grenade that affects a larger area."