From 7bce90d57771f2c8ed74e3536044cb2d50b61515 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 30 May 2021 14:59:25 -0400 Subject: [PATCH] Merge pull request #10495 from Very-Soft/ghostsandgateways Ghosts can only go through the gateway if it's turned on --- code/_onclick/observer.dm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index c2a8a62ea8..f89d400147 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -66,12 +66,21 @@ if(target) user.loc = get_turf(target) -/obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob) - if(awaygate) - user.loc = awaygate.loc +// VOREStation Edit Begin + +/obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob) + if(awaygate) + if(user.client.holder) + user.loc = awaygate.loc + else if(active) + user.loc = awaygate.loc + else + return else to_chat(user, "[src] has no destination.") +// VOREStation Edit End + /obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob) if(stationgate) user.loc = stationgate.loc