Merge branch 'master' into upstream-merge-10401

code/modules/power/cable.dm

@@ -635,7 +635,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
 		src.use(15)
 	else
 		to_chat(usr, "<span class='notice'>You cannot do that.</span>")
-	..()
 
 /obj/item/stack/cable_coil/cyborg/verb/set_colour()
 	set name = "Change Colour"

code/modules/power/fusion/core/core_field.dm

@@ -531,12 +531,10 @@
 
 	if(percent_unstable >= warnpoint) //we're unstable, start warning engineering
 		global_announcer.autosay(warnmessage, "Field Stability Monitor", "Engineering")
-		stable = 0 //we know we're not stable, so let's not state the safe message.
-		sleep(20)
-	return
-	if(percent_unstable < warnpoint && stable == 0) //The field is stable again. Let's set our safe variable and state the safe message.
+		stable = FALSE //we know we're not stable, so let's not state the safe message.
+	else if(percent_unstable < warnpoint && stable == 0) //The field is stable again. Let's set our safe variable and state the safe message.
 		global_announcer.autosay(stablemessage, "Field Stability Monitor", "Engineering")
-		stable = 1
+		stable = TRUE
 	return
 
 //Reaction radiation is fairly buggy and there's at least three procs dealing with radiation here, this is to ensure constant radiation output.

code/modules/power/singularity/containment_field.dm

@@ -18,7 +18,7 @@
 /obj/machinery/containment_field/Initialize()
 	. = ..()
 	shockdirs = list(turn(dir,90),turn(dir,-90))
-	sense_proximity(callback = .HasProximity)
+	sense_proximity(callback = /atom/proc/HasProximity)
 
 /obj/machinery/containment_field/set_dir(new_dir)
 	. = ..()
@@ -26,7 +26,7 @@
 		shockdirs = list(turn(dir,90),turn(dir,-90))
 
 /obj/machinery/containment_field/Destroy()
-	unsense_proximity(callback = .HasProximity)
+	unsense_proximity(callback = /atom/proc/HasProximity)
 	if(FG1 && !FG1.clean_up)
 		FG1.cleanup()
 	if(FG2 && !FG2.clean_up)

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -244,7 +244,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 			update_state()
 		update_icon()
 		return 1
-	return 0
 
 
 
@@ -384,4 +383,3 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 			update_use_power(USE_POWER_IDLE)
 		update_icon()
 		return 1
-	return 0