Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 4c997d2

Browse files
authored
Updates auxmos, tries to fix shuttle venting (#21790)
* update byond version * do some fixes to shuttles * do some fixes to shuttles * check there too
1 parent f055e8e commit 4c997d2

File tree

10 files changed

+37
-31
lines changed

10 files changed

+37
-31
lines changed

.vscode/launch.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
{
5-
"type": "byond",
6-
"request": "launch",
7-
"name": "Launch DreamSeeker",
8-
"preLaunchTask": "Build All",
9-
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
10-
"dreamDaemon": false
11-
}
12-
]
13-
}
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "byond",
6+
"request": "launch",
7+
"name": "Launch DreamDaemon",
8+
"preLaunchTask": "Build All",
9+
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
10+
"dreamDaemon": true
11+
}
12+
]
13+
}

auxmos.dll

-4 KB
Binary file not shown.

auxmos.pdb

32 KB
Binary file not shown.

code/game/turfs/baseturfs.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
// Copy an existing turf and put it on top
6868
// Returns the new turf
69-
/turf/proc/CopyOnTop(turf/copytarget, ignore_bottom=1, depth=INFINITY, copy_air = FALSE)
69+
/turf/proc/CopyOnTop(turf/copytarget, ignore_bottom=1, depth=INFINITY, copy_air = FALSE, flags)
7070
var/list/new_baseturfs = list()
7171
new_baseturfs += baseturfs
7272
new_baseturfs += type
@@ -83,7 +83,7 @@
8383
target_baseturfs -= new_baseturfs & GLOB.blacklisted_automated_baseturfs
8484
new_baseturfs += target_baseturfs
8585

86-
var/turf/newT = copytarget.copyTurf(src, copy_air)
86+
var/turf/newT = copytarget.copyTurf(src, copy_air, flags)
8787
newT.baseturfs = baseturfs_string_list(new_baseturfs, newT)
8888
return newT
8989

code/game/turfs/change_turf.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
1616
if(turf_type)
1717
ChangeTurf(turf_type, baseturf_type, flags)
1818

19-
/turf/proc/copyTurf(turf/copy_to_turf)
19+
/turf/proc/copyTurf(turf/copy_to_turf, copy_air, flags)
2020
if(copy_to_turf.type != type)
21-
copy_to_turf.ChangeTurf(type)
21+
copy_to_turf.ChangeTurf(type, null, flags)
2222
if(copy_to_turf.icon_state != icon_state)
2323
copy_to_turf.icon_state = icon_state
2424
if(copy_to_turf.icon != icon)

code/game/world.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,9 @@ GLOBAL_VAR(restart_counter)
278278
log_world("World rebooted at [time_stamp()]")
279279
shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss.
280280
__auxmos_shutdown()
281+
var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
282+
if (debug_server)
283+
call_ext(debug_server, "auxtools_shutdown")()
281284
..()
282285

283286
/world/Del()

code/modules/atmospherics/environmental/LINDA_system.dm

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,10 @@
115115

116116
/turf/proc/clear_adjacencies()
117117
block_all_conductivity()
118-
for(var/direction in GLOB.cardinals_multiz)
119-
var/turf/current_turf = get_step_multiz(src, direction)
120-
if(!current_turf)
121-
continue
122-
if (atmos_adjacent_turfs)
123-
atmos_adjacent_turfs -= current_turf
124-
if (current_turf.atmos_adjacent_turfs)
125-
current_turf.atmos_adjacent_turfs -= src
126-
UNSETEMPTY(current_turf.atmos_adjacent_turfs)
127-
118+
for(var/turf/current_turf as anything in atmos_adjacent_turfs)
119+
LAZYREMOVE(current_turf.atmos_adjacent_turfs, src)
128120
current_turf.__update_auxtools_turf_adjacency_info()
121+
129122
LAZYNULL(atmos_adjacent_turfs)
130123
__update_auxtools_turf_adjacency_info()
131124

code/modules/shuttle/docking.dm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,17 @@
103103
return DOCKING_SUCCESS
104104

105105
/obj/docking_port/mobile/proc/preflight_check(list/old_turfs, list/new_turfs, list/areas_to_move, rotation)
106+
for(var/i in 1 to length(old_turfs))
107+
var/turf/oldT = old_turfs[i]
108+
var/turf/newT = new_turfs[i]
109+
if(!newT)
110+
return DOCKING_NULL_DESTINATION
111+
if(!oldT)
112+
return DOCKING_NULL_SOURCE
113+
114+
oldT.clear_adjacencies()
115+
newT.clear_adjacencies()
116+
106117
for(var/i in 1 to length(old_turfs))
107118
CHECK_TICK
108119
var/turf/oldT = old_turfs[i]

code/modules/shuttle/on_move.dm

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ All ShuttleMove procs go here
99
/turf/proc/fromShuttleMove(turf/newT, move_mode)
1010
if(!(move_mode & MOVE_AREA) || !isshuttleturf(src))
1111
return move_mode
12-
1312
return move_mode | MOVE_TURF | MOVE_CONTENTS
1413

1514
/// Called from the new turf before anything has been moved
@@ -53,7 +52,7 @@ All ShuttleMove procs go here
5352

5453
if(!shuttle_depth)
5554
CRASH("A turf queued to move via shuttle somehow had no skipover in baseturfs. [src]([type]):[loc]")
56-
newT.CopyOnTop(src, 1, shuttle_depth, TRUE)
55+
newT.CopyOnTop(src, 1, shuttle_depth, TRUE, CHANGETURF_DEFER_CHANGE)
5756
SEND_SIGNAL(src, COMSIG_TURF_ON_SHUTTLE_MOVE, newT)
5857

5958
return TRUE
@@ -75,8 +74,8 @@ All ShuttleMove procs go here
7574
return TRUE
7675

7776
/turf/proc/lateShuttleMove(turf/oldT)
78-
AfterChange(CHANGETURF_RECALC_ADJACENT)
79-
oldT.AfterChange(CHANGETURF_RECALC_ADJACENT)
77+
AfterChange()
78+
oldT.AfterChange()
8079

8180
/////////////////////////////////////////////////////////////////////////////////////
8281

dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# byond version
77
export BYOND_MAJOR=515
8-
export BYOND_MINOR=1621
8+
export BYOND_MINOR=1633
99

1010
#rust_g git tag
1111
export RUST_G_VERSION=1.2.0-yogs1

0 commit comments

Comments
 (0)