From 4e7b0e641cb849ce2e300fc233c944575df817fc Mon Sep 17 00:00:00 2001 From: Charlie Nolan Date: Sun, 9 Feb 2025 19:01:34 -0800 Subject: [PATCH] EFTPOS in Autolathe (#28205) * EFTPOS in Autolathe * Make EFTPOSes recyclable. --- code/modules/economy/economy_machinery/eftpos.dm | 2 ++ code/modules/research/designs/autolathe_designs.dm | 9 +++++++++ tgui/packages/tgui/interfaces/Autolathe.js | 2 +- tgui/public/tgui.bundle.js | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/modules/economy/economy_machinery/eftpos.dm b/code/modules/economy/economy_machinery/eftpos.dm index d1f5cf0a956..67dc65f9886 100644 --- a/code/modules/economy/economy_machinery/eftpos.dm +++ b/code/modules/economy/economy_machinery/eftpos.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/device.dmi' icon_state = "eftpos" w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL = 300, MAT_GLASS = 140) /// Unique identifying name of this EFTPOS for transaction tracking in money accounts var/machine_name = "" /// Whether or not the EFTPOS is locked into a transaction @@ -252,6 +253,7 @@ throw_range = 7 anchored = TRUE w_class = WEIGHT_CLASS_BULKY + materials = list() hitsound = 'sound/weapons/ringslam.ogg' drop_sound = 'sound/items/handling/register_drop.ogg' pickup_sound = 'sound/items/handling/toolbox_pickup.ogg' diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 41e9955e16e..24160309477 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -186,6 +186,7 @@ materials = list(MAT_METAL = 500, MAT_GLASS = 500) build_path = /obj/item/clothing/ears/earmuffs category = list("initial", "Miscellaneous") + /datum/design/painter name = "Modular Painter" id = "mod_painter" @@ -194,6 +195,14 @@ build_path = /obj/item/painter category = list("initial", "Miscellaneous") +/datum/design/eftpos + name = "EFTPOS" + id = "eftpos" + build_type = AUTOLATHE + materials = list(MAT_METAL = 300, MAT_GLASS = 140) + build_path = /obj/item/eftpos + category = list("initial","Miscellaneous") + /datum/design/metal name = "Metal" id = "metal" diff --git a/tgui/packages/tgui/interfaces/Autolathe.js b/tgui/packages/tgui/interfaces/Autolathe.js index 89950bbc621..5e60f91c1ca 100644 --- a/tgui/packages/tgui/interfaces/Autolathe.js +++ b/tgui/packages/tgui/interfaces/Autolathe.js @@ -123,7 +123,7 @@ export const Autolathe = (props, context) => { }) } > - {toTitleCase(recipe.name)} + {recipe.name} {recipe.max_multiplier >= 10 && (