From 105e0002276d30d7e02e2e78c912c2c7d0c686cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Barou=C5=A1?= Date: Sat, 7 Nov 2020 19:28:00 +0100 Subject: [PATCH] Fixes messages for tank inlet wrenching (#10468) --- code/modules/reagents/reagent_dispenser.dm | 10 +++++----- html/changelogs/amunak-tank-wrenching.yml | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100755 html/changelogs/amunak-tank-wrenching.yml diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 646a2023dca..ed334c46648 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -59,7 +59,7 @@ if(is_open_container()) RG.standard_pour_into(user,src) else - to_chat(user,"The top cap is wrenched on tight!") + to_chat(user,"The inlet cap on \the [src] is wrenched on tight!") return if (O.iswrench()) @@ -72,10 +72,10 @@ START_PROCESSING(SSprocessing,src) else if(accept_any_reagent) - var/is_closed = flags & OPENCONTAINER - var/verb01 = is_closed ? "unwrenches" : "wrenches" - var/verb02 = (is_closed ? "open" : "shut") - user.visible_message("[user] [verb01] the top cap [verb02] from \the [src].", "You [verb01] the top cap [verb02] from \the [src].") + if(flags & OPENCONTAINER) + user.visible_message(SPAN_NOTICE("[user] wrenches the inlet cap on \the [src] shut."), SPAN_NOTICE("You wrench the inlet cap back on \the [src].")) + else + user.visible_message(SPAN_NOTICE("[user] unwrenches the inlet cap from \the [src]."), SPAN_NOTICE("You unwrench the inlet cap from \the [src].")) flags ^= OPENCONTAINER return diff --git a/html/changelogs/amunak-tank-wrenching.yml b/html/changelogs/amunak-tank-wrenching.yml new file mode 100755 index 00000000000..5d4843945dd --- /dev/null +++ b/html/changelogs/amunak-tank-wrenching.yml @@ -0,0 +1,4 @@ +author: Amunak +delete-after: True +changes: + - bugfix: "Fixes messages for water tank wrenching/unwrenching - they were flipped and gramatically dubious."