From b3e9960029549dd607824ca2d23b21b6e225e26c Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 27 Apr 2020 11:49:09 -0400 Subject: [PATCH 1/2] Move machines to use default_apply_parts() --- .../components/unary/cold_sink.dm | 12 ++--- .../components/unary/heat_source.dm | 12 ++--- code/game/dna/dna_modifier.dm | 13 ++--- code/game/machinery/Sleeper.dm | 17 ++----- code/game/machinery/adv_med.dm | 11 ++-- code/game/machinery/autolathe.dm | 11 ++-- code/game/machinery/biogenerator.dm | 9 ++-- code/game/machinery/bioprinter.dm | 14 ++---- code/game/machinery/cell_charger.dm | 10 ++-- code/game/machinery/cloning.dm | 14 ++---- code/game/machinery/exonet_node.dm | 18 ++----- code/game/machinery/jukebox.dm | 6 +-- code/game/machinery/mass_driver.dm | 12 +---- code/game/machinery/pda_multicaster.dm | 14 ++---- code/game/machinery/recharger.dm | 10 ++-- code/game/machinery/rechargestation.dm | 14 ++---- code/game/machinery/telecomms/broadcaster.dm | 8 +-- .../machinery/telecomms/telecomunications.dm | 50 +++---------------- code/game/machinery/teleporter.dm | 35 +++---------- .../machinery/virtual_reality/vr_console.dm | 10 ++-- code/game/machinery/washing_machine.dm | 12 ++--- code/game/mecha/mech_bay.dm | 12 ++--- code/game/mecha/mech_fabricator.dm | 17 ++----- code/game/mecha/mech_prosthetics.dm | 15 ++---- .../detectivework/microscope/dnascanner.dm | 11 ++-- code/modules/food/kitchen/microwave.dm | 8 +-- code/modules/mining/drilling/drill.dm | 13 ++--- code/modules/paperwork/papershredder.dm | 11 ++-- code/modules/paperwork/photocopier.dm | 11 ++-- code/modules/power/batteryrack.dm | 25 ++-------- code/modules/power/grid_checker.dm | 11 ++-- code/modules/power/pacman2.dm | 15 ++---- code/modules/power/port_gen.dm | 12 +---- code/modules/power/smes_construction.dm | 16 +++--- code/modules/reagents/Chemistry-Machinery.dm | 10 ++-- code/modules/recycling/conveyor2.dm | 8 +-- code/modules/research/circuitprinter.dm | 7 +-- code/modules/research/destructive_analyzer.dm | 10 ++-- code/modules/research/protolathe.dm | 9 +--- code/modules/research/server.dm | 10 ++-- .../xenobio2/machinery/core_extractor.dm | 12 ++--- .../xenobio2/machinery/gene_manipulators.dm | 28 +++-------- code/modules/xenobio2/machinery/injector.dm | 11 ++-- .../xenobio2/machinery/slime_replicator.dm | 12 ++--- 44 files changed, 143 insertions(+), 463 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index ba092489a9..6dbe589f5b 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -21,15 +21,9 @@ var/set_temperature = T20C // Thermostat var/cooling = 0 -/obj/machinery/atmospherics/unary/freezer/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - RefreshParts() +/obj/machinery/atmospherics/unary/freezer/Initialize() + . = ..() + default_apply_parts() /obj/machinery/atmospherics/unary/freezer/atmos_init() if(node) diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index 8e4d474270..1065729e8e 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -21,15 +21,9 @@ var/set_temperature = T20C //thermostat var/heating = 0 //mainly for icon updates -/obj/machinery/atmospherics/unary/heater/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/stack/cable_coil(src, 5) - - RefreshParts() +/obj/machinery/atmospherics/unary/heater/Initialize() + . = ..() + default_apply_parts() /obj/machinery/atmospherics/unary/heater/atmos_init() if(node) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index c79a0e94be..b9b8f6db8a 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -56,16 +56,9 @@ var/obj/item/weapon/reagent_containers/glass/beaker = null var/opened = 0 -/obj/machinery/dna_scannernew/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src) - component_parts += new /obj/item/stack/cable_coil(src) - RefreshParts() +/obj/machinery/dna_scannernew/Initialize() + . = ..() + default_apply_parts() /obj/machinery/dna_scannernew/relaymove(mob/user as mob) if (user.stat) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index fcaeb9bd1d..974ba754a6 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -180,21 +180,10 @@ idle_power_usage = 15 active_power_usage = 200 //builtin health analyzer, dialysis machine, injectors. -/obj/machinery/sleeper/New() - ..() +/obj/machinery/sleeper/Initialize() + . = ..() beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src) - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) - component_parts += new /obj/item/weapon/reagent_containers/syringe(src) - component_parts += new /obj/item/weapon/reagent_containers/syringe(src) - component_parts += new /obj/item/weapon/reagent_containers/syringe(src) - component_parts += new /obj/item/stack/material/glass/reinforced(src, 2) - - RefreshParts() + default_apply_parts() /obj/machinery/sleeper/Destroy() if(console) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index a8f9297d6f..74cc941f24 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -15,14 +15,9 @@ light_color = "#00FF00" var/obj/machinery/body_scanconsole/console -/obj/machinery/bodyscanner/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/stack/material/glass/reinforced(src, 2) - RefreshParts() +/obj/machinery/bodyscanner/Initialize() + . = ..() + default_apply_parts() /obj/machinery/bodyscanner/Destroy() if(console) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7622ef1289..136c459cf7 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -26,15 +26,10 @@ var/datum/wires/autolathe/wires = null -/obj/machinery/autolathe/New() - ..() +/obj/machinery/autolathe/Initialize() + . = ..() wires = new(src) - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) + default_apply_parts() RefreshParts() /obj/machinery/autolathe/Destroy() diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 503d4ebfc2..0865a3ec55 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -15,17 +15,14 @@ var/build_eff = 1 var/eat_eff = 1 -/obj/machinery/biogenerator/New() - ..() +/obj/machinery/biogenerator/Initialize() + . = ..() var/datum/reagents/R = new/datum/reagents(1000) reagents = R R.my_atom = src beaker = new /obj/item/weapon/reagent_containers/glass/bottle(src) - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - RefreshParts() + default_apply_parts() /obj/machinery/biogenerator/on_reagent_change() //When the reagents change, change the icon as well. update_icon() diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index ec0366547f..21f65190a5 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -75,14 +75,10 @@ if(printing) overlays += "bioprinter_working" -/obj/machinery/organ_printer/New() - ..() - - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - RefreshParts() - +/obj/machinery/organ_printer/Initialize() + . = ..() + default_apply_parts() + /obj/machinery/organ_printer/examine(var/mob/user) . = ..() var/biomass = get_biomass_volume() @@ -272,7 +268,7 @@ icon_state = "bioprinter" circuit = /obj/item/weapon/circuitboard/bioprinter -/obj/machinery/organ_printer/flesh/full/New() +/obj/machinery/organ_printer/flesh/full/Initialize() . = ..() container = new /obj/item/weapon/reagent_containers/glass/bottle/biomass(src) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 636bcca6c0..ba547dbd86 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -13,13 +13,9 @@ var/chargelevel = -1 circuit = /obj/item/weapon/circuitboard/cell_charger -/obj/machinery/cell_charger/New() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/stack/cable_coil(src, 5) - RefreshParts() - ..() - return +/obj/machinery/cell_charger/Initialize() + . = ..() + default_apply_parts() /obj/machinery/cell_charger/update_icon() icon_state = "ccharger[charging ? 1 : 0]" diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 007d6a5c21..f124fa2ad5 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -46,17 +46,9 @@ var/list/containers = list() // Beakers for our liquid biomass var/container_limit = 3 // How many beakers can the machine hold? -/obj/machinery/clonepod/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - - RefreshParts() +/obj/machinery/clonepod/Initialize() + . = ..() + default_apply_parts() update_icon() /obj/machinery/clonepod/attack_ai(mob/user as mob) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index 6d6a89051a..a1ca480d26 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -21,21 +21,9 @@ // Proc: New() // Parameters: None // Description: Adds components to the machine for deconstruction. -/obj/machinery/exonet_node/map/New() - ..() - - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/ansible(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/crystal(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - RefreshParts() - +/obj/machinery/exonet_node/map/Initialize() + . = ..() + default_apply_parts() desc = "This machine is one of many, many nodes inside [using_map.starsys_name]'s section of the Exonet, connecting the [using_map.station_short] to the rest of the system, at least \ electronically." diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 3a8554dae2..344a800acf 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -50,8 +50,8 @@ datum/track/New(var/title_name, var/audio) new/datum/track("Russkiy rep Diskoteka", 'sound/music/russianrapdisco.ogg') ) -/obj/machinery/media/jukebox/New() - ..() +/obj/machinery/media/jukebox/Initialize() + . = ..() default_apply_parts() wires = new/datum/wires/jukebox(src) update_icon() @@ -60,7 +60,7 @@ datum/track/New(var/title_name, var/audio) StopPlaying() qdel(wires) wires = null - ..() + return ..() /obj/machinery/media/jukebox/proc/set_hacked(var/newhacked) if (hacked == newhacked) return diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 7c184c27de..25805c694e 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -17,16 +17,8 @@ var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. /obj/machinery/mass_driver/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - component_parts += new /obj/item/weapon/stock_parts/spring(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/stack/cable_coil(src, 5) - RefreshParts() + . = ..() + default_apply_parts() /obj/machinery/mass_driver/attackby(var/obj/item/I, mob/user) if(default_deconstruction_screwdriver(user, I)) diff --git a/code/game/machinery/pda_multicaster.dm b/code/game/machinery/pda_multicaster.dm index 9405db1554..94d46058ce 100644 --- a/code/game/machinery/pda_multicaster.dm +++ b/code/game/machinery/pda_multicaster.dm @@ -22,17 +22,9 @@ "cargo" = new /obj/item/device/pda/multicaster/cargo(src), "civilian" = new /obj/item/device/pda/multicaster/civilian(src)) -/obj/machinery/pda_multicaster/prebuilt/New() - ..() - - component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/telecomms/pda_multicaster(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/ansible(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - RefreshParts() +/obj/machinery/pda_multicaster/prebuilt/Initialize() + . = ..() + default_apply_parts() /obj/machinery/pda_multicaster/Destroy() for(var/atom/movable/AM in contents) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 5349fc44b0..22b8b6785c 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -17,13 +17,9 @@ var/portable = 1 circuit = /obj/item/weapon/circuitboard/recharger -/obj/machinery/recharger/New() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/stack/cable_coil(src, 5) - RefreshParts() - ..() - return +/obj/machinery/recharger/Initialize() + . = ..() + default_apply_parts() /obj/machinery/recharger/examine(mob/user) if(!..(user, 5)) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 3f60e0ae07..69e8e3309d 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -22,17 +22,9 @@ var/weld_power_use = 2300 // power used per point of brute damage repaired. 2.3 kW ~ about the same power usage of a handheld arc welder var/wire_power_use = 500 // power used per point of burn damage repaired. -/obj/machinery/recharge_station/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/cell/high(src) - component_parts += new /obj/item/stack/cable_coil(src, 5) - RefreshParts() - +/obj/machinery/recharge_station/Initialize() + . = ..() + default_apply_parts() update_icon() /obj/machinery/recharge_station/proc/has_cell_power() diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index f22bf58a9f..f9f95acddd 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -26,13 +26,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /obj/machinery/telecomms/processor/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/crystal(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser/high(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) + default_apply_parts() /obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) // Don't broadcast rejected signals diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index ff073359de..81f6781934 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -259,13 +259,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/receiver/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/ansible(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - RefreshParts() + default_apply_parts() /obj/machinery/telecomms/receiver/receive_signal(datum/signal/signal) @@ -329,13 +323,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/hub/Initialize() . = ..() LAZYINITLIST(telecomms_map) - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - RefreshParts() + default_apply_parts() /obj/machinery/telecomms/hub/process() . = ..() @@ -389,13 +377,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/relay/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - RefreshParts() + default_apply_parts() /obj/machinery/telecomms/relay/forceMove(var/newloc) . = ..(newloc) @@ -452,12 +434,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/bus/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - RefreshParts() + default_apply_parts() /obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) @@ -513,17 +490,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/processor/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/amplifier(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/analyzer(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - RefreshParts() + default_apply_parts() /obj/machinery/telecomms/processor/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) @@ -584,12 +551,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/server/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - RefreshParts() + default_apply_parts() /obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index a58279098d..c792639f1b 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -177,22 +177,10 @@ circuit = /obj/item/weapon/circuitboard/teleporter_hub var/obj/machinery/computer/teleporter/com -/obj/machinery/teleport/hub/New() - ..() - underlays.Cut() +/obj/machinery/teleport/hub/Initialize() + . = ..() underlays += image('icons/obj/stationobjs.dmi', icon_state = "tele-wires") - - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/stack/cable_coil(src, 10) - RefreshParts() + default_apply_parts() /obj/machinery/teleport/hub/Bumped(M as mob|obj) spawn() @@ -325,18 +313,11 @@ circuit = /obj/item/weapon/circuitboard/teleporter_station var/obj/machinery/teleport/hub/com -/obj/machinery/teleport/station/New() - ..() - overlays.Cut() - overlays += image('icons/obj/stationobjs.dmi', icon_state = "controller-wires") - - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/stack/cable_coil(src, 10) - RefreshParts() - +/obj/machinery/teleport/station/Initialize() + . = ..() + add_overlay("controller-wires") + default_apply_parts() + /obj/machinery/teleport/station/attackby(var/obj/item/weapon/W) attack_hand() diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 8a417a98bc..75236c3cd2 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -23,13 +23,9 @@ active_power_usage = 200 light_color = "#FF0000" -/obj/machinery/vr_sleeper/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/stack/material/glass/reinforced(src, 2) - - RefreshParts() +/obj/machinery/vr_sleeper/Initialize() + . = ..() + default_apply_parts() /obj/machinery/vr_sleeper/Initialize() . = ..() diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index fd46233390..2026c1dc2b 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -29,14 +29,10 @@ /obj/item/clothing/head/helmet/space ) -/obj/machinery/washing_machine/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - RefreshParts() - +/obj/machinery/washing_machine/Initialize() + . = ..() + default_apply_parts() + /obj/machinery/washing_machine/verb/start() set name = "Start Washing" set category = "Object" diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 5584590f92..c2288709e5 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -12,15 +12,9 @@ var/charge = 45 var/repair = 0 -/obj/machinery/mech_recharger/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - RefreshParts() +/obj/machinery/mech_recharger/Initialize() + . = ..() + default_apply_parts() /obj/machinery/mech_recharger/Crossed(var/obj/mecha/M) . = ..() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 9f4b633468..99f752fbe5 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -26,22 +26,11 @@ var/category = null var/sync_message = "" -/obj/machinery/mecha_part_fabricator/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - RefreshParts() - - files = new /datum/research(src) //Setup the research data holder. - return - /obj/machinery/mecha_part_fabricator/Initialize() - update_categories() . = ..() + default_apply_parts() + files = new /datum/research(src) //Setup the research data holder. + update_categories() /obj/machinery/mecha_part_fabricator/process() ..() diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 076eeed9dc..17c715e9a4 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -29,18 +29,11 @@ var/species = "Human" var/sync_message = "" -/obj/machinery/pros_fabricator/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - RefreshParts() - +/obj/machinery/pros_fabricator/Initialize() + . = ..() + default_apply_parts() + files = new /datum/research(src) //Setup the research data holder. - return /obj/machinery/pros_fabricator/Initialize() . = ..() diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 94d4acd5cd..0b9782b2c8 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -16,14 +16,9 @@ var/last_process_worldtime = 0 var/report_num = 0 -/obj/machinery/dnaforensics/New() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - RefreshParts() - ..() +/obj/machinery/dnaforensics/Initialize() + . = ..() + default_apply_parts() /obj/machinery/dnaforensics/attackby(var/obj/item/W, mob/user as mob) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 1152e4a8b8..a8da49a436 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -31,13 +31,11 @@ ********************/ /obj/machinery/microwave/Initialize() + . = ..() reagents = new/datum/reagents(100) reagents.my_atom = src - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) + default_apply_parts() if (!available_recipes) available_recipes = new @@ -60,9 +58,7 @@ acceptable_items |= /obj/item/device/soulstone acceptable_items |= /obj/item/weapon/fuel_assembly/supermatter - RefreshParts() soundloop = new(list(src), FALSE) - return ..() /obj/machinery/microwave/Destroy() QDEL_NULL(soundloop) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 3c38927910..f4e51a0c30 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -52,16 +52,9 @@ var/need_update_field = 0 var/need_player_check = 0 -/obj/machinery/mining/drill/New() - - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/cell/high(src) - - RefreshParts() +/obj/machinery/mining/drill/Initialize() + . = ..() + default_apply_parts() /obj/machinery/mining/drill/process() diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 4c927b376e..cbbe7eeb4e 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -25,14 +25,9 @@ /obj/item/weapon/paper_bundle = 3, ) -/obj/machinery/papershredder/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - RefreshParts() +/obj/machinery/papershredder/Initialize() + . = ..() + default_apply_parts() update_icon() /obj/machinery/papershredder/attackby(var/obj/item/W, var/mob/user) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index eab9984d0f..cd7f85d4e0 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -16,14 +16,9 @@ var/toner = 30 //how much toner is left! woooooo~ var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! -/obj/machinery/photocopier/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - RefreshParts() +/obj/machinery/photocopier/Initialize() + . = ..() + default_apply_parts() /obj/machinery/photocopier/examine(mob/user as mob) if(..(user, 1)) diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index d897bb827a..1266956026 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -14,19 +14,9 @@ var/capacitors_amount = 0 var/global/list/br_cache = null -/obj/machinery/power/smes/batteryrack/New() - ..() - RefreshParts() - return - -//Maybe this should be moved up to obj/machinery -/obj/machinery/power/smes/batteryrack/proc/add_parts() - component_parts = list() - component_parts += new /obj/item/weapon/cell/high - component_parts += new /obj/item/weapon/cell/high - component_parts += new /obj/item/weapon/cell/high - return - +/obj/machinery/power/smes/batteryrack/Initialize() + . = ..() + default_apply_parts() /obj/machinery/power/smes/batteryrack/RefreshParts() capacitors_amount = 0 @@ -120,15 +110,6 @@ circuit = /obj/item/weapon/circuitboard/ghettosmes var/overcharge_percent = 0 - -/obj/machinery/power/smes/batteryrack/makeshift/add_parts() - component_parts = list() - component_parts += new /obj/item/weapon/cell/high - component_parts += new /obj/item/weapon/cell/high - component_parts += new /obj/item/weapon/cell/high - return - - /obj/machinery/power/smes/batteryrack/makeshift/update_icon() overlays.Cut() if(stat & BROKEN) return diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm index 93d4918af0..224eade429 100644 --- a/code/modules/power/grid_checker.dm +++ b/code/modules/power/grid_checker.dm @@ -15,17 +15,12 @@ var/wire_allow_manual_3 = FALSE var/opened = FALSE -/obj/machinery/power/grid_checker/New() - ..() +/obj/machinery/power/grid_checker/Initialize() + . = ..() connect_to_network() update_icon() wires = new(src) - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/stack/cable_coil(src, 10) - RefreshParts() + default_apply_parts() /obj/machinery/power/grid_checker/Destroy() qdel(wires) diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 8e32cccc30..7a4075a458 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -6,8 +6,8 @@ name = "Pacman II" desc = "P.A.C.M.A.N. type II portable generator. Uses liquid phoron as a fuel source." power_gen = 4500 + circuit = /obj/item/weapon/circuitboard/pacman2 var/obj/item/weapon/tank/phoron/P = null - var/board_path = "/obj/item/weapon/circuitboard/pacman2" var/emagged = 0 var/heat = 0 /* @@ -30,16 +30,9 @@ P.air_contents.phoron -= 0.01 return - New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/stack/cable_coil(src) - component_parts += new /obj/item/stack/cable_coil(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new board_path(src) - RefreshParts() + Initialize() + . = ..() + default_apply_parts() RefreshParts() var/temp_rating = 0 diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 4515b6125c..b64e2d837c 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -112,18 +112,10 @@ /obj/machinery/power/port_gen/pacman/Initialize() . = ..() + default_apply_parts() if(anchored) connect_to_network() - -/obj/machinery/power/port_gen/pacman/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - RefreshParts() - + /obj/machinery/power/port_gen/pacman/Destroy() DropFuel() return ..() diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 6a9e6bfaff..93e9189a8b 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -41,23 +41,23 @@ // These are used on individual outposts as backup should power line be cut, or engineering outpost lost power. // 1M Charge, 150K I/O -/obj/machinery/power/smes/buildable/outpost_substation/New() - ..(0) +/obj/machinery/power/smes/buildable/outpost_substation/Initialize() + . = ..() component_parts += new /obj/item/weapon/smes_coil/weak(src) recalc_coils() // This one is pre-installed on engineering shuttle. Allows rapid charging/discharging for easier transport of power to outpost // 11M Charge, 2.5M I/O -/obj/machinery/power/smes/buildable/power_shuttle/New() - ..(0) +/obj/machinery/power/smes/buildable/power_shuttle/Initialize() + . = ..() component_parts += new /obj/item/weapon/smes_coil/super_io(src) component_parts += new /obj/item/weapon/smes_coil/super_io(src) component_parts += new /obj/item/weapon/smes_coil(src) recalc_coils() // Pre-installed and pre-charged SMES hidden from the station, for use in submaps. -/obj/machinery/power/smes/buildable/point_of_interest/New() - ..(1) +/obj/machinery/power/smes/buildable/point_of_interest/Initialize() + . = ..() charge = 1e7 // Should be enough for an individual POI. RCon = FALSE input_level = input_level_max @@ -119,7 +119,8 @@ // 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(var/install_coils = 1) + . = ..() component_parts = list() component_parts += new /obj/item/stack/cable_coil(src,30) wires = new /datum/wires/smes(src) @@ -129,7 +130,6 @@ for(var/i = 1, i <= cur_coils, i++) component_parts += new /obj/item/weapon/smes_coil(src) recalc_coils() - ..() // Proc: attack_hand() // Parameters: None diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index b7df9ff8f8..079f162e2c 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -365,14 +365,10 @@ /obj/item/stack/material/glass/phoronglass = list("platinum", "silicon", "silicon", "silicon"), //5 platinum, 15 silicon, ) -/obj/machinery/reagentgrinder/New() - ..() +/obj/machinery/reagentgrinder/Initialize() + . = ..() beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src) - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - RefreshParts() - return + default_apply_parts() /obj/machinery/reagentgrinder/update_icon() icon_state = "juicer"+num2text(!isnull(beaker)) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 4cc755d158..91b04cf494 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -38,13 +38,7 @@ operating = FORWARDS setmove() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/gear(src) - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/weapon/stock_parts/gear(src) - component_parts += new /obj/item/weapon/stock_parts/motor(src) - component_parts += new /obj/item/stack/cable_coil(src,5) - RefreshParts() + default_apply_parts() /obj/machinery/conveyor/proc/setmove() if(operating == FORWARDS) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index f9ff3adb51..468c7ff6bb 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -26,12 +26,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). /obj/machinery/r_n_d/circuit_imprinter/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) - RefreshParts() + default_apply_parts() /obj/machinery/r_n_d/circuit_imprinter/process() ..() diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index a17bf370bf..78d8f9d323 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -16,13 +16,9 @@ Note: Must be placed within 3 tiles of the R&D Console idle_power_usage = 30 active_power_usage = 2500 -/obj/machinery/r_n_d/destructive_analyzer/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - RefreshParts() +/obj/machinery/r_n_d/destructive_analyzer/Initialize() + . = ..() + default_apply_parts() /obj/machinery/r_n_d/destructive_analyzer/RefreshParts() var/T = 0 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 3837e13aae..d8b3a995be 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -21,14 +21,7 @@ /obj/machinery/r_n_d/protolathe/Initialize() . = ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) - RefreshParts() + default_apply_parts() /obj/machinery/r_n_d/protolathe/process() ..() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 7491c94e23..3227e1528d 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -15,13 +15,9 @@ req_access = list(access_rd) //Only the R&D can change server settings. circuit = /obj/item/weapon/circuitboard/rdserver -/obj/machinery/r_n_d/server/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/stack/cable_coil(src) - component_parts += new /obj/item/stack/cable_coil(src) - RefreshParts() +/obj/machinery/r_n_d/server/Initialize() + . = ..() + default_apply_parts() /obj/machinery/r_n_d/server/Destroy() griefProtection() diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm index eb1052bade..5b38a939da 100644 --- a/code/modules/xenobio2/machinery/core_extractor.dm +++ b/code/modules/xenobio2/machinery/core_extractor.dm @@ -18,16 +18,10 @@ var/operatingcolor = "#FFFF22" -/obj/machinery/slime/extractor/New() - ..() +/obj/machinery/slime/extractor/Initialize() + . = ..() + default_apply_parts() update_light_color() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - RefreshParts() /obj/machinery/slime/extractor/attackby(var/obj/item/W, var/mob/user) diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index 9dac5b8021..478716aef9 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -123,17 +123,10 @@ var/datum/xeno/traits/genetics // Currently scanned xeno genetic structure. var/degradation = 0 // Increments with each scan, stops allowing gene mods after a certain point. -/obj/machinery/xenobio/extractor/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - RefreshParts() - +/obj/machinery/xenobio/extractor/Initialize() + . = ..() + default_apply_parts() + /obj/machinery/xenobio/extractor/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/xenoproduct)) if(product) @@ -265,16 +258,9 @@ var/mob/living/simple_animal/xeno/slime/occupant -/obj/machinery/xenobio/editor/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - RefreshParts() +/obj/machinery/xenobio/editor/Initialize() + . = ..() + default_apply_parts() /obj/machinery/xenobio/editor/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/grab)) diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm index f90d9dbdb5..250e4cbc73 100644 --- a/code/modules/xenobio2/machinery/injector.dm +++ b/code/modules/xenobio2/machinery/injector.dm @@ -19,18 +19,13 @@ circuit = /obj/item/weapon/circuitboard/xenobioinjectormachine -/obj/machinery/xenobio2/manualinjector/New() - ..() +/obj/machinery/xenobio2/manualinjector/Initialize() + . = ..() var/datum/reagents/R = new/datum/reagents(1000) reagents = R R.my_atom = src beaker = new /obj/item/weapon/reagent_containers/glass/beaker(src) - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - RefreshParts() + default_apply_parts() /obj/machinery/xenobio2/manualinjector/update_icon() if(beaker) diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm index 662096071a..9e4969d635 100644 --- a/code/modules/xenobio2/machinery/slime_replicator.dm +++ b/code/modules/xenobio2/machinery/slime_replicator.dm @@ -17,17 +17,11 @@ var/emptycolor = "#FF2222" var/operatingcolor = "#FFFF22" -/obj/machinery/slime/replicator/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - RefreshParts() +/obj/machinery/slime/replicator/Initialize() + . = ..() + default_apply_parts() update_light_color() - /obj/machinery/slime/replicator/attackby(var/obj/item/W, var/mob/user) //Let's try to deconstruct first. if(W.is_screwdriver() && !inuse) From 6fe3734158ec6211b94f0e5d3a68def36dfc6481 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 27 Apr 2020 11:57:58 -0400 Subject: [PATCH 2/2] Redundancy in circuit creation --- code/game/machinery/machinery.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index aeb7e6d06b..b72cab14f0 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -123,12 +123,14 @@ Class Procs: ..(l) if(d) set_dir(d) - if(circuit) + if(ispath(circuit)) circuit = new circuit(src) /obj/machinery/Initialize() . = ..() global.machines += src + if(ispath(circuit)) + circuit = new circuit(src) if(!speed_process) START_MACHINE_PROCESSING(src) else