From 6aeba80a33abdc14d64e2d5d02292c2d9dbb0949 Mon Sep 17 00:00:00 2001 From: Geoengi <139566513+Geoengi@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:31:56 -0500 Subject: [PATCH 1/3] Add files via upload Signed-off-by: Geoengi <139566513+Geoengi@users.noreply.github.com> --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 0985ce758976..af4acaa49b95 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -498,7 +498,6 @@ /obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged desc = "Contains a large reservoir of soft drinks. This model has had its safeties shorted out." obj_flags = CAN_BE_HIT | EMAGGED - flags_1 = NODECONSTRUCT_1 circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/fullupgrade /obj/machinery/chem_dispenser/drinks/fullupgrade/Initialize() @@ -545,7 +544,6 @@ /obj/machinery/chem_dispenser/drinks/beer/fullupgrade //fully ugpraded stock parts, emagged desc = "Contains a large reservoir of the good stuff. This model has had its safeties shorted out." obj_flags = CAN_BE_HIT | EMAGGED - flags_1 = NODECONSTRUCT_1 circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer/fullupgrade /obj/machinery/chem_dispenser/drinks/beer/fullupgrade/Initialize() @@ -555,6 +553,7 @@ /obj/machinery/chem_dispenser/mutagen name = "mutagen dispenser" desc = "Creates and dispenses mutagen." + circuit = /obj/item/circuitboard/machine/chem_dispenser/mutagen dispensable_reagents = list(/datum/reagent/toxin/mutagen) upgrade_reagents = null emagged_reagents = list(/datum/reagent/toxin/plasma) @@ -563,7 +562,6 @@ /obj/machinery/chem_dispenser/mutagensaltpeter name = "botanical chemical dispenser" desc = "Creates and dispenses chemicals useful for botany." - flags_1 = NODECONSTRUCT_1 circuit = /obj/item/circuitboard/machine/chem_dispenser/mutagensaltpeter @@ -598,7 +596,6 @@ /obj/machinery/chem_dispenser/fullupgrade //fully ugpraded stock parts, emagged desc = "Creates and dispenses chemicals. This model has had its safeties shorted out." obj_flags = CAN_BE_HIT | EMAGGED - flags_1 = NODECONSTRUCT_1 circuit = /obj/item/circuitboard/machine/chem_dispenser/fullupgrade /obj/machinery/chem_dispenser/fullupgrade/Initialize() From 59de3ff65c1bb85bbe353761a9aa478b457b3db7 Mon Sep 17 00:00:00 2001 From: Geoengi <139566513+Geoengi@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:33:20 -0500 Subject: [PATCH 2/3] Add files via upload Signed-off-by: Geoengi <139566513+Geoengi@users.noreply.github.com> --- .../circuitboards/machine_circuitboards.dm | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 7e7bd499a19b..2788a64ea6e7 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -718,21 +718,34 @@ /obj/item/circuitboard/machine/chem_dispenser/fullupgrade build_path = /obj/machinery/chem_dispenser/fullupgrade req_components = list( - /obj/item/stock_parts/matter_bin/bluespace = 2, - /obj/item/stock_parts/capacitor/quadratic = 2, - /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/manipulator = 1, /obj/item/stack/sheet/glass = 1, - /obj/item/stock_parts/cell/bluespace = 1, + /obj/item/stack/sheet/bluespace_crystal = 1, + /obj/item/stock_parts/cell = 1 ) /obj/item/circuitboard/machine/chem_dispenser/mutagensaltpeter build_path = /obj/machinery/chem_dispenser/mutagensaltpeter req_components = list( - /obj/item/stock_parts/matter_bin/bluespace = 2, - /obj/item/stock_parts/capacitor/quadratic = 2, - /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/manipulator = 1, /obj/item/stack/sheet/glass = 1, - /obj/item/stock_parts/cell/bluespace = 1, + /obj/item/stack/sheet/bluespace_crystal = 1, + /obj/item/stock_parts/cell = 1 + ) + +/obj/item/circuitboard/machine/chem_dispenser/mutagen + build_path = /obj/machinery/chem_dispenser/mutagen + req_components = list( + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stack/sheet/glass = 1, + /obj/item/stack/sheet/bluespace_crystal = 1, + /obj/item/stock_parts/cell = 1 ) /obj/item/circuitboard/machine/chem_dispenser/abductor @@ -1177,11 +1190,12 @@ /obj/item/circuitboard/machine/chem_dispenser/drinks/fullupgrade build_path = /obj/machinery/chem_dispenser/drinks/fullupgrade req_components = list( - /obj/item/stock_parts/matter_bin/bluespace = 2, - /obj/item/stock_parts/capacitor/quadratic = 2, - /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/manipulator = 1, /obj/item/stack/sheet/glass = 1, - /obj/item/stock_parts/cell/bluespace = 1, + /obj/item/stack/sheet/bluespace_crystal = 1, + /obj/item/stock_parts/cell = 1 ) /obj/item/circuitboard/machine/chem_dispenser/drinks/beer @@ -1192,11 +1206,12 @@ /obj/item/circuitboard/machine/chem_dispenser/drinks/beer/fullupgrade build_path = /obj/machinery/chem_dispenser/drinks/beer/fullupgrade req_components = list( - /obj/item/stock_parts/matter_bin/bluespace = 2, - /obj/item/stock_parts/capacitor/quadratic = 2, - /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/manipulator = 1, /obj/item/stack/sheet/glass = 1, - /obj/item/stock_parts/cell/bluespace = 1, + /obj/item/stack/sheet/bluespace_crystal = 1, + /obj/item/stock_parts/cell = 1 ) /obj/item/circuitboard/machine/chem_master/condi From 468fd183de10ca9ce62377bb065b987ec45319a4 Mon Sep 17 00:00:00 2001 From: Geoengi <139566513+Geoengi@users.noreply.github.com> Date: Fri, 10 Nov 2023 01:20:26 -0500 Subject: [PATCH 3/3] Consistency Signed-off-by: Geoengi <139566513+Geoengi@users.noreply.github.com> --- code/game/objects/items/circuitboards/machine_circuitboards.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 2788a64ea6e7..0e7d76e343b4 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -757,6 +757,7 @@ /obj/item/stock_parts/capacitor/quadratic = 2, /obj/item/stock_parts/manipulator/femto = 2, /obj/item/stack/sheet/glass = 1, + /obj/item/stack/sheet/bluespace_crystal = 1, /obj/item/stock_parts/cell/bluespace = 1, ) needs_anchored = FALSE