More Pylon fixes (BeeStation#2702)

IndusRobot · Dec 16, 2024 · 381a8db · 381a8db
1 parent e4c4639
commit 381a8db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/nsv13/code/datums/looping_sounds/_looping_sound.dm b/nsv13/code/datums/looping_sounds/_looping_sound.dm
@@ -75,8 +75,8 @@
 				return
 			var/coords = locallist[M]
 			if(abs((coords[2] + M.y) - (coords[1] + M.x)) <= deviation_tolerance)
-				return // listener hasn't moved enough to warrent recalculation
+				continue // listener hasn't moved enough to warrent recalculation
 		if(M.recalculate_sound_volume(parent, current_sound, volume))
 			locallist[M] = list(M.x, M.y)
 		else
-			locallist[parent] -= M
+			locallist -= M
diff --git a/nsv13/code/modules/overmap/FTL/components/drive.dm b/nsv13/code/modules/overmap/FTL/components/drive.dm
@@ -86,7 +86,7 @@
 	for(var/obj/machinery/atmospherics/components/binary/drive_pylon/P in GLOB.machines)
 		if(length(pylons) == 4) // No more than 4 pylons
 			break
-		if(P.get_overmap() == OMcache && get_dist(src, P) && link_id == P.link_id && P.is_operational <= MAX_PYLON_DISTANCE)
+		if(P.get_overmap() == OMcache && get_dist(src, P) <= MAX_PYLON_DISTANCE && link_id == P.link_id && P.is_operational)
 			pylons += P
 			P.ftl_drive = src
 

diff --git a/nsv13/code/modules/overmap/FTL/components/drive_pylon.dm b/nsv13/code/modules/overmap/FTL/components/drive_pylon.dm
@@ -181,8 +181,6 @@
 
 		if(MAX_WASTE_STORAGE_PRESSURE to INFINITY)
 			var/turf/T = get_turf(src)
-			T.assume_air(air_contents)
-			QDEL_NULL(air_contents)
 			explosion(T, 0, 1, 3)
 			qdel(src)
 			return