Convert a fuck ton of machines to Initialize() (#2985)

Needs testing, but shouldn't break anything. Also adds Destroy() to the SMES base class.
This commit is contained in:
Lohikar
2017-07-14 20:08:59 +03:00
committed by skull132
parent 12ccc4e7a7
commit b5472e50f4
43 changed files with 104 additions and 116 deletions
+9 -4
View File
@@ -36,8 +36,8 @@ proc/cardinalrange(var/center)
/obj/machinery/am_shielding/map
mapped = 1
/obj/machinery/am_shielding/New(loc, var/obj/machinery/power/am_control_unit/AMC)
..()
/obj/machinery/am_shielding/Initialize(mapload, var/obj/machinery/power/am_control_unit/AMC)
. = ..()
if(!AMC)
if (!mapped)
WARNING("AME sector somehow created without a parent control unit!")
@@ -45,8 +45,13 @@ proc/cardinalrange(var/center)
return
link_control(AMC)
remove_machine(src)
spawn (10)
update_icon()
if (mapload)
. = INITIALIZE_HINT_LATELOAD
else
addtimer(CALLBACK(src, /atom/.proc/update_icon), 1 SECOND)
/obj/machinery/am_shielding/LateInitialize()
update_icon()
/obj/machinery/am_shielding/proc/link_control(var/obj/machinery/power/am_control_unit/AMC)
if(!istype(AMC))
+2 -3
View File
@@ -12,11 +12,10 @@
var/cells_amount = 0
var/capacitors_amount = 0
/obj/machinery/power/smes/batteryrack/New()
..()
/obj/machinery/power/smes/batteryrack/Initialize()
. = ..()
add_parts()
RefreshParts()
return
//Maybe this should be moved up to obj/machinery
/obj/machinery/power/smes/batteryrack/proc/add_parts()
+2 -2
View File
@@ -17,8 +17,8 @@ var/global/list/rad_collectors = list()
var/locked = 0
var/drainratio = 1
/obj/machinery/power/rad_collector/New()
..()
/obj/machinery/power/rad_collector/Initialize()
. = ..()
rad_collectors += src
/obj/machinery/power/rad_collector/Destroy()
@@ -28,8 +28,8 @@ field_generator power level display
var/power = 30000 // Current amount of power
var/state = 0
var/warming_up = 0
var/list/obj/machinery/containment_field/fields
var/list/obj/machinery/field_generator/connected_gens
var/list/obj/machinery/containment_field/fields = list()
var/list/obj/machinery/field_generator/connected_gens = list()
var/clean_up = 0
//If keeping field generators powered is hard then increase the emitter active power usage.
@@ -52,12 +52,6 @@ field_generator power level display
if(level)
add_overlay("+p[level]")
/obj/machinery/field_generator/New()
..()
fields = list()
connected_gens = list()
return
/obj/machinery/field_generator/machinery_process()
if(Varedit_start == 1)
if(active == 0)
@@ -21,11 +21,11 @@
var/parts = null
var/datum/wires/particle_acc/control_box/wires = null
/obj/machinery/particle_accelerator/control_box/New()
/obj/machinery/particle_accelerator/control_box/Initialize()
wires = new(src)
connected_parts = list()
active_power_usage = initial(active_power_usage) * (strength + 1)
..()
. = ..()
/obj/machinery/particle_accelerator/control_box/Destroy()
if(active)
+1
View File
@@ -78,6 +78,7 @@
QDEL_NULL(big_spark)
QDEL_NULL(small_spark)
SSpower.smes_units -= src
QDEL_NULL(terminal)
return ..() // TODO: Properly clean up terminal.
/obj/machinery/power/smes/Initialize()
+2 -2
View File
@@ -106,7 +106,7 @@
// Proc: New()
// Parameters: None
// Description: Adds standard components for this SMES, and forces recalculation of properties.
/obj/machinery/power/smes/buildable/New(var/install_coils = 1)
/obj/machinery/power/smes/buildable/Initialize(mapload, install_coils = 1)
component_parts = list()
component_parts += new /obj/item/stack/cable_coil(src,30)
component_parts += new /obj/item/weapon/circuitboard/smes(src)
@@ -120,7 +120,7 @@
SSmachinery.queue_rcon_update()
..()
. = ..()
// Proc: attack_hand()
// Parameters: None
+4 -4
View File
@@ -8,8 +8,8 @@
var/power_loss = 2
var/input_power_multiplier = 1
/obj/machinery/power/tesla_coil/New()
..()
/obj/machinery/power/tesla_coil/Initialize()
. = ..()
component_parts = list()
// component_parts += new /obj/item/weapon/circuitboard/tesla_coil(null)
component_parts += new /obj/item/weapon/stock_parts/capacitor(null)
@@ -62,8 +62,8 @@
anchored = 0
density = 1
/obj/machinery/power/grounding_rod/New()
..()
/obj/machinery/power/grounding_rod/Initialize()
. = ..()
component_parts = list()
// component_parts += new /obj/item/weapon/circuitboard/grounding_rod(null)
component_parts += new /obj/item/weapon/stock_parts/capacitor(null)