From 77cafb3b9befe2209181b1c6be52eb1aa2fdfb36 Mon Sep 17 00:00:00 2001 From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Tue, 15 Apr 2025 10:28:43 -0400 Subject: [PATCH] Smith Polish - Examines (#28887) * Smith polish - examines * Forgot the hopper * Merge fixes --- code/modules/smithing/machinery/kinetic_assembler.dm | 4 ++-- code/modules/smithing/machinery/magma_crucible.dm | 4 ++++ code/modules/smithing/machinery/power_hammer.dm | 5 +++++ code/modules/smithing/machinery/smart_hopper.dm | 4 ++++ code/modules/smithing/smith_machinery.dm | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/modules/smithing/machinery/kinetic_assembler.dm b/code/modules/smithing/machinery/kinetic_assembler.dm index 273b326ece6..29352b821ec 100644 --- a/code/modules/smithing/machinery/kinetic_assembler.dm +++ b/code/modules/smithing/machinery/kinetic_assembler.dm @@ -38,9 +38,9 @@ if(primary) . += "There is a [primary] in the primary slot." if(secondary) - . += "There is a [secondary] in the primary slot." + . += "There is a [secondary] in the secondary slot." if(trim) - . += "There is a [trim] in the primary slot." + . += "There is a [trim] in the trim slot." if(finished_product) . += "There is a nearly-complete [finished_product] on the assembler. To complete the product, strike it with your hammer!" diff --git a/code/modules/smithing/machinery/magma_crucible.dm b/code/modules/smithing/machinery/magma_crucible.dm index 60693b1860f..aad2d3c5a5f 100644 --- a/code/modules/smithing/machinery/magma_crucible.dm +++ b/code/modules/smithing/machinery/magma_crucible.dm @@ -36,6 +36,10 @@ component_parts += new /obj/item/assembly/igniter(null) RefreshParts() +/obj/machinery/magma_crucible/examine(mob/user) + . = ..() + . += "You can check the contents of [src] using a multitool." + /obj/machinery/magma_crucible/screwdriver_act(mob/user, obj/item/I) if(!I.use_tool(src, user, 0, volume = 0)) return diff --git a/code/modules/smithing/machinery/power_hammer.dm b/code/modules/smithing/machinery/power_hammer.dm index cf81281be79..e5e70e1d7a7 100644 --- a/code/modules/smithing/machinery/power_hammer.dm +++ b/code/modules/smithing/machinery/power_hammer.dm @@ -18,6 +18,11 @@ RefreshParts() update_icon(UPDATE_OVERLAYS) +/obj/machinery/smithing/power_hammer/examine(mob/user) + . = ..() + . += "You can set [src] to automatically continue hammering heated metal with a multitool." + . += "The autohammer light is currently [repeating ? "on" : "off"]." + /obj/machinery/smithing/power_hammer/update_overlays() . = ..() overlays.Cut() diff --git a/code/modules/smithing/machinery/smart_hopper.dm b/code/modules/smithing/machinery/smart_hopper.dm index 152d7e2be09..cbec036b7c0 100644 --- a/code/modules/smithing/machinery/smart_hopper.dm +++ b/code/modules/smithing/machinery/smart_hopper.dm @@ -43,6 +43,10 @@ linked_crucible.linked_machines |= src return +/obj/machinery/mineral/smart_hopper/examine(mob/user) + . = ..() + . += "There are currently [points] claimable points. [points ? "Swipe your ID to claim them." : ""]" + /obj/machinery/mineral/smart_hopper/update_overlays() . = ..() overlays.Cut() diff --git a/code/modules/smithing/smith_machinery.dm b/code/modules/smithing/smith_machinery.dm index 452d92d59f2..6e5e4dbdee3 100644 --- a/code/modules/smithing/smith_machinery.dm +++ b/code/modules/smithing/smith_machinery.dm @@ -31,6 +31,7 @@ . = ..() if(working_component) . += "You can activate the machine with your hand, or remove the component by alt-clicking." + . += "There is currently a [working_component] in [src]." /obj/machinery/smithing/power_change() if(!..())