From 02bd1108a255191a4ceac17ad0748f7fb8181fe3 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 16 Aug 2018 07:18:05 -0700 Subject: [PATCH 1/4] fixes pod fab bug --- code/game/machinery/constructable_frame.dm | 8 ++++---- code/game/mecha/mech_fabricator.dm | 13 +++++++++++++ code/modules/research/designs/machine_designs.dm | 10 ++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 4c437be1146..49a86e0c51c 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -655,11 +655,11 @@ obj/item/circuitboard/rdserver build_path = /obj/machinery/mecha_part_fabricator/spacepod board_type = "machine" origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 3 Matter Bins, 2 Manipulators, 2 Micro-Lasers, and 1 Console Screen." + frame_desc = "Requires 2 Matter Bins, 1 Manipulators, 1 Micro-Lasers, and 1 Console Screen." req_components = list( - /obj/item/stock_parts/matter_bin = 3, - /obj/item/stock_parts/manipulator = 2, - /obj/item/stock_parts/micro_laser = 2, + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1, /obj/item/stock_parts/console_screen = 1) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d0af747dc64..1fc686f1d0d 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -462,6 +462,19 @@ "Pod_Frame", "Misc") +/obj/machinery/mecha_part_fabricator/spacepod/New() + . = ..() + for(var/obj/O in component_parts) + qdel(O) + component_parts = list() + component_parts += new /obj/item/circuitboard/podfab(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/micro_laser(null) + component_parts += new /obj/item/stock_parts/console_screen(null) + RefreshParts() + /obj/machinery/mecha_part_fabricator/robot name = "Robotic Fabricator" part_sets = list("Cyborg") \ No newline at end of file diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 57886d2972c..cc6305319c7 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -272,6 +272,16 @@ build_path = /obj/item/circuitboard/mechfab category = list("Research Machinery") +/datum/design/podfab + name = "Machine Board (Spacepod Fabricator)" + desc = "The circuit board for an Spacepod Fabricator" + id = "podfab" + req_tech = list("programming" = 3, "engineering" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000) + build_path = /obj/item/circuitboard/podfab + category = list("Research Machinery") + /datum/design/mech_recharger name = "Machine Board (Mech Bay Recharger)" desc = "The circuit board for a Mech Bay Recharger." From b2efcb0a2514e5ab0d898188e2f20f2dd31e9f33 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 16 Aug 2018 07:42:27 -0700 Subject: [PATCH 2/4] spacepod fab now requires mechanic access --- code/game/mecha/mech_fabricator.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 1fc686f1d0d..8a62bc76d73 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -461,6 +461,7 @@ "Pod_Parts", "Pod_Frame", "Misc") + req_access = list(access_mechanic) /obj/machinery/mecha_part_fabricator/spacepod/New() . = ..() From 43e66ca037a839ffdb0888dcb122d8a296df7f65 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sun, 9 Sep 2018 03:55:27 -0700 Subject: [PATCH 3/4] Bird request --- code/game/mecha/mech_fabricator.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 8a62bc76d73..1eae91a6a5c 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -465,8 +465,7 @@ /obj/machinery/mecha_part_fabricator/spacepod/New() . = ..() - for(var/obj/O in component_parts) - qdel(O) + QDEL_LIST(component_parts) component_parts = list() component_parts += new /obj/item/circuitboard/podfab(null) component_parts += new /obj/item/stock_parts/matter_bin(null) From 18d8f2f3bc8b70b4c3f63ffd83244ccbc0cb7c92 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sun, 9 Sep 2018 15:41:38 -0700 Subject: [PATCH 4/4] . = ..() -> ..() --- code/game/mecha/mech_fabricator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 1eae91a6a5c..881e3d6dd70 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -464,7 +464,7 @@ req_access = list(access_mechanic) /obj/machinery/mecha_part_fabricator/spacepod/New() - . = ..() + ..() QDEL_LIST(component_parts) component_parts = list() component_parts += new /obj/item/circuitboard/podfab(null)