Updates auxmos, tries to fix shuttle venting (#21790)

* update byond version

* do some fixes to shuttles

* do some fixes to shuttles

* check there too
This commit is contained in:
CoffeeKat
2024-04-05 07:42:10 +11:00
committed by GitHub
parent f055e8e88b
commit 4c997d2f7e
10 changed files with 37 additions and 31 deletions

24
.vscode/launch.json vendored
View File

@@ -1,13 +1,13 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": false
}
]
}
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamDaemon",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
}
]
}

Binary file not shown.

Binary file not shown.

View File

@@ -66,7 +66,7 @@
// Copy an existing turf and put it on top
// Returns the new turf
/turf/proc/CopyOnTop(turf/copytarget, ignore_bottom=1, depth=INFINITY, copy_air = FALSE)
/turf/proc/CopyOnTop(turf/copytarget, ignore_bottom=1, depth=INFINITY, copy_air = FALSE, flags)
var/list/new_baseturfs = list()
new_baseturfs += baseturfs
new_baseturfs += type
@@ -83,7 +83,7 @@
target_baseturfs -= new_baseturfs & GLOB.blacklisted_automated_baseturfs
new_baseturfs += target_baseturfs
var/turf/newT = copytarget.copyTurf(src, copy_air)
var/turf/newT = copytarget.copyTurf(src, copy_air, flags)
newT.baseturfs = baseturfs_string_list(new_baseturfs, newT)
return newT

View File

@@ -16,9 +16,9 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
if(turf_type)
ChangeTurf(turf_type, baseturf_type, flags)
/turf/proc/copyTurf(turf/copy_to_turf)
/turf/proc/copyTurf(turf/copy_to_turf, copy_air, flags)
if(copy_to_turf.type != type)
copy_to_turf.ChangeTurf(type)
copy_to_turf.ChangeTurf(type, null, flags)
if(copy_to_turf.icon_state != icon_state)
copy_to_turf.icon_state = icon_state
if(copy_to_turf.icon != icon)

View File

@@ -278,6 +278,9 @@ GLOBAL_VAR(restart_counter)
log_world("World rebooted at [time_stamp()]")
shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss.
__auxmos_shutdown()
var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
if (debug_server)
call_ext(debug_server, "auxtools_shutdown")()
..()
/world/Del()

View File

@@ -115,17 +115,10 @@
/turf/proc/clear_adjacencies()
block_all_conductivity()
for(var/direction in GLOB.cardinals_multiz)
var/turf/current_turf = get_step_multiz(src, direction)
if(!current_turf)
continue
if (atmos_adjacent_turfs)
atmos_adjacent_turfs -= current_turf
if (current_turf.atmos_adjacent_turfs)
current_turf.atmos_adjacent_turfs -= src
UNSETEMPTY(current_turf.atmos_adjacent_turfs)
for(var/turf/current_turf as anything in atmos_adjacent_turfs)
LAZYREMOVE(current_turf.atmos_adjacent_turfs, src)
current_turf.__update_auxtools_turf_adjacency_info()
LAZYNULL(atmos_adjacent_turfs)
__update_auxtools_turf_adjacency_info()

View File

@@ -103,6 +103,17 @@
return DOCKING_SUCCESS
/obj/docking_port/mobile/proc/preflight_check(list/old_turfs, list/new_turfs, list/areas_to_move, rotation)
for(var/i in 1 to length(old_turfs))
var/turf/oldT = old_turfs[i]
var/turf/newT = new_turfs[i]
if(!newT)
return DOCKING_NULL_DESTINATION
if(!oldT)
return DOCKING_NULL_SOURCE
oldT.clear_adjacencies()
newT.clear_adjacencies()
for(var/i in 1 to length(old_turfs))
CHECK_TICK
var/turf/oldT = old_turfs[i]

View File

@@ -9,7 +9,6 @@ All ShuttleMove procs go here
/turf/proc/fromShuttleMove(turf/newT, move_mode)
if(!(move_mode & MOVE_AREA) || !isshuttleturf(src))
return move_mode
return move_mode | MOVE_TURF | MOVE_CONTENTS
/// Called from the new turf before anything has been moved
@@ -53,7 +52,7 @@ All ShuttleMove procs go here
if(!shuttle_depth)
CRASH("A turf queued to move via shuttle somehow had no skipover in baseturfs. [src]([type]):[loc]")
newT.CopyOnTop(src, 1, shuttle_depth, TRUE)
newT.CopyOnTop(src, 1, shuttle_depth, TRUE, CHANGETURF_DEFER_CHANGE)
SEND_SIGNAL(src, COMSIG_TURF_ON_SHUTTLE_MOVE, newT)
return TRUE
@@ -75,8 +74,8 @@ All ShuttleMove procs go here
return TRUE
/turf/proc/lateShuttleMove(turf/oldT)
AfterChange(CHANGETURF_RECALC_ADJACENT)
oldT.AfterChange(CHANGETURF_RECALC_ADJACENT)
AfterChange()
oldT.AfterChange()
/////////////////////////////////////////////////////////////////////////////////////

View File

@@ -5,7 +5,7 @@
# byond version
export BYOND_MAJOR=515
export BYOND_MINOR=1621
export BYOND_MINOR=1633
#rust_g git tag
export RUST_G_VERSION=1.2.0-yogs1