Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Pylon fixes #2702

Merged
merged 2 commits into from
Sep 13, 2024
+3 −5
Merged

More Pylon fixes #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51b9c0d
a
DeltaFire15 Aug 4, 2024
2b9e715
Merge remote-tracking branch 'upstream/master' into pylon-pain
DeltaFire15 Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nsv13/code/datums/looping_sounds/_looping_sound.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion nsv13/code/modules/overmap/FTL/components/drive.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions nsv13/code/modules/overmap/FTL/components/drive_pylon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading