From f939800c68e2b9596d548a99fed9546235eb460e Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 30 Jul 2015 22:19:32 +0200 Subject: [PATCH] Update upgradable machinery New code --- code/game/dna/dna_modifier.dm | 28 ++++++------- code/game/machinery/Freezer.dm | 28 ++++++------- code/game/machinery/Sleeper.dm | 32 +++++++-------- code/game/machinery/adv_med.dm | 28 +++++++++---- code/game/machinery/biogenerator.dm | 28 +++++++++---- code/game/machinery/cloning.dm | 32 +++++++-------- code/game/machinery/cryo.dm | 28 ++++++------- code/game/machinery/rechargestation.dm | 21 +++++----- code/game/mecha/mech_bay.dm | 28 ++++++------- .../game/vehicles/spacepods/pod_fabricator.dm | 1 + code/modules/hydroponics/trays/tray.dm | 8 ++-- code/modules/mining/equipment_locker.dm | 11 +++++ code/modules/power/pacman2.dm | 23 ++++++++--- code/modules/power/port_gen.dm | 23 ++++++++--- code/modules/power/smes.dm | 41 +++++++++++++------ code/modules/reagents/Chemistry-Machinery.dm | 26 ++++++++---- code/modules/reagents/newchem/chem_heater.dm | 14 +++++-- code/modules/research/circuitprinter.dm | 23 ++++++++--- code/modules/research/destructive_analyzer.dm | 9 ++++ code/modules/research/protolathe.dm | 28 +++++++++---- code/modules/research/server.dm | 19 ++++++--- code/modules/telesci/telepad.dm | 11 +++++ 22 files changed, 317 insertions(+), 173 deletions(-) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index ef87104bd35..7239061a61d 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -57,25 +57,25 @@ /obj/machinery/dna_scannernew/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/clonescanner(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/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/clonescanner(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/dna_scannernew/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/clonescanner(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/clonescanner(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/dna_scannernew/RefreshParts() diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 3c9d02f0f2e..86ec3c9d9bc 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -13,25 +13,25 @@ ..() initialize_directions = dir component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/thermomachine(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/micro_laser(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, 1) + component_parts += new /obj/item/weapon/circuitboard/thermomachine(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/atmospherics/unary/cold_sink/freezer/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/thermomachine(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src) - component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/thermomachine(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 9943e446f8c..45931d44b89 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -29,10 +29,10 @@ /obj/machinery/sleep_console/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/sleep_console(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) + component_parts += new /obj/item/weapon/circuitboard/sleep_console(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() findsleeper() @@ -231,28 +231,28 @@ /obj/machinery/sleeper/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/sleeper(src) + component_parts += new /obj/item/weapon/circuitboard/sleeper(null) // Customizable bin rating, used by the labor camp to stop people filling themselves with chemicals and escaping. - var/obj/item/weapon/stock_parts/matter_bin/B = new(src) + var/obj/item/weapon/stock_parts/matter_bin/B = new(null) B.rating = initial_bin_rating component_parts += B - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/sleeper/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/sleeper(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/sleeper(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/sleeper/RefreshParts() diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index f3090cdfb67..a02e47faa8d 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -22,11 +22,21 @@ /obj/machinery/bodyscanner/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/bodyscanner(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/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) + component_parts += new /obj/item/weapon/circuitboard/bodyscanner(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) + RefreshParts() + +/obj/machinery/bodyscanner/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/bodyscanner(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() /obj/machinery/bodyscanner/RefreshParts() @@ -261,10 +271,10 @@ /obj/machinery/body_scanconsole/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/bodyscanner_console(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) + component_parts += new /obj/item/weapon/circuitboard/bodyscanner_console(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() findscanner() diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index ea0f169dffa..c36c8ad20ca 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -16,15 +16,25 @@ var/productivity = 0 /obj/machinery/biogenerator/New() - ..() - create_reagents(1000) - component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/biogenerator(null) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) - component_parts += new /obj/item/weapon/stock_parts/manipulator(null) - component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() + ..() + create_reagents(1000) + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/biogenerator(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() + +/obj/machinery/biogenerator/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/biogenerator(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() /obj/machinery/biogenerator/RefreshParts() var/E = 0 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 3b4fc5c4377..bfac63984f9 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -35,14 +35,14 @@ /obj/machinery/clonepod/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/clonepod(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/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/clonepod(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() update_icon() @@ -50,14 +50,14 @@ /obj/machinery/clonepod/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/clonepod(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/clonepod(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/clonepod/Destroy() diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 5d2e551f64f..126cfd70a70 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -30,25 +30,25 @@ initialize_directions = dir initialize() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/cryo_tube(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/cryo_tube(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/atmospherics/unary/cryo_cell/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/cryo_tube(src) - component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/cryo_tube(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/atmospherics/unary/cryo_cell/RefreshParts() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 9ce5ccc2296..49ea6865f58 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -15,24 +15,23 @@ /obj/machinery/recharge_station/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/cyborgrecharger(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/weapon/stock_parts/cell/high(src) + component_parts += new /obj/item/weapon/circuitboard/cyborgrecharger(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/cell/high(null) RefreshParts() build_icon() /obj/machinery/recharge_station/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/cyborgrecharger(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(src) - component_parts += new /obj/item/weapon/stock_parts/cell/hyper(src) + component_parts += new /obj/item/weapon/circuitboard/cyborgrecharger(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/cell/hyper(null) RefreshParts() - build_icon() /obj/machinery/recharge_station/RefreshParts() recharge_speed = 0 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 5ce08a47ad4..c5b0840e9cb 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -29,26 +29,26 @@ /obj/machinery/mech_bay_recharge_port/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/mech_recharger(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/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, 1) + component_parts += new /obj/item/weapon/circuitboard/mech_recharger(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() locate_recharge_turf() /obj/machinery/mech_bay_recharge_port/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/mech_recharger(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) + component_parts += new /obj/item/weapon/circuitboard/mech_recharger(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/mech_bay_recharge_port/proc/locate_recharge_turf() diff --git a/code/game/vehicles/spacepods/pod_fabricator.dm b/code/game/vehicles/spacepods/pod_fabricator.dm index b8488bafd06..9a17b501636 100644 --- a/code/game/vehicles/spacepods/pod_fabricator.dm +++ b/code/game/vehicles/spacepods/pod_fabricator.dm @@ -55,6 +55,7 @@ component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() + files = new /datum/research(src) //Setup the research data holder. for(var/direction in cardinal) exit = get_step(src,direction) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index c7c6b2201f0..4e9f6d76b77 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -162,10 +162,10 @@ ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/hydroponics(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/console_screen(src) + component_parts += new /obj/item/weapon/circuitboard/hydroponics(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() temp_chem_holder = new() diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 9ca809c13c4..c1dbc7dfb2d 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -37,6 +37,17 @@ component_parts += new /obj/item/device/assembly/igniter(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() + +/obj/machinery/mineral/ore_redemption/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/ore_redemption(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/device/assembly/igniter(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + RefreshParts() /obj/machinery/mineral/ore_redemption/RefreshParts() var/ore_pickup_rate_temp = 15 diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index cddda73be6e..0e410670b52 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -33,13 +33,24 @@ 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) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new board_path(null) RefreshParts() + +/obj/machinery/power/port_gen/pacman2/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new board_path(null) + RefreshParts() RefreshParts() var/temp_rating = 0 diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 6c45c4b0455..ee8cd0a5956 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -116,12 +116,23 @@ /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, 1) - component_parts += new /obj/item/stack/cable_coil(src, 1) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new board_path(src) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new board_path(null) + RefreshParts() + +/obj/machinery/power/port_gen/pacman/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new board_path(null) RefreshParts() /obj/machinery/power/port_gen/pacman/Destroy() diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index ba38cf9ea73..5696c9ae011 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -42,6 +42,35 @@ component_parts += new /obj/item/weapon/stock_parts/capacitor(null) component_parts += new /obj/item/stack/cable_coil(null, 5) RefreshParts() + setup() + return + +/obj/machinery/power/smes/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/smes(null) + component_parts += new /obj/item/weapon/stock_parts/cell/hyper(null) + component_parts += new /obj/item/weapon/stock_parts/cell/hyper(null) + component_parts += new /obj/item/weapon/stock_parts/cell/hyper(null) + component_parts += new /obj/item/weapon/stock_parts/cell/hyper(null) + component_parts += new /obj/item/weapon/stock_parts/cell/hyper(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stack/cable_coil(null, 5) + RefreshParts() + return + +/obj/machinery/power/smes/RefreshParts() + var/IO = 0 + var/C = 0 + for(var/obj/item/weapon/stock_parts/capacitor/CP in component_parts) + IO += CP.rating + input_level_max = 200000 * IO + output_level_max = 200000 * IO + for(var/obj/item/weapon/stock_parts/cell/PC in component_parts) + C += PC.maxcharge + capacity = C / (15000) * 1e6 + +/obj/machinery/power/smes/proc/setup() spawn(5) if(!powernet) connect_to_network() @@ -60,18 +89,6 @@ if(!terminal.powernet) terminal.connect_to_network() updateicon() - return - -/obj/machinery/power/smes/RefreshParts() - var/IO = 0 - var/C = 0 - for(var/obj/item/weapon/stock_parts/capacitor/CP in component_parts) - IO += CP.rating - input_level_max = 200000 * IO - output_level_max = 200000 * IO - for(var/obj/item/weapon/stock_parts/cell/PC in component_parts) - C += PC.maxcharge - capacity = C / (15000) * 1e6 /obj/machinery/power/smes/proc/updateicon() overlays.Cut() diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index df09440d362..2d689f6e10c 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -295,13 +295,25 @@ /obj/machinery/chem_dispenser/constructable/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/chem_dispenser(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/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/stock_parts/cell/super(src) + component_parts += new /obj/item/weapon/circuitboard/chem_dispenser(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/cell/super(null) + RefreshParts() + +/obj/machinery/chem_dispenser/constructable/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/chem_dispenser(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/cell/hyper(null) RefreshParts() /obj/machinery/chem_dispenser/constructable/RefreshParts() diff --git a/code/modules/reagents/newchem/chem_heater.dm b/code/modules/reagents/newchem/chem_heater.dm index b3aba20540d..be04e4d8d0a 100644 --- a/code/modules/reagents/newchem/chem_heater.dm +++ b/code/modules/reagents/newchem/chem_heater.dm @@ -14,9 +14,17 @@ /obj/machinery/chem_heater/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/chem_heater(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/weapon/circuitboard/chem_heater(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + RefreshParts() + +/obj/machinery/chem_heater/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/chem_heater(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() /obj/machinery/chem_heater/RefreshParts() diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 00b2af7cf5c..266e0a3b239 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -34,13 +34,24 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). /obj/machinery/r_n_d/circuit_imprinter/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(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/reagent_containers/glass/beaker(src) - component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) + component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null) RefreshParts() - reagents.my_atom = src + reagents.my_atom = null + +/obj/machinery/r_n_d/circuit_imprinter/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null) + RefreshParts() + reagents.my_atom = null /obj/machinery/r_n_d/circuit_imprinter/RefreshParts() var/T = 0 diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 57f36ad9179..0ffec90b1ec 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -22,6 +22,15 @@ Note: Must be placed within 3 tiles of the R&D Console component_parts += new /obj/item/weapon/stock_parts/manipulator(null) component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) RefreshParts() + +/obj/machinery/r_n_d/destructive_analyzer/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/destructive_analyzer(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) + RefreshParts() /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 83fc3441ef4..37fc63ce552 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -42,13 +42,27 @@ Note: Must be placed west/left of and R&D console to function. /obj/machinery/r_n_d/protolathe/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/protolathe(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/manipulator(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/circuitboard/protolathe(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null) + RefreshParts() + + reagents.my_atom = src + +/obj/machinery/r_n_d/protolathe/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/protolathe(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null) + component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null) RefreshParts() reagents.my_atom = src diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index c191a8a2eca..cabbf16da77 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -17,12 +17,21 @@ /obj/machinery/r_n_d/server/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/rdserver(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/stack/cable_coil(src,1) - component_parts += new /obj/item/stack/cable_coil(src,1) + component_parts += new /obj/item/weapon/circuitboard/rdserver(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module(null) + component_parts += new /obj/item/stack/cable_coil(null,1) + component_parts += new /obj/item/stack/cable_coil(null,1) + RefreshParts() + initialize(); //Agouri + +/obj/machinery/r_n_d/server/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/rdserver(null) + component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(null) + component_parts += new /obj/item/stack/cable_coil(null,1) + component_parts += new /obj/item/stack/cable_coil(null,1) RefreshParts() - src.initialize(); //Agouri /obj/machinery/r_n_d/server/Destroy() griefProtection() diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 01dc7636d24..02964b375c8 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -20,6 +20,17 @@ component_parts += new /obj/item/weapon/stock_parts/console_screen(null) component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() + +/obj/machinery/telepad/upgraded/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/telesci_pad(null) + component_parts += new /obj/item/bluespace_crystal/artificial(null) + component_parts += new /obj/item/bluespace_crystal/artificial(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor/super(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() /obj/machinery/telepad/RefreshParts() var/E