Merge branch 'master' into upstream-merge-29940

code/modules/power/singularity/collector.dm

@@ -21,8 +21,8 @@ GLOBAL_LIST_EMPTY(rad_collectors)
 /obj/machinery/power/rad_collector/anchored
 	anchored = TRUE
 
-/obj/machinery/power/rad_collector/New()
-	..()
+/obj/machinery/power/rad_collector/Initialize()
+	. = ..()
 	GLOB.rad_collectors += src
 
 /obj/machinery/power/rad_collector/Destroy()

code/modules/power/singularity/emitter.dm

@@ -3,20 +3,17 @@
 	desc = "A heavy-duty industrial laser, often used in containment fields and power generation.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "emitter"
-	var/icon_state_on = "emitter_+a"
+
 	anchored = FALSE
 	density = TRUE
 	req_access = list(ACCESS_ENGINE_EQUIP)
-
-	// The following 3 vars are mostly for the prototype
-	var/manual = FALSE
-	var/charge = 0
-	var/atom/target = null
+	circuit = /obj/item/weapon/circuitboard/machine/emitter
 
 	use_power = NO_POWER_USE
 	idle_power_usage = 10
 	active_power_usage = 300
 
+	var/icon_state_on = "emitter_+a"
 	var/active = 0
 	var/powered = 0
 	var/fire_delay = 100
@@ -33,6 +30,11 @@
 
 	var/datum/effect_system/spark_spread/sparks
 
+	// The following 3 vars are mostly for the prototype
+	var/manual = FALSE
+	var/charge = 0
+	var/atom/target
+
 /obj/machinery/power/emitter/anchored
 	anchored = TRUE
 
@@ -46,20 +48,16 @@
 	state = 2
 	use_power = FALSE
 
-/obj/machinery/power/emitter/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/emitter(null)
-	B.apply_default_parts(src)
+/obj/machinery/power/emitter/Initialize()
+	. = ..()
 	RefreshParts()
 	wires = new /datum/wires/emitter(src)
+	if(state == 2 && anchored)
+		connect_to_network()
 
-/obj/item/weapon/circuitboard/machine/emitter
-	name = "Emitter (Machine Board)"
-	build_path = /obj/machinery/power/emitter
-	origin_tech = "programming=3;powerstorage=4;engineering=4"
-	req_components = list(
-							/obj/item/weapon/stock_parts/micro_laser = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1)
+	sparks = new
+	sparks.attach(src)
+	sparks.set_up(5, TRUE, src)
 
 /obj/machinery/power/emitter/RefreshParts()
 	var/max_firedelay = 120
@@ -100,15 +98,6 @@
 	else
 		rotate()
 
-/obj/machinery/power/emitter/Initialize()
-	. = ..()
-	if(state == 2 && anchored)
-		connect_to_network()
-
-	sparks = new
-	sparks.attach(src)
-	sparks.set_up(5, TRUE, src)
-
 /obj/machinery/power/emitter/Destroy()
 	if(SSticker.IsRoundInProgress())
 		var/turf/T = get_turf(src)

code/modules/power/singularity/field_generator.dm

@@ -49,8 +49,8 @@ field_generator power level display
 		add_overlay("+p[power_level]")
 
 
-/obj/machinery/field/generator/New()
-	..()
+/obj/machinery/field/generator/Initialize()
+	. = ..()
 	fields = list()
 	connected_gens = list()
 

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

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

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

@@ -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()
+ 	. = ..()