From 21b9d5861a8426550178c56a13630c73c4dfc13e Mon Sep 17 00:00:00 2001
From: FenodyreeAv <fenodyree.av@gmail.com>
Date: Sun, 2 Aug 2026 02:24:10 +0100
Subject: [PATCH] Fixes bluespace inhibitor interaction with telescience
 (#22967)

Bluespace inhibitors prevent you from teleporting out of them in a
square.
They prevent you teleporting into them in a circle.

Previously, if you got very unlucky, you could teleport into an area but
not back out again.

This makes both checks a square.

It also drops you one additional tile further out of the teleport zone,
so if you step off your portal in the direction of the inhibitor, it
doesn't destroy the portal.

Telescience portals also didn't care and would form inside the inhibitor
radius.

changes:
- bugfix: "Fixes bluespace inhibitors inconsistantly blocking teleports
in a square, but finding the alternate desination in a circle. Its all
square now."
- bugfix: "Fixes telescience portals not respecting bluespace
inhibitors."
---
 code/datums/helper_datums/teleport.dm         |  4 +--
 code/modules/telesci/telesci_computer.dm      | 34 +++++++++++++++++++
 .../Fenodyree-TelescienceInhibitorFix.yml     |  7 ++++
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/Fenodyree-TelescienceInhibitorFix.yml

diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 2178f38c2e4..03279e4c424 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -62,8 +62,8 @@
 			if(T.z != AB.z || get_dist(adestination, AB) > 8 || (AB.stat & (NOPOWER | BROKEN)))
 				continue
 			AB.use_power_oneoff(AB.active_power_usage)
-			bad_turfs += circle_range_turfs(get_turf(AB),8)
-			good_turfs += circle_range_turfs(get_turf(AB),9)
+			bad_turfs += RANGE_TURFS(8, get_turf(AB))
+			good_turfs += RANGE_TURFS(9, get_turf(AB))
 		if(invalid_inhibitors)
 			GLOB.bluespace_inhibitors -= invalid_inhibitors
 		if(length(good_turfs) && length(bad_turfs))
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index a2559406bd6..4dc0dd9f9f0 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -263,6 +263,39 @@
 	visible_message(SPAN_WARNING("The telepad weakly fizzles."))
 	return
 
+/obj/structure/machinery/computer/telescience/proc/check_bluespace_inhibitors(atom/target)
+	var/turf/target_turf = get_turf(target)
+	if(!target_turf)
+		return null
+
+	var/list/turf/good_turfs = list()
+	var/list/turf/bad_turfs = list()
+	var/list/invalid_inhibitors
+	for(var/found_inhibitor in GLOB.bluespace_inhibitors)
+		if(!istype(found_inhibitor, /obj/structure/machinery/anti_bluespace))
+			LAZYADD(invalid_inhibitors, found_inhibitor)
+			continue
+		var/obj/structure/machinery/anti_bluespace/AB = found_inhibitor
+		if(QDELETED(AB))
+			LAZYADD(invalid_inhibitors, found_inhibitor)
+			continue
+		if(target_turf.z != AB.z || get_dist(target_turf, AB) > 8 || (AB.stat & (NOPOWER | BROKEN)))
+			continue
+		AB.use_power_oneoff(AB.active_power_usage)
+		bad_turfs += RANGE_TURFS(9, get_turf(AB))
+		good_turfs += RANGE_TURFS(10, get_turf(AB)) //One extra tile away, so stepping off the portal in the direction of the inhibitor doesn't break the portal.
+
+	if(invalid_inhibitors)
+		GLOB.bluespace_inhibitors -= invalid_inhibitors
+
+	if(length(good_turfs) && length(bad_turfs))
+		good_turfs -= bad_turfs
+		if(length(good_turfs))
+			temp_msg = "ERROR!<BR>Interference detected. Portal off target."
+			return pick(good_turfs)
+
+	return target_turf
+
 /obj/structure/machinery/computer/telescience/proc/doteleport(mob/user)
 	SHOULD_NOT_SLEEP(TRUE)
 
@@ -288,6 +321,7 @@
 		var/spawn_time = round(proj_data.time)
 
 		var/turf/target = locate(trueX, trueY, target_zlevel)
+		target = check_bluespace_inhibitors(target)
 		last_target = target
 		flick("pad-beam", telepad)
 
diff --git a/html/changelogs/Fenodyree-TelescienceInhibitorFix.yml b/html/changelogs/Fenodyree-TelescienceInhibitorFix.yml
new file mode 100644
index 00000000000..c451dfd15da
--- /dev/null
+++ b/html/changelogs/Fenodyree-TelescienceInhibitorFix.yml
@@ -0,0 +1,7 @@
+author: Fenodyree
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes bluespace inhibitors inconsistantly blocking teleports in a square, but finding the alternate desination in a circle. Its all square now."
+  - bugfix: "Fixes telescience portals not respecting bluespace inhibitors."