Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -19,10 +19,10 @@
 	var/powered = 0
 	mouse_opacity = 2

-/obj/machinery/particle_accelerator/control_box/New()
+/obj/machinery/particle_accelerator/control_box/Initialize()
+	. = ..()
 	wires = new /datum/wires/particle_accelerator/control_box(src)
 	connected_parts = list()
-	..()

 /obj/machinery/particle_accelerator/control_box/Destroy()
 	if(active)
@@ -31,8 +31,7 @@
 		var/obj/structure/particle_accelerator/part = CP
 		part.master = null
 	connected_parts.Cut()
-	qdel(wires)
-	wires = null
+	QDEL_NULL(wires)
 	return ..()

 /obj/machinery/particle_accelerator/control_box/attack_hand(mob/user)
@@ -0,0 +1,10 @@
+diff a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm	(rejected hunks)
+@@ -17,7 +17,7 @@
+ 	var/active = 0
+ 	var/strength = 0
+ 	var/powered = 0
+-	mouse_opacity = 2
+	mouse_opacity = MOUSE_OPACITY_OPAQUE
+ 
+ /obj/machinery/particle_accelerator/control_box/Initialize()
+ 	. = ..()