Merging r3 staging to stable. [IDB IGNORE] [MDB IGNORE]

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@ add: Added more things
 del: Removed old things
 tweak: tweaked a few things
 balance: rebalanced something
-fix: fixed a few things
+bugfix: fixed a few things
 soundadd: added a new sound thingy
 sounddel: removed an old sound thingy
 imageadd: added some icons and images

.github/workflows/test.yml

@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing]
+        map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing, planets_testing]
     steps:
       - uses: actions/checkout@v3
       - name: Setup Cache

SpacemanDMM.toml

@@ -10,3 +10,44 @@ disallow_relative_proc_definitions = true
 
 [debugger]
 engine = "auxtools"
+
+[diagnostics]
+# Raised by DreamChecker
+disabled_directive = "error"
+sets_directive_twice = "error"
+invalid_lint_directive_value = "error"
+invalid_set_value = "error"
+unknown_linter_setting = "error"
+override_missing_keyword_arg = "error"
+must_not_override = "error"
+must_call_parent = "error"
+final_var = "error"
+private_proc = "error"
+protected_proc = "error"
+private_var = "error"
+protected_var = "error"
+must_be_pure = "error"
+must_not_sleep = "error"
+redefined_proc = "off"
+ambiguous_in_lhs = "error"
+ambiguous_not_bitwise = "error"
+no_typehint_implicit_new = "error"
+field_access_static_type = "error"
+proc_call_static_type = "error"
+proc_has_no_parent = "error"
+no_operator_overload = "error"
+unreachable_code = "error"
+control_condition_static = "error"
+if_condition_determinate = "error"
+loop_condition_determinate = "error"
+
+# Raised by Lexer
+integer_precision_loss = "error"
+
+# Raised by Parser
+duplicate_include = "error"
+macro_redefined = "error"
+macro_undefined_no_definition = "error"
+
+# Raised by Object Tree
+override_precedes_definition = "error"

code/__datastructures/priority_queue.dm

@@ -1,63 +1,68 @@
+/// An automatically ordered list, using the cmp proc to weight the list items
+/datum/priority_queue
+	/// The actual queue
+	var/list/L
+	/// The weight function used to order the queue
+	var/cmp
 
-//////////////////////
-//PriorityQueue object
-//////////////////////
-
-//an ordered list, using the cmp proc to weight the list elements
-/PriorityQueue
-	var/list/L //the actual queue
-	var/cmp //the weight function used to order the queue
-
-/PriorityQueue/New(compare)
+/// Takes a proc `comparer` that will be used to compare the items inserted
+/// * Param `comparer` take two arguments and return the difference in their weight
+/// * For example: /proc/CompareItems(atom/A, atom/B) return A.size - B.size
+/datum/priority_queue/New(comparer)
 	L = new()
-	cmp = compare
+	cmp = comparer
 
-/PriorityQueue/proc/IsEmpty()
+/// * Returns: `TRUE` if the queue is empty, otherwise `FALSE`
+/datum/priority_queue/proc/IsEmpty()
 	return !L.len
 
-//add an element in the list,
-//immediatly ordering it to its position using dichotomic search
-/PriorityQueue/proc/Enqueue(atom/A)
-	ADD_SORTED(L, A, cmp)
+/// Add an `item` to the list, immediatly ordering it to its position using dichotomic search
+/datum/priority_queue/proc/Enqueue(item)
+	ADD_SORTED(L, item, cmp)
 
-//removes and returns the first element in the queue
-/PriorityQueue/proc/Dequeue()
+/// Removes and returns the first item in the queue
+/// * Returns: The first `item` in the queue, otherwise `FALSE`
+/datum/priority_queue/proc/Dequeue()
 	if(!L.len)
-		return 0
+		return FALSE
 	. = L[1]
 
 	Remove(.)
 
-//removes an element
-/PriorityQueue/proc/Remove(atom/A)
-	. = L.Remove(A)
+/// Removes an `item` from the list
+/// * Returns: `TRUE` if succesfully removed, otherwise `FALSE`
+/datum/priority_queue/proc/Remove(item)
+	. = L.Remove(item)
 
-//returns a copy of the elements list
-/PriorityQueue/proc/List()
+/// * Returns: A copy of the item list
+/datum/priority_queue/proc/List()
 	. = L.Copy()
 
-//return the position of an element or 0 if not found
-/PriorityQueue/proc/Seek(atom/A)
-	. = L.Find(A)
+/// Finds an `item` in the list
+/// * Returns: The position of the `item`, or `0` if not found
+/datum/priority_queue/proc/Seek(item)
+	. = L.Find(item)
 
-//return the element at the i_th position
-/PriorityQueue/proc/Get(i)
-	if(i > L.len || i < 1)
+/// Gets the item at the positon `index`
+/// * Returns: The `item` at the index, or `0` if outside the range of the queue
+/datum/priority_queue/proc/Get(index)
+	if(index > L.len || index < 1)
 		return 0
-	return L[i]
+	return L[index]
 
-//return the length of the queue
-/PriorityQueue/proc/Length()
+/// * Returns: The length of the queue
+/datum/priority_queue/proc/Length()
 	. = L.len
 
-//replace the passed element at it's right position using the cmp proc
-/PriorityQueue/proc/ReSort(atom/A)
-	var/i = Seek(A)
+/// Resorts the `item` to it's correct position in the queue.
+/// * For example: The queue is sorted based on weight and atom A changes weight after being added
+/datum/priority_queue/proc/ReSort(item)
+	var/i = Seek(item)
 	if(i == 0)
 		return
 	while(i < L.len && call(cmp)(L[i],L[i+1]) > 0)
 		L.Swap(i,i+1)
 		i++
-	while(i > 1 && call(cmp)(L[i],L[i-1]) <= 0) //last inserted element being first in case of ties (optimization)
+	while(i > 1 && call(cmp)(L[i],L[i-1]) <= 0) // Last inserted element being first in case of ties (optimization)
 		L.Swap(i,i-1)
 		i--

code/__defines/ZAS.dm

@@ -1,3 +1,18 @@
+
+/*
+	Uncomment this to enable ZAS debugging tools. While ghosted, you will see a visualization of the atmos status of turfs.
+	Green turfs are zones that are existing happily.
+	Yellow-orange turfs are a zone that has recently been merged into another zone.
+	Red turfs are turfs are an invalidated zone. Invalid zones are zones that were destroyed.
+	White/overlay-less turfs are turfs that are the origin point of a zone. This is completely useless information.
+	Purple outlines indicate the turf was marked for an update by SSair, and is in its processing list.
+	In addition, all ZAS-related datums and turfs will have a "verbose" var. Set this to 1 using View Variables to get robust to_chat()s about activity.
+	Finally, this is a friendly reminder that using Debug Verbs gives access to the Zone Info and Test ZAS Connection verbs when you right click a turf.
+
+	Addendum:
+		There are additional debug overlays that use ZAS_ZONE_BLOCKER and ZAS_DIRECTIONAL_BLOCKER.
+		They take priority over standard overlays, displaying directional airflow, and are generally not needed so they are commented out by default.
+*/
 //#define ZASDBG
 #define MULTIZAS
 
@@ -22,7 +37,8 @@
 #define SOUTHDOWN (SOUTH|DOWN)
 #define WESTDOWN (WEST|DOWN)
 
-#define TURF_HAS_VALID_ZONE(T) (istype(T, /turf/simulated) && T:zone && !T:zone:invalid)
+#define TURF_HAS_VALID_ZONE(T) (isturf(T) && T:zone && !T:zone:invalid)
+#define SHOULD_PARTICIPATE_IN_ZONES(T) (isturf(T) && T:zone_membership_candidate && (!T:external_atmosphere_participation || !T:is_outside()))
 
 #ifdef MULTIZAS
 

code/__defines/_tick.dm

@@ -20,6 +20,8 @@
 /// runs stoplag if tick_usage is above the limit
 #define CHECK_TICK ( TICK_CHECK ? stoplag() : 0 )
 
+#define UNTIL(X) while(!(X)) stoplag()
+
 //"fancy" math for calculating time in ms from tick_usage percentage and the length of ticks
 //percent_of_tick_used * (ticklag * 100(to convert to ms)) / 100(percent ratio)
 //collapsed to percent_of_tick_used * tick_lag

code/__defines/armor.dm

@@ -45,3 +45,6 @@
 #define  ARMOR_ENERGY_RESISTANT		40
 #define  ARMOR_ENERGY_STRONG		75
 #define  ARMOR_ENERGY_SHIELDED		100
+
+/**Armor piercing value that will bypass any armors completely */
+#define  ARMOR_PIERCING_BYPASSED	INFINITY

code/__defines/atmos.dm

@@ -73,10 +73,10 @@
 #define XGM_GAS_OXIDIZER    2
 #define XGM_GAS_CONTAMINANT 4
 
-#define TANK_LEAK_PRESSURE     (30 * ONE_ATMOSPHERE) // Tank starts leaking.
-#define TANK_RUPTURE_PRESSURE  (40 * ONE_ATMOSPHERE) // Tank spills all contents into atmosphere.
-#define TANK_FRAGMENT_PRESSURE (50 * ONE_ATMOSPHERE) // Boom 3x3 base explosion.
-#define TANK_FRAGMENT_SCALE    (10 * ONE_ATMOSPHERE) // +1 for each SCALE kPa above threshold. Was 2 atm.
+#define TANK_LEAK_PRESSURE     (30 ATM) // Tank starts leaking.
+#define TANK_RUPTURE_PRESSURE  (40 ATM) // Tank spills all contents into atmosphere.
+#define TANK_FRAGMENT_PRESSURE (50 ATM) // Boom 3x3 base explosion.
+#define TANK_FRAGMENT_SCALE    (10 ATM) // +1 for each SCALE kPa above threshold. Was 2 atm.
 
 #define NORMPIPERATE             30   // Pipe-insulation rate divisor.
 #define HEATPIPERATE             8    // Heat-exchange pipe insulation.

code/__defines/chemistry.dm

@@ -6,6 +6,7 @@
 #define CHEM_TOUCH 1
 #define CHEM_INGEST 2
 #define CHEM_INJECT 3
+#define CHEM_INHALE 4
 
 #define MINIMUM_CHEMICAL_VOLUME 0.01
 
@@ -67,3 +68,5 @@
 
 #define DEFAULT_GAS_ACCELERANT /decl/material/gas/hydrogen
 #define DEFAULT_GAS_OXIDIZER   /decl/material/gas/oxygen
+
+#define CHEM_REACTION_FLAG_OVERFLOW_CONTAINER BITFLAG(0)

code/__defines/colors.dm

@@ -93,30 +93,49 @@
 #define COLOR_ASTEROID_ROCK    "#735555"
 #define COLOR_DIAMOND          "#d8d4ea"
 
-#define	PIPE_COLOR_GREY        "#808080"
-#define	PIPE_COLOR_RED         "#ff0000"
-#define	PIPE_COLOR_BLUE        "#0000ff"
-#define	PIPE_COLOR_CYAN        "#00ffff"
-#define	PIPE_COLOR_GREEN       "#00ff00"
-#define	PIPE_COLOR_YELLOW      "#ffcc00"
-#define	PIPE_COLOR_BLACK       "#444444"
-#define	PIPE_COLOR_ORANGE      "#b95a00"
+#define PIPE_COLOR_GREY        "#808080"
+#define PIPE_COLOR_RED         "#ff0000"
+#define PIPE_COLOR_BLUE        "#0000ff"
+#define PIPE_COLOR_CYAN        "#00ffff"
+#define PIPE_COLOR_GREEN       "#00ff00"
+#define PIPE_COLOR_YELLOW      "#ffcc00"
+#define PIPE_COLOR_BLACK       "#444444"
+#define PIPE_COLOR_ORANGE      "#b95a00"
 #define PIPE_COLOR_WHITE       "#ffffff"
+#define PIPE_COLOR_PURPLE      "#880088"
 
-#define	COMMS_COLOR_DEFAULT    "#ff00ff"
-#define	COMMS_COLOR_ENTERTAIN  "#666666"
-#define	COMMS_COLOR_AI         "#ff00ff"
+#define COMMS_COLOR_DEFAULT    "#ff00ff"
+#define COMMS_COLOR_ENTERTAIN  "#666666"
+#define COMMS_COLOR_AI         "#ff00ff"
 #define	COMMS_COLOR_COMMON     "#408010"
-#define	COMMS_COLOR_SERVICE    "#709b00"
-#define	COMMS_COLOR_SUPPLY     "#7f6539"
-#define	COMMS_COLOR_SCIENCE    "#993399"
-#define	COMMS_COLOR_MEDICAL    "#009190"
-#define	COMMS_COLOR_EXPLORER   "#929820"
-#define	COMMS_COLOR_ENGINEER   "#a66300"
-#define	COMMS_COLOR_SECURITY   "#930000"
-#define	COMMS_COLOR_COMMAND    "#204090"
-#define	COMMS_COLOR_CENTCOMM   "#5c5c7c"
-#define	COMMS_COLOR_SYNDICATE  "#6d3f40"
+#define COMMS_COLOR_SERVICE    "#709b00"
+#define COMMS_COLOR_SUPPLY     "#7f6539"
+#define COMMS_COLOR_SCIENCE    "#993399"
+#define COMMS_COLOR_MEDICAL    "#009190"
+#define COMMS_COLOR_EXPLORER   "#929820"
+#define COMMS_COLOR_ENGINEER   "#a66300"
+#define COMMS_COLOR_SECURITY   "#930000"
+#define COMMS_COLOR_COMMAND    "#204090"
+#define COMMS_COLOR_CENTCOMM   "#5c5c7c"
+#define COMMS_COLOR_SYNDICATE  "#6d3f40"
+#define COMMS_COLOR_ANALOG     "#64706b" // special case, not in telecomms_colours
+
+var/global/list/telecomms_colours = list(
+	"Default Pink" = COMMS_COLOR_DEFAULT,
+	"Entertainment Grey" = COMMS_COLOR_ENTERTAIN,
+	"A.I. Pink" = COMMS_COLOR_AI,
+	"Common Green" = COMMS_COLOR_COMMON,
+	"Service Lime" = COMMS_COLOR_SERVICE,
+	"Supply Drab" = COMMS_COLOR_SUPPLY,
+	"Scientific Purple" = COMMS_COLOR_SCIENCE,
+	"Medical Blue" = COMMS_COLOR_MEDICAL,
+	"Explorer Yellow" = COMMS_COLOR_EXPLORER,
+	"Engineering Orange" = COMMS_COLOR_ENGINEER,
+	"Security Red" = COMMS_COLOR_SECURITY,
+	"Command Blue" = COMMS_COLOR_COMMAND,
+	"Steel Blue" = COMMS_COLOR_CENTCOMM,
+	"Syndicate Red" = COMMS_COLOR_SYNDICATE
+)
 
 #define WOOD_COLOR_GENERIC     "#d5a66e"
 #define WOOD_COLOR_RICH        "#792f27"
@@ -198,12 +217,14 @@
 #define RANDOM_RGB rgb(rand(0,255), rand(0,255), rand(0,255))
 
 // Codex category colours.
-#define CODEX_COLOR_LORE      "#abdb9b"
-#define CODEX_COLOR_MECHANICS "#9ebcd8"
-#define CODEX_COLOR_ANTAG     "#e5a2a2"
-
 #define COLOR_WEBHOOK_DEFAULT 0x8bbbd5
 
 // Colors for input/hotkey panel.
 #define COLOR_INPUT_DISABLED "#f0f0f0"
 #define COLOR_INPUT_ENABLED "#d3b5b5"
+
+#define COLOR_DARKMODE_BACKGROUND "#202020"
+#define COLOR_DARKMODE_DARKBACKGROUND "#171717"
+#define COLOR_DARKMODE_TEXT "#a4bad6"
+
+#define COLORED_SQUARE(COLOR) "<span style='font-face: fixedsys; font-size: 14px; background-color: [COLOR]; color: [COLOR]'>___</span>"