From 2f74805a461d5fa5ae7c8b9be7831f2b34428d93 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 25 Oct 2017 20:02:36 -0500 Subject: [PATCH] [MIRROR] Fixes teleporters not actually denying teleports from Centcom (#3598) * Merge pull request #32043 from tgstation/Cyberboss-patch-3 Fixes teleporters not actually denying teleports from Centcom * Fixes teleporters not actually denying teleports from Centcom --- code/game/machinery/teleporter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 1c7268e6c6..be13cfdcff 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -44,10 +44,10 @@ /obj/machinery/teleport/hub/CollidedWith(atom/movable/AM) if(z == ZLEVEL_CENTCOM) to_chat(AM, "You can't use this here.") + return if(is_ready()) teleport(AM) use_power(5000) - return /obj/machinery/teleport/hub/attackby(obj/item/W, mob/user, params) if(default_deconstruction_screwdriver(user, "tele-o", "tele0", W))