From abca80b8d8e898b44cbfd41aec983413f023a6f4 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 20 Oct 2020 13:44:06 -0700 Subject: [PATCH] Fixes aghost gateway lockout --- code/_onclick/observer.dm | 4 ++++ code/modules/awaymissions/gateway.dm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 3452400edbb..5c301057525 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -86,11 +86,15 @@ /obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob) if(awaygate) user.forceMove(awaygate.loc) + else if(user.can_admin_interact()) + attack_hand(user) else to_chat(user, "[src] has no destination.") /obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob) if(stationgate) user.forceMove(stationgate.loc) + else if(user.can_admin_interact()) + attack_hand(user) else to_chat(user, "[src] has no destination.") diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 0118b0febb4..cc9f3b6dfbd 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -107,7 +107,7 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) if(!awaygate) to_chat(user, "Error: No destination found.") return - if(world.time < wait) + if(world.time < wait && !user.can_admin_interact()) to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.") return