From 4601f81a065dff01f6d909749d0f53bc8e20c5df Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 21 Jul 2023 22:51:19 +0200 Subject: [PATCH] [MIRROR] Weight Machines - Silicon messages and removes screentips [MDB IGNORE] (#22620) * Weight Machines - Silicon messages and removes screentips (#76993) ## About The Pull Request Removes the hand screentips for weight machines, as it requires you to buckle yourself now, making it misinformation. There's no click+drag tooltip and I dunno if I should add one to something that is obviously a chair. Adds messages for Silicons using the weight machine, because I accidentally added this and thought it was funny enough to keep around. ## Why It's Good For The Game Less misinformation to players. Closes https://github.com/tgstation/tgstation/issues/76980 ## Changelog :cl: spellcheck: Silicons using weight machines are now told how pointless the task was. spellcheck: Weight machine tooltips no longer lie about using LMB to use the machine. /:cl: --------- Co-authored-by: BlueMemesauce <47338680+BlueMemesauce@ users.noreply.github.com> * Weight Machines - Silicon messages and removes screentips --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: BlueMemesauce <47338680+BlueMemesauce@ users.noreply.github.com> --- .../objects/structures/gym/weight_machine.dm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/gym/weight_machine.dm b/code/game/objects/structures/gym/weight_machine.dm index 3f6361a494d..42b74f58c4f 100644 --- a/code/game/objects/structures/gym/weight_machine.dm +++ b/code/game/objects/structures/gym/weight_machine.dm @@ -31,6 +31,12 @@ "You feel robust!", "You feel indestructible!", ) + var/static/list/finished_silicon_message = list( + "You feel nothing!", + "No pain, no gain!", + "Chassis hardness rating... Unchanged.", + "You feel the exact same. Nothing.", + ) /obj/structure/weightmachine/Initialize(mapload) . = ..() @@ -38,11 +44,6 @@ weight_action = new(src) weight_action.weightpress = src - AddElement( \ - /datum/element/contextual_screentip_bare_hands, \ - lmb_text = "Work out", \ - ) - var/static/list/tool_behaviors = list( TOOL_CROWBAR = list( SCREENTIP_CONTEXT_RMB = "Deconstruct", @@ -91,7 +92,10 @@ START_PROCESSING(SSobj, src) if(do_after(user, 8 SECONDS, src) && user.has_gravity()) user.Stun(2 SECONDS) - user.balloon_alert(user, pick(finished_message)) + if(issilicon(user)) + user.balloon_alert(user, pick(finished_silicon_message)) + else + user.balloon_alert(user, pick(finished_message)) user.add_mood_event("exercise", /datum/mood_event/exercise) user.apply_status_effect(/datum/status_effect/exercised) end_workout()