From f36468b8654d1d322c9b4e34c9df7a4eb6841073 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 16 Aug 2018 02:11:20 -0700 Subject: [PATCH] comments, cleanup --- code/datums/helper_datums/teleport.dm | 1 + code/game/machinery/computer/depot.dm | 2 -- code/game/machinery/teleporter.dm | 4 ++-- code/game/objects/effects/portals.dm | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index dc3903226f0..015fa78df29 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -114,6 +114,7 @@ if(!is_teleport_allowed(destturf.z)) return 0 + // Only check the destination zlevel for is_teleport_allowed. Checking origin as well breaks ERT teleporters. var/area/destarea = get_area(destturf) diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index 009e5d92930..3085163d716 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -403,8 +403,6 @@ var/turf/portal_turf = get_step(src, portaldir) var/obj/effect/portal/redspace/P = new(portal_turf, tele_target, src, 0) myportal = P - P.failchance = 0 - P.icon_state = "portal1" var/area/A = get_area(tele_target) P.name = "[A] portal" else if(!portal_enabled && myportal) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 6fa8377ca62..63fe5f2391b 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -340,10 +340,10 @@ to_chat(T, "[pick(TPError)]") return else - if(!teleport(M) && isliving(M)) + if(!teleport(M) && isliving(M)) // the isliving(M) is needed to avoid triggering errors if a spark bumps the telehub visible_message("[src] emits a loud buzz, as its teleport portal flickers and fails!") playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) - power_station.toggle() + power_station.toggle() // turn off the portal. use_power(5000) //--FalseIncarnate diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index c43d0272e90..a048ca1ebff 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -65,6 +65,7 @@ /obj/effect/portal/redspace name = "redspace portal" - desc = "A rare kind of subspace portal, capable of cutting through interference that can jam normal bluespace portals." + desc = "A portal capable of bypassing bluespace interference." icon_state = "portal1" + failchance = 0 ignore_tele_proof_area_setting = TRUE \ No newline at end of file