From 4cbab3c82c3cadcbe803531b30c19c78ce7c906f Mon Sep 17 00:00:00 2001 From: Toastical Date: Mon, 2 Dec 2024 19:55:36 +0200 Subject: [PATCH] Tweak: NT Merch vendor can now be moved and adds it's circuit board to the Circuit Imprinter. (#27374) * NT Merch vendor can now be moved * Made the NT Merch vendor board printable in the Circuit Imprinter --- code/game/machinery/machine_frame.dm | 1 + code/game/machinery/merch_vendor.dm | 6 ++++++ code/modules/research/designs/machine_designs.dm | 10 ++++++++++ 3 files changed, 17 insertions(+) diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm index 665f6f92429..7c2d80469a5 100644 --- a/code/game/machinery/machine_frame.dm +++ b/code/game/machinery/machine_frame.dm @@ -1146,6 +1146,7 @@ to destroy them and players will be able to make replacements. icon_state = "generic" build_path = /obj/machinery/economy/merch board_type = "machine" + origin_tech = "programming=1" req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 1) diff --git a/code/game/machinery/merch_vendor.dm b/code/game/machinery/merch_vendor.dm index 40bddca66bd..a96878428da 100644 --- a/code/game/machinery/merch_vendor.dm +++ b/code/game/machinery/merch_vendor.dm @@ -41,6 +41,12 @@ return ..() +/obj/machinery/economy/merch/wrench_act(mob/user, obj/item/I) + . = TRUE + if(!I.use_tool(src, user, 0, volume = 0)) + return + default_unfasten_wrench(user, I, time = 6 SECONDS) + /obj/machinery/economy/merch/proc/do_purchase(datum/merch_item/merch, mob/user) if(!merch) return FALSE diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index be83bdbf1c1..744183f0e85 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -601,3 +601,13 @@ materials = list(MAT_GLASS = 1000) build_path = /obj/item/circuitboard/bottler category = list("Misc. Machinery") + +/datum/design/merch + name = "Machine Design (Nanotrasen Merch Board)" + desc = "The circuit board for an NT Merch vendor." + id = "merch" + req_tech = list("programming" = 1) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000) + build_path = /obj/item/circuitboard/merch + category = list("Misc. Machinery")