Merge remote-tracking branch 'upstream/master' into diagonal-movement

code/modules/assembly/assembly.dm

@@ -125,7 +125,7 @@
 	..()
 
 /obj/item/assembly/process()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 
 /obj/item/assembly/examine(mob/user)
 	..()

code/modules/assembly/health.dm

@@ -21,10 +21,10 @@
 /obj/item/assembly/health/toggle_secure()
 	secured = !secured
 	if(secured && scanning)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	else
 		scanning = FALSE
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	update_icon()
 	return secured
 
@@ -66,9 +66,9 @@
 		return FALSE
 	scanning = !scanning
 	if(scanning)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	else
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	return
 
 /obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy

code/modules/assembly/infrared.dm

@@ -42,12 +42,12 @@
 /obj/item/assembly/infra/toggle_secure()
 	secured = !secured
 	if(secured)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	else
 		on = FALSE
 		if(first)
 			qdel(first)
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	update_icon()
 	return secured
 

code/modules/assembly/proximity.dm

@@ -28,11 +28,11 @@
 /obj/item/assembly/prox_sensor/toggle_secure()
 	secured = !secured
 	if(secured)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	else
 		scanning = 0
 		timing = 0
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	update_icon()
 	return secured
 

code/modules/assembly/timer.dm

@@ -29,10 +29,10 @@
 /obj/item/assembly/timer/toggle_secure()
 	secured = !secured
 	if(secured)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	else
 		timing = FALSE
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	update_icon()
 	return secured