From 1309f0a22fa81bb31fabb0b0def6f8dc12a28e41 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 14 Feb 2018 08:19:45 -0800 Subject: [PATCH 1/2] Disables emagging Centcom Ferry (#35579) --- code/modules/shuttle/ferry.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/shuttle/ferry.dm b/code/modules/shuttle/ferry.dm index 07103088d1..c44cf69f95 100644 --- a/code/modules/shuttle/ferry.dm +++ b/code/modules/shuttle/ferry.dm @@ -6,14 +6,17 @@ possible_destinations = "ferry_home;ferry_away" req_access = list(ACCESS_CENT_GENERAL) - var/aiControlDisabled = 1 + var/aiControlDisabled = TRUE + var/allow_emag = FALSE -/obj/machinery/computer/shuttle/ferry/proc/canAIControl(mob/user) - return ((aiControlDisabled != 1)); +/obj/machinery/computer/shuttle/ferry/emag_act(mob/user) + if(!allow_emag) + to_chat(user, "[src]'s security firewall is far too powerful for you to bypass.") + return FALSE + return ..() -/obj/machinery/computer/shuttle/ferry/attack_ai(mob/user) - if(!src.canAIControl(user)) - return +/obj/machinery/computer/shuttle/ferry/attack_ai() + return aiControlDisabled? FALSE : ..() /obj/machinery/computer/shuttle/ferry/request name = "ferry console"