From e2b09f560464ccc174ef39a49e35ff54c653f5d6 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 5 Jan 2016 13:56:26 -0600 Subject: [PATCH] Gate Fix --- code/modules/awaymissions/gateway.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index d6f2136eebc..a761abd4909 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -132,15 +132,15 @@ var/obj/machinery/gateway/centerstation/the_gateway = null //okay, here's the good teleporting stuff /obj/machinery/gateway/centerstation/Bumped(atom/movable/AM) - if(!ready) + if(!ready) return - if(!active) + if(!active) return - if(!awaygate || qdeleted(awaygate)) + if(!awaygate || qdeleted(awaygate)) return if(awaygate.calibrated) - AM.loc = get_step(awaygate.loc, SOUTH) + AM.forceMove(get_step(awaygate.loc, SOUTH)) AM.dir = SOUTH if (ismob(AM)) var/mob/M = AM @@ -150,7 +150,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null else var/obj/effect/landmark/dest = pick(awaydestinations) if(dest) - AM.loc = dest.loc + AM.forceMove(get_turf(dest)) AM.dir = SOUTH use_power(5000) return @@ -240,18 +240,18 @@ var/obj/machinery/gateway/centerstation/the_gateway = null /obj/machinery/gateway/centeraway/Bumped(atom/movable/AM) - if(!ready) + if(!ready) return - if(!active) + if(!active) return - if(!stationgate || qdeleted(stationgate)) + if(!stationgate || qdeleted(stationgate)) return if(istype(AM, /mob/living/carbon)) for(var/obj/item/weapon/implant/exile/E in AM)//Checking that there is an exile implant in the contents if(E.imp_in == AM)//Checking that it's actually implanted vs just in their pocket AM << "\black The station gate has detected your exile implant and is blocking your entry." return - AM.loc = get_step(stationgate.loc, SOUTH) + AM.forceMove(get_step(stationgate.loc, SOUTH)) AM.dir = SOUTH if (ismob(AM)) var/mob/M = AM