Bugfix for borgs&doors as well as chem grenades.

code/modules/assembly/assembly.dm

@@ -140,6 +140,7 @@
 
 
 	process()
+		processing_objects.Remove(src)
 		return
 
 

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

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()
 

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

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."