From b5fc9b937add79dcb33fc3edb7aa750b1e951278 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 8 May 2021 12:04:12 +0200 Subject: [PATCH] Impact Wrench Maptext & Soundfix (#11833) --- code/game/objects/items/weapons/tools.dm | 12 +++++++++--- html/changelogs/geeves-powerdrill_maptext.yml | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-powerdrill_maptext.yml diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index af729d44f78..a8f8e3c7199 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -737,6 +737,7 @@ icon_state = "impact_wrench-screw" item_state = "impact_wrench" contained_sprite = TRUE + flags = HELDMAPTEXT force = 8 attack_verb = list("gored", "drilled", "screwed", "punctured") w_class = ITEMSIZE_SMALL @@ -752,6 +753,9 @@ . = ..() update_tool() +/obj/item/powerdrill/set_initial_maptext() + held_maptext = SMALL_FONTS(7, "S") + /obj/item/powerdrill/examine(var/mob/user) . = ..() if(. && tools.len) @@ -778,11 +782,13 @@ /obj/item/powerdrill/proc/update_tool() if(isscrewdriver()) - usesound = 'sound/items/air_wrench.ogg' - icon_state = "impact_wrench-screw" - else if(iswrench()) usesound = 'sound/items/drill_use.ogg' + icon_state = "impact_wrench-screw" + check_maptext(SMALL_FONTS(7, "S")) + else if(iswrench()) + usesound = 'sound/items/air_wrench.ogg' icon_state = "impact_wrench-wrench" + check_maptext(SMALL_FONTS(7, "W")) /obj/item/powerdrill/attack_self(var/mob/user) if(++current_tool > tools.len) diff --git a/html/changelogs/geeves-powerdrill_maptext.yml b/html/changelogs/geeves-powerdrill_maptext.yml new file mode 100644 index 00000000000..58124bab2ce --- /dev/null +++ b/html/changelogs/geeves-powerdrill_maptext.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added maptext to the impact wrench to let you know which mode it's in." + - bugfix: "Fixed the impact wrench having flipped sounds." \ No newline at end of file