From 586ed7c46cc77b45b8bfe7f8b34c3a837f83cc58 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Tue, 26 Jan 2021 17:52:14 +0000 Subject: [PATCH] Revert "Merge pull request #926 from MalricB/sus" This reverts commit cbc79932394bdff36ca9a5274b2ce6b4503d5c6c, reversing changes made to c453ed509f344a8bccce4f06e5bebc1cf157fe7f. --- code/game/machinery/emergency_button.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/emergency_button.dm b/code/game/machinery/emergency_button.dm index b9bcd59b..ea2d340e 100644 --- a/code/game/machinery/emergency_button.dm +++ b/code/game/machinery/emergency_button.dm @@ -33,7 +33,11 @@ nextuse = world.time + 5 MINUTES broadcasting_emergency-- -/obj/machinery/emergencybutton/proc/adminabuse() //used to be emag_act() but i'd rather not have hate mail about interrupted ERP +/obj/machinery/emergencybutton/emag_act(mob/user) + if(obj_flags & EMAGGED) + return + req_access = list() + req_one_access = list() playsound(src, "sparks", 100, 1) for(var/mob/M in GLOB.player_list) SEND_SOUND(M, sound('sound/effects/emergency.ogg'))