Better solution: let all ghosts transit the gate if off

This commit is contained in:
Kyep
2020-10-20 14:04:14 -07:00
parent abca80b8d8
commit e2a5c32bfa
2 changed files with 13 additions and 13 deletions
+12 -12
View File
@@ -84,17 +84,17 @@
user.forceMove(get_turf(target))
/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.")
if(!awaygate)
awaygate = locate(/obj/machinery/gateway/centeraway) in GLOB.machines
if(!awaygate)
to_chat(user, "<span class='warning'>Error: No destination found.</span>")
return
user.forceMove(awaygate.loc)
/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.")
if(!stationgate)
stationgate = locate(/obj/machinery/gateway/centerstation) in GLOB.machines
if(!stationgate)
to_chat(user, "<span class='warning'>Error: No destination found.</span>")
return
user.forceMove(stationgate.loc)
+1 -1
View File
@@ -107,7 +107,7 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null)
if(!awaygate)
to_chat(user, "<span class='notice'>Error: No destination found.</span>")
return
if(world.time < wait && !user.can_admin_interact())
if(world.time < wait)
to_chat(user, "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>")
return