From 31b021559a4eef7e12e8d1f06a70e41bc703eb03 Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Tue, 16 Sep 2025 05:10:11 +0530 Subject: [PATCH] [NO GBP] Restores old vending machine interaction behaviour (#92969) ## About The Pull Request - Fixes https://github.com/tgstation/tgstation/pull/91987#issuecomment-3287759198 and other behaviour that i forgot to put back ## Changelog :cl: fix: vending machines now randomly shock if electrified & can be untilted again by hand /:cl: --- code/modules/vending/vendor/interaction.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/vending/vendor/interaction.dm b/code/modules/vending/vendor/interaction.dm index 641dc84b111..7796545b719 100644 --- a/code/modules/vending/vendor/interaction.dm +++ b/code/modules/vending/vendor/interaction.dm @@ -1,3 +1,17 @@ +//===============================HAND INTERACTION=================================== +/obj/machinery/vending/interact(mob/user) + if(seconds_electrified && !(machine_stat & NOPOWER)) + if(shock(user, 100)) + return + + if(tilted && !user.buckled) + to_chat(user, span_notice("You begin righting [src].")) + if(do_after(user, 5 SECONDS, target = src)) + untilt(user) + return + + return ..() + //================================TOOL ACTS============================================== /obj/machinery/vending/crowbar_act(mob/living/user, obj/item/attack_item) if(!component_parts)