mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-16 18:45:22 +01:00
[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 🆑 fix: vending machines now randomly shock if electrified & can be untilted again by hand /🆑
This commit is contained in:
+14
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user