515 Fixes and Auxmos 2.5.2 (#2703)

Co-authored-by: Crossedfall <[email protected]>
Co-authored-by: AnturK <[email protected]>
Co-authored-by: itsmeow <[email protected]>

Author: 4 people

.gitignore

@@ -8,8 +8,9 @@
 /cfg/**/*
 config/starmap/starmap.json
 
+# NSV13 - leave the linux, actually
 # Ignore compiled linux libs in the root folder, e.g. librust_g.so
-/*.so
+#/*.so
 
 #Ignore compiled files and other files generated during compilation.
 beestation_unit_test_focus_file.dm

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM beestation/byond:514.1589 as base
+FROM beestation/byond:515.1633 as base
 
 # Install the tools needed to compile our rust dependencies
 FROM base as rust-build
@@ -28,13 +28,14 @@ RUN git init \
     && cargo build --release --all-features --target i686-unknown-linux-gnu
 
 # Build auxmos
+# NSV13 - different fork and katmos hooks
 FROM rust-build as auxmos
 RUN git init \
-    && git remote add origin https://github.com/Putnam3145/auxmos \
+    && git remote add origin https://github.com/covertcorvid/auxmos \
     && /bin/bash -c "source dependencies.sh \
     && git fetch --depth 1 origin \$AUXMOS_VERSION" \
     && git checkout FETCH_HEAD \
-    && cargo rustc --target=i686-unknown-linux-gnu --release --features=trit_fire_hook,plasma_fire_hook,generic_fire_hook
+    && cargo rustc --target=i686-unknown-linux-gnu --release --features=katmos
 
 # Install nodejs which is required to deploy BeeStation
 FROM base as node

SpacemanDMM.toml

@@ -1,3 +1,5 @@
+environment = "nsv13.dme"
+
 [langserver]
 dreamchecker = true
 

_maps/map_files/Tycoon/Tycoon2.dmm

@@ -0,0 +1,8 @@
+/proc/auxtools_stack_trace(msg)
+	CRASH(msg)
+
+/proc/auxtools_expr_stub()
+	CRASH("auxtools not loaded")
+
+/proc/enable_debugging(mode, port)
+	CRASH("auxtools not loaded")

auxmos.dll

@@ -147,8 +147,23 @@
 #define ATMOS_ADJACENT_ANY					(1<<0)
 #define ATMOS_ADJACENT_FIRELOCK				(1<<1)
 
-#define CANATMOSPASS(A, O) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) )
-#define CANVERTICALATMOSPASS(A, O) ( A.CanAtmosPassVertical == ATMOS_PASS_PROC ? A.CanAtmosPass(O, TRUE) : ( A.CanAtmosPassVertical == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPassVertical ) )
+#ifdef TESTING
+GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0))
+#define CALCULATE_ADJACENT_TURFS(T, state) if (SSair.adjacent_rebuild[T]) { GLOB.atmos_adjacent_savings[1] += 1 } else { GLOB.atmos_adjacent_savings[2] += 1; SSair.adjacent_rebuild[T] = state}
+#else
+#define CALCULATE_ADJACENT_TURFS(T, state) SSair.adjacent_rebuild[T] = state
+#endif
+
+//If you're doing spreading things related to atmos, DO NOT USE CANATMOSPASS, IT IS NOT CHEAP. use this instead, the info is cached after all. it's tweaked just a bit to allow for circular checks
+#define TURFS_CAN_SHARE(T1, T2) (LAZYACCESS(T2.atmos_adjacent_turfs, T1) || LAZYLEN(T1.atmos_adjacent_turfs & T2.atmos_adjacent_turfs))
+//Use this to see if a turf is fully blocked or not, think windows or firelocks. Fails with 1x1 non full tile windows, but it's not worth the cost.
+#define TURF_SHARES(T) (LAZYLEN(T.atmos_adjacent_turfs))
+
+#define CANATMOSPASS(A, O, V) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O, V) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) )
+
+///Used to define the temperature of a tile, arg is the temperature it should be at. Should always be put at the end of the atmos list.
+///This is solely to be used after compile-time.
+#define TURF_TEMPERATURE(temperature) "TEMP=[temperature]"
 
 //OPEN TURF ATMOS
 #define OPENTURF_DEFAULT_ATMOS		"o2=22;n2=82;TEMP=293.15" //the default air mix that open turfs spawn
@@ -164,6 +179,9 @@
 #define ATMOS_TANK_PLASMA			"plasma=70000;TEMP=293.15"
 #define ATMOS_TANK_O2				"o2=100000;TEMP=293.15"
 #define ATMOS_TANK_N2				"n2=100000;TEMP=293.15"
+#define ATMOS_TANK_BZ				"bz=100000;TEMP=293.15"
+#define ATMOS_TANK_PLUOXIUM			"pluox=100000;TEMP=293.15"
+#define ATMOS_TANK_TRITIUM			"tritium=100000;TEMP=293.15"
 #define ATMOS_TANK_AIRMIX			"o2=2644;n2=10580;TEMP=293.15"
 
 //LAVALAND
@@ -325,3 +343,8 @@ GLOBAL_LIST_INIT(pipe_paint_colors, sortList(list(
 #define PIPENET_UPDATE_STATUS_DORMANT 0
 #define PIPENET_UPDATE_STATUS_REACT_NEEDED 1
 #define PIPENET_UPDATE_STATUS_RECONCILE_NEEDED 2
+
+// NSV13 - auxmos
+#define ATMOS_ALARM_SEVERE "severe"
+#define ATMOS_ALARM_MINOR "minor"
+#define ATMOS_ALARM_CLEAR "clear"

auxtools/auxmos.dll

@@ -0,0 +1,185 @@
+//THIS FILE IS AUTOMATICALLY GENERATED BY AUXMOS, PLEASE DO NOT TOUCH IT
+//PROC DEFINITIONS MAY MOVE AROUND, THIS IS NORMAL
+
+/* This comment bypasses grep checks */ /var/__auxmos
+
+/proc/__detect_auxmos()
+	if (world.system_type == UNIX)
+		return __auxmos = "libauxmos"
+	else
+		return __auxmos = "auxmos"
+
+#define AUXMOS (__auxmos || __detect_auxmos())
+
+/turf/proc/__update_auxtools_turf_adjacency_info()
+	return call_ext(AUXMOS, "byond:hook_infos_ffi")(src)
+
+/turf/proc/update_air_ref(flag)
+	return call_ext(AUXMOS, "byond:hook_register_turf_ffi")(src, flag)
+
+/datum/controller/subsystem/air/proc/process_turfs_auxtools(remaining)
+	return call_ext(AUXMOS, "byond:process_turf_hook_ffi")(src, remaining)
+
+/datum/controller/subsystem/air/proc/finish_turf_processing_auxtools(time_remaining)
+	return call_ext(AUXMOS, "byond:finish_process_turfs_ffi")(time_remaining)
+
+/datum/controller/subsystem/air/proc/thread_running()
+	return call_ext(AUXMOS, "byond:thread_running_hook_ffi")()
+
+/proc/finalize_gas_refs()
+	return call_ext(AUXMOS, "byond:finalize_gas_refs_ffi")()
+
+/datum/controller/subsystem/air/proc/auxtools_update_reactions()
+	return call_ext(AUXMOS, "byond:update_reactions_ffi")()
+
+/proc/auxtools_atmos_init(gas_data)
+	return call_ext(AUXMOS, "byond:hook_init_ffi")(gas_data)
+
+/proc/_auxtools_register_gas(gas)
+	return call_ext(AUXMOS, "byond:hook_register_gas_ffi")(gas)
+
+/datum/controller/subsystem/air/proc/process_turf_equalize_auxtools(remaining)
+	return call_ext(AUXMOS, "byond:equalize_hook_ffi")(src, remaining)
+
+/datum/controller/subsystem/air/proc/process_excited_groups_auxtools(remaining)
+	return call_ext(AUXMOS, "byond:groups_hook_ffi")(src, remaining)
+
+/datum/gas_mixture/proc/__auxtools_parse_gas_string(string)
+	return call_ext(AUXMOS, "byond:parse_gas_string_ffi")(src, string)
+
+/datum/controller/subsystem/air/proc/get_max_gas_mixes()
+	return call_ext(AUXMOS, "byond:hook_max_gas_mixes_ffi")()
+
+/datum/controller/subsystem/air/proc/get_amt_gas_mixes()
+	return call_ext(AUXMOS, "byond:hook_amt_gas_mixes_ffi")()
+
+/proc/equalize_all_gases_in_list(gas_list)
+	return call_ext(AUXMOS, "byond:equalize_all_hook_ffi")(gas_list)
+
+/datum/gas_mixture/proc/get_oxidation_power(temp)
+	return call_ext(AUXMOS, "byond:oxidation_power_hook_ffi")(src, temp)
+
+/datum/gas_mixture/proc/get_fuel_amount(temp)
+	return call_ext(AUXMOS, "byond:fuel_amount_hook_ffi")(src, temp)
+
+/datum/gas_mixture/proc/equalize_with(total)
+	return call_ext(AUXMOS, "byond:equalize_with_hook_ffi")(src, total)
+
+/datum/gas_mixture/proc/transfer_ratio_to(other, ratio)
+	return call_ext(AUXMOS, "byond:transfer_ratio_hook_ffi")(src, other, ratio)
+
+/datum/gas_mixture/proc/transfer_to(other, moles)
+	return call_ext(AUXMOS, "byond:transfer_hook_ffi")(src, other, moles)
+
+/datum/gas_mixture/proc/adjust_heat(temp)
+	return call_ext(AUXMOS, "byond:adjust_heat_hook_ffi")(src, temp)
+
+/datum/gas_mixture/proc/react(holder)
+	return call_ext(AUXMOS, "byond:react_hook_ffi")(src, holder)
+
+/datum/gas_mixture/proc/compare(other)
+	return call_ext(AUXMOS, "byond:compare_hook_ffi")(src, other)
+
+/datum/gas_mixture/proc/clear()
+	return call_ext(AUXMOS, "byond:clear_hook_ffi")(src)
+
+/datum/gas_mixture/proc/mark_immutable()
+	return call_ext(AUXMOS, "byond:mark_immutable_hook_ffi")(src)
+
+/datum/gas_mixture/proc/scrub_into(into, ratio_v, gas_list)
+	return call_ext(AUXMOS, "byond:scrub_into_hook_ffi")(src, into, ratio_v, gas_list)
+
+/datum/gas_mixture/proc/get_by_flag(flag_val)
+	return call_ext(AUXMOS, "byond:get_by_flag_hook_ffi")(src, flag_val)
+
+/datum/gas_mixture/proc/__remove_by_flag(into, flag_val, amount_val)
+	return call_ext(AUXMOS, "byond:remove_by_flag_hook_ffi")(src, into, flag_val, amount_val)
+
+/datum/gas_mixture/proc/divide(num_val)
+	return call_ext(AUXMOS, "byond:divide_hook_ffi")(src, num_val)
+
+/datum/gas_mixture/proc/multiply(num_val)
+	return call_ext(AUXMOS, "byond:multiply_hook_ffi")(src, num_val)
+
+/datum/gas_mixture/proc/subtract(num_val)
+	return call_ext(AUXMOS, "byond:subtract_hook_ffi")(src, num_val)
+
+/datum/gas_mixture/proc/add(num_val)
+	return call_ext(AUXMOS, "byond:add_hook_ffi")(src, num_val)
+
+/datum/gas_mixture/proc/adjust_multi(...)
+	var/list/args_copy = args.Copy()
+	args_copy.Insert(1, src)
+	return call_ext(AUXMOS, "byond:adjust_multi_hook_ffi")(arglist(args_copy))
+
+/datum/gas_mixture/proc/adjust_moles_temp(id_val, num_val, temp_val)
+	return call_ext(AUXMOS, "byond:adjust_moles_temp_hook_ffi")(src, id_val, num_val, temp_val)
+
+/datum/gas_mixture/proc/adjust_moles(id_val, num_val)
+	return call_ext(AUXMOS, "byond:adjust_moles_hook_ffi")(src, id_val, num_val)
+
+/datum/gas_mixture/proc/set_moles(gas_id, amt_val)
+	return call_ext(AUXMOS, "byond:set_moles_hook_ffi")(src, gas_id, amt_val)
+
+/datum/gas_mixture/proc/get_moles(gas_id)
+	return call_ext(AUXMOS, "byond:get_moles_hook_ffi")(src, gas_id)
+
+/datum/gas_mixture/proc/set_volume(vol_arg)
+	return call_ext(AUXMOS, "byond:set_volume_hook_ffi")(src, vol_arg)
+
+/datum/gas_mixture/proc/partial_heat_capacity(gas_id)
+	return call_ext(AUXMOS, "byond:partial_heat_capacity_ffi")(src, gas_id)
+
+/datum/gas_mixture/proc/set_temperature(arg_temp)
+	return call_ext(AUXMOS, "byond:set_temperature_hook_ffi")(src, arg_temp)
+
+/datum/gas_mixture/proc/get_gases()
+	return call_ext(AUXMOS, "byond:get_gases_hook_ffi")(src)
+
+/datum/gas_mixture/proc/temperature_share(...)
+	var/list/args_copy = args.Copy()
+	args_copy.Insert(1, src)
+	return call_ext(AUXMOS, "byond:temperature_share_hook_ffi")(arglist(args_copy))
+
+/datum/gas_mixture/proc/copy_from(giver)
+	return call_ext(AUXMOS, "byond:copy_from_hook_ffi")(src, giver)
+
+/datum/gas_mixture/proc/__remove(into, amount_arg)
+	return call_ext(AUXMOS, "byond:remove_hook_ffi")(src, into, amount_arg)
+
+/datum/gas_mixture/proc/__remove_ratio(into, ratio_arg)
+	return call_ext(AUXMOS, "byond:remove_ratio_hook_ffi")(src, into, ratio_arg)
+
+/datum/gas_mixture/proc/merge(giver)
+	return call_ext(AUXMOS, "byond:merge_hook_ffi")(src, giver)
+
+/datum/gas_mixture/proc/thermal_energy()
+	return call_ext(AUXMOS, "byond:thermal_energy_hook_ffi")(src)
+
+/datum/gas_mixture/proc/return_volume()
+	return call_ext(AUXMOS, "byond:return_volume_hook_ffi")(src)
+
+/datum/gas_mixture/proc/return_temperature()
+	return call_ext(AUXMOS, "byond:return_temperature_hook_ffi")(src)
+
+/datum/gas_mixture/proc/return_pressure()
+	return call_ext(AUXMOS, "byond:return_pressure_hook_ffi")(src)
+
+/datum/gas_mixture/proc/total_moles()
+	return call_ext(AUXMOS, "byond:total_moles_hook_ffi")(src)
+
+/datum/gas_mixture/proc/set_min_heat_capacity(arg_min)
+	return call_ext(AUXMOS, "byond:min_heat_cap_hook_ffi")(src, arg_min)
+
+/datum/gas_mixture/proc/heat_capacity()
+	return call_ext(AUXMOS, "byond:heat_cap_hook_ffi")(src)
+
+/datum/gas_mixture/proc/__gasmixture_unregister()
+	return call_ext(AUXMOS, "byond:unregister_gasmixture_hook_ffi")(src)
+
+/datum/gas_mixture/proc/__gasmixture_register()
+	return call_ext(AUXMOS, "byond:register_gasmixture_hook_ffi")(src)
+
+/proc/process_atmos_callbacks(remaining)
+	return call_ext(AUXMOS, "byond:atmos_callback_handle_ffi")(remaining)
+

code/__DEFINES/_auxtools.dm

@@ -29,15 +29,6 @@
 	#define VAR_PROTECTED var
 #endif
 
-/proc/auxtools_stack_trace(msg)
-	CRASH(msg)
-
-/proc/auxtools_expr_stub()
-	CRASH("auxtools not loaded")
-
-/proc/enable_debugging(mode, port)
-	CRASH("auxtools not loaded")
-
 /world/Del()
 	var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
 	if (debug_server)

code/__DEFINES/atmospherics.dm

@@ -184,6 +184,7 @@
 #define FIRE_PRIORITY_DEFAULT		50
 #define FIRE_PRIORITY_PARALLAX		65
 #define FIRE_PRIORITY_INSTRUMENTS	80
+#define FIRE_PRIORITY_CALLBACKS		90
 #define FIRE_PRIORITY_MOBS			100
 #define FIRE_PRIORITY_TGUI			110
 #define FIRE_PRIORITY_TICKER		200
@@ -193,7 +194,6 @@
 #define FIRE_PRIORITY_CHAT			400
 #define FIRE_PRIORITY_RUNECHAT		410
 #define FIRE_PRIORITY_OVERLAYS		500
-#define FIRE_PRIORITY_CALLBACKS		600
 #define FIRE_PRIORITY_EXPLOSIONS	666
 #define FIRE_PRIORITY_TIMER			700
 #define FIRE_PRIORITY_SOUND_LOOPS	800
@@ -224,6 +224,10 @@
 #define SSAIR_ATMOSMACHINERY_AIR 12
 #define SSAIR_DEFERRED_AIRS 13
 
+//Pipeline rebuild helper defines, these suck but it'll do for now //Fools you actually merged it
+#define SSAIR_REBUILD_PIPELINE 1
+#define SSAIR_REBUILD_QUEUE 2
+
 // Explosion Subsystem subtasks
 #define SSEXPLOSIONS_MOVABLES 1
 #define SSEXPLOSIONS_TURFS 2