diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c2a68b9f567..16f4339e1fd 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -347,12 +347,12 @@ var/global/list/autolathe_recipes_hidden = list( \ New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/autolathe(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/matter_bin(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/weapon/circuitboard/autolathe(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/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() src.L = autolathe_recipes diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 21b4645e918..223b3b9f970 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -24,14 +24,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/weapon/cable_coil(src, 1) - component_parts += new /obj/item/weapon/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/weapon/cable_coil(null, 1) + component_parts += new /obj/item/weapon/cable_coil(null, 1) RefreshParts() /obj/machinery/clonepod/RefreshParts() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index ebe0566804d..17b64808df7 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -162,7 +162,7 @@ to destroy them and players will be able to make replacements. */ /obj/item/weapon/circuitboard/destructive_analyzer name = "circuit board (Destructive Analyzer)" - build_path = "/obj/machinery/r_n_d/destructive_analyzer" + build_path = /obj/machinery/r_n_d/destructive_analyzer board_type = "machine" origin_tech = "magnets=2;engineering=2;programming=2" req_components = list( @@ -172,7 +172,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/autolathe name = "circuit board (Autolathe)" - build_path = "/obj/machinery/autolathe" + build_path = /obj/machinery/autolathe board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( @@ -182,7 +182,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/protolathe name = "circuit board (Protolathe)" - build_path = "/obj/machinery/r_n_d/protolathe" + build_path = /obj/machinery/r_n_d/protolathe board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( @@ -193,7 +193,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/circuit_imprinter name = "circuit board (Circuit Imprinter)" - build_path = "/obj/machinery/r_n_d/circuit_imprinter" + build_path = /obj/machinery/r_n_d/circuit_imprinter board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( @@ -203,7 +203,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/pacman name = "circuit board (PACMAN-type Generator)" - build_path = "/obj/machinery/power/port_gen/pacman" + build_path = /obj/machinery/power/port_gen/pacman board_type = "machine" origin_tech = "programming=3:powerstorage=3;plasmatech=3;engineering=3" req_components = list( @@ -214,7 +214,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/pacman/super name = "circuit board (SUPERPACMAN-type Generator)" - build_path = "/obj/machinery/power/port_gen/pacman/super" + build_path = /obj/machinery/power/port_gen/pacman/super origin_tech = "programming=3;powerstorage=4;engineering=4" /obj/item/weapon/circuitboard/pacman/mrs @@ -224,7 +224,7 @@ to destroy them and players will be able to make replacements. obj/item/weapon/circuitboard/rdserver name = "circuit board (R&D Server)" - build_path = "/obj/machinery/r_n_d/server" + build_path = /obj/machinery/r_n_d/server board_type = "machine" origin_tech = "programming=3" req_components = list( @@ -233,7 +233,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/mechfab name = "circuit board (Exosuit Fabricator)" - build_path = "/obj/machinery/mecha_part_fabricator" + build_path = /obj/machinery/mecha_part_fabricator board_type = "machine" origin_tech = "programming=3;engineering=3" req_components = list( @@ -244,7 +244,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/clonepod name = "circuit board (Clone Pod)" - build_path = "/obj/machinery/clonepod" + build_path = /obj/machinery/clonepod board_type = "machine" origin_tech = "programming=3;biotech=3" req_components = list( @@ -255,7 +255,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/clonescanner name = "circuit board (Cloning Scanner)" - build_path = "/obj/machinery/dna_scannernew" + build_path = /obj/machinery/dna_scannernew board_type = "machine" origin_tech = "programming=2;biotech=2" req_components = list( @@ -267,7 +267,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/cyborgrecharger name = "circuit board (Cyborg Recharger)" - build_path = "/obj/machinery/recharge_station" + build_path = /obj/machinery/recharge_station board_type = "machine" origin_tech = "powerstorage=3;engineering=3" req_components = list( @@ -279,7 +279,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/telecomms/receiver name = "circuit board (Subspace Receiver)" - build_path = "/obj/machinery/telecomms/receiver" + build_path = /obj/machinery/telecomms/receiver board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( @@ -290,7 +290,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/telecomms/hub name = "circuit board (Hub Mainframe)" - build_path = "/obj/machinery/telecomms/hub" + build_path = /obj/machinery/telecomms/hub board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( @@ -300,7 +300,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/telecomms/relay name = "circuit board (Relay Mainframe)" - build_path = "/obj/machinery/telecomms/relay" + build_path = /obj/machinery/telecomms/relay board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=2" req_components = list( @@ -310,7 +310,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/telecomms/bus name = "circuit board (Bus Mainframe)" - build_path = "/obj/machinery/telecomms/bus" + build_path = /obj/machinery/telecomms/bus board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( @@ -320,7 +320,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/telecomms/processor name = "circuit board (Processor Unit)" - build_path = "/obj/machinery/telecomms/processor" + build_path = /obj/machinery/telecomms/processor board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( @@ -333,7 +333,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/telecomms/server name = "circuit board (Telecommunication Server)" - build_path = "/obj/machinery/telecomms/server" + build_path = /obj/machinery/telecomms/server board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( @@ -343,7 +343,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/circuitboard/telecomms/broadcaster name = "circuit board (Subspace Broadcaster)" - build_path = "/obj/machinery/telecomms/broadcaster" + build_path = /obj/machinery/telecomms/broadcaster board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 76dfa89f9e8..401acff9da5 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -20,11 +20,11 @@ /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/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/cell/high(null) RefreshParts() build_icon() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 864ff0f51d2..299ec78727f 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -133,12 +133,12 @@ /obj/machinery/mecha_part_fabricator/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/mechfab(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/micro_laser(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) + component_parts += new /obj/item/weapon/circuitboard/mechfab(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/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() // part_sets["Cyborg Upgrade Modules"] = typesof(/obj/item/borg/upgrade/) - /obj/item/borg/upgrade/ // Eh. This does it dymaically, but to support having the items referenced otherwhere in the code but not being constructable, going to do it manaully. diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index c0d7d862032..5aea5e32fd9 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -16,10 +16,10 @@ Note: Must be placed within 3 tiles of the R&D Console /obj/machinery/r_n_d/destructive_analyzer/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/destructive_analyzer(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/circuitboard/destructive_analyzer(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) RefreshParts() /obj/machinery/r_n_d/destructive_analyzer/RefreshParts() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 4c4daca528d..ca14c2201d0 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -17,10 +17,10 @@ /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/weapon/cable_coil(src, 1) - component_parts += new /obj/item/weapon/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/weapon/cable_coil(null, 1) + component_parts += new /obj/item/weapon/cable_coil(null, 1) RefreshParts() src.initialize(); //Agouri