Merge branch 'discordia-space:master' into master

Author: vode-code

.github/workflows/ci_suite.yml

@@ -10,12 +10,22 @@ jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     concurrency:
       group: run_linters-${{ github.ref }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
+      - name: Update apt and install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgit2-dev libjpeg62 libjpeg62-dev libpng-dev
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: 'tools/requirements.txt'
+      - uses: actions/checkout@v3
       - name: Restore SpacemanDMM cache
         uses: actions/cache@v3
         with:
@@ -32,10 +42,9 @@ jobs:
             ${{ runner.os }}-
       - name: Install Tools
         run: |
-          pip3 install setuptools
+          pip install -r tools/requirements.txt
           bash tools/ci/install_node.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
-          tools/bootstrap/python -c ''
       - name: Run Linters
         run: |
           bash tools/ci/check_filedirs.sh cev_eris.dme
@@ -48,15 +57,15 @@ jobs:
           tools/bootstrap/python -m mapmerge2.dmm_test
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
       - name: Annotate Lints
-        uses: yogstation13/DreamAnnotate@v2
+        uses: alexkar598/DreamAnnotate@v2
         if: always()
         with:
           outputFile: output-annotations.txt
 
   compile_all_maps:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     concurrency:
       group: compile_all_maps-${{ github.ref }}
       cancel-in-progress: true
@@ -76,7 +85,7 @@ jobs:
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     services:
       mysql:
         image: mysql:latest
@@ -104,7 +113,7 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
+          sudo apt install -o APT::Immediate-Configure=false libssl3:i386
           bash tools/ci/install_rust_g.sh
       - name: Compile Tests
         run: |
@@ -127,7 +136,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && always()"
     needs: [run_all_tests]
     name: Compare Screenshot Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       # If we ever add more artifacts, this is going to break, but it'll be obvious.

cev_eris.dme

@@ -30,6 +30,7 @@
 #include "code\__DEFINES\craft.dm"
 #include "code\__DEFINES\cyborg_traits.dm"
 #include "code\__DEFINES\damage_organs.dm"
+#include "code\__DEFINES\database.dm"
 #include "code\__DEFINES\economy.dm"
 #include "code\__DEFINES\error_handler.dm"
 #include "code\__DEFINES\flags.dm"
@@ -226,6 +227,7 @@
 #include "code\controllers\subsystems\chemistry.dm"
 #include "code\controllers\subsystems\chunks.dm"
 #include "code\controllers\subsystems\craft.dm"
+#include "code\controllers\subsystems\database.dm"
 #include "code\controllers\subsystems\dcs.dm"
 #include "code\controllers\subsystems\economy.dm"
 #include "code\controllers\subsystems\evac.dm"
@@ -527,7 +529,6 @@
 #include "code\defines\obj.dm"
 #include "code\defines\procs\announce.dm"
 #include "code\defines\procs\AStar.dm"
-#include "code\defines\procs\dbcore.dm"
 #include "code\defines\procs\hud.dm"
 #include "code\defines\procs\radio.dm"
 #include "code\defines\procs\sd_Alert.dm"
@@ -1425,6 +1426,7 @@
 #include "code\modules\admin\verbs\possess.dm"
 #include "code\modules\admin\verbs\pray.dm"
 #include "code\modules\admin\verbs\randomverbs.dm"
+#include "code\modules\admin\verbs\reestablish_db_connection.dm"
 #include "code\modules\admin\verbs\ticklag.dm"
 #include "code\modules\admin\verbs\tripAI.dm"
 #include "code\modules\admin\verbs\SDQL_2\SDQL_2.dm"

code/__DEFINES/database.dm

@@ -0,0 +1,6 @@
+/// When a query has been queued up for execution/is being executed
+#define DB_QUERY_STARTED 0
+/// When a query is finished executing
+#define DB_QUERY_FINISHED 1
+/// When there was a problem with the execution of a query.
+#define DB_QUERY_BROKEN 2

code/__DEFINES/subsystems-priority.dm

@@ -16,7 +16,8 @@ var/list/bitflags = list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096
 #define SS_PRIORITY_TICKER			200	// Gameticker processing.
 #define FIRE_PRIORITY_TGUI 110
 #define FIRE_PRIORITY_EXPLOSIONS 105 // Explosions!
-#define FIRE_PRIORITY_THROWING 106 // Throwing! after explosions since they influence throw direction
+#define FIRE_PRIORITY_DATABASE 104
+#define FIRE_PRIORITY_THROWING 103 // Throwing! after explosions since they influence throw direction
 #define SS_PRIORITY_HUMAN			101	// Human Life().
 #define SS_PRIORITY_MOB				100	// Non-human Mob Life().
 #define SS_PRIORITY_CHAT			100 // Chat subsystem.

code/__DEFINES/subsystems.dm

@@ -1,4 +1,13 @@
 
+//! ## DB defines
+/**
+ * DB schema version
+ *
+ * Update this whenever the db schema changes
+ */
+#define DB_SCHEMA_VERSION 1
+
+
 //! ## Timing subsystem
 /**
  * Don't run if there is an identical unique timer active
@@ -88,6 +97,7 @@
 // The numbers just define the ordering, they are meaningless otherwise.
 
 #define INIT_ORDER_GARBAGE 99
+#define INIT_ORDER_DBCORE 98
 #define INIT_ORDER_EXPLOSIONS 97
 #define INIT_ORDER_STATPANELS 96
 #define INIT_ORDER_MAPPING 15

code/__HELPERS/text.dm

@@ -13,10 +13,8 @@
  * SQL sanitization
  */
 
-// Run all strings to be used in an SQL query through this proc first to properly escape out injection attempts.
-/proc/sanitizeSQL(var/t as text)
-	var/sqltext = dbcon.Quote(t);
-	return copytext(sqltext, 2, length(sqltext));//Quote() adds quotes around input, we already do that
+/proc/format_table_name(table as text)
+	return sql_tableprefix + table
 
 /*
  * Text sanitization

code/controllers/configuration.dm

@@ -805,13 +805,25 @@ GLOBAL_LIST_EMPTY(storyteller_cache)
 			if ("address")
 				sqladdress = value
 			if ("port")
-				sqlport = value
+				sqlport = text2num(value)
 			if ("database")
 				sqldb = value
 			if ("login")
 				sqllogin = value
 			if ("password")
 				sqlpass = value
+			if ("sql_tableprefix")
+				sql_tableprefix = value
+			if ("async_query_timeout")
+				sql_async_query_timeout = text2num(value)
+			if ("blocking_query_timeout")
+				sql_blocking_query_timeout = text2num(value)
+			if ("pooling_min_sql_connections")
+				sql_pooling_min_sql_connections = text2num(value)
+			if ("pooling_max_sql_connections")
+				sql_pooling_max_sql_connections = text2num(value)
+			if ("max_concurrent_queries")
+				sql_max_concurrent_queries = text2num(value)
 			else
 				log_misc("Unknown setting in configuration: '[name]'")
 

code/controllers/master.dm

@@ -43,6 +43,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/init_timeofday
 	var/init_time
 	var/tickdrift = 0
+	var/chronofailure = FALSE
 
 	/// How long is the MC sleeping between runs, read only (set by Loop() based off of anti-tick-contention heuristics)
 	var/sleep_delta = 1
@@ -100,6 +101,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			Recover()
 			qdel(Master)
 			Master = src
+			chronofailure = FALSE // presume time is stable before evidence otherwise
 		else
 			//Code used for first master on game boot or if existing master got deleted
 			Master = src
@@ -376,6 +378,23 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 		tickdrift = max(0, MC_AVERAGE_FAST(tickdrift, (((REALTIMEOFDAY - init_timeofday) - (world.time - init_time)) / world.tick_lag)))
 		var/starting_tick_usage = TICK_USAGE
 
+		if(REALTIMEOFDAY < init_timeofday || REALTIMEOFDAY < 0 || world.time < 0)
+			chronofailure = TRUE
+			log_game("CHRONOFAILURE: Time collapse with rollover number [midnight_rollovers].")
+			send2coders(message = "CHRONOFAILURE: Time is collapsing, rollover number [midnight_rollovers]. Attempting timeless reboot.", color = "#ff0000", admiralty = 1)
+			restart_timeout = 0 // time isn't trustworthy anymore
+			restart_clear = 0
+			switch(Recreate_MC()) // attempt reboot
+				if(-1)
+					log_game("CHRONOFAILURE: MC reboot failed.")
+					send2coders(message = "CHRONOFAILURE: Timeless reboot failed.", color = "#ff0000", admiralty = 1)
+				if(0)
+					log_game("CHRONOFAILURE: MC reboot failed beyond repair.")
+					send2coders(message = "CHRONOFAILURE: Timeless reboot failed beyond repair.", color = "#ff0000", admiralty = 1)
+				if(1)
+					log_game("CHRONOFAILURE: MC reboot successful.")
+					send2coders(message = "CHRONOFAILURE: Timeless reboot successful.", color = "#00ff00", admiralty = 1)
+
 		if (init_stage != init_stage_completed)
 			return MC_LOOP_RTN_NEWSTAGES
 		if (processing <= 0)

code/controllers/subsystems/chunks.dm

@@ -217,14 +217,14 @@ SUBSYSTEM_DEF(chunks)
 	RegisterSignal(newContainer, COMSIG_MOVABLE_MOVED, PROC_REF(chunkHearerOnMove))
 
 /obj/proc/chunkHearerClearSelf(datum/source)
+	SIGNAL_HANDLER
 	var/atom/container = getContainingAtom()
 	UnregisterSignal(container, COMSIG_MOVABLE_MOVED)
 	UnregisterSignal(src, list(COMSIG_ATOM_CONTAINERED, COMSIG_PARENT_QDELETING))
 	// in this case we never registered
 	if(container.z != 0)
 		var/datum/chunk/chunk_reference = SSchunks.chunk_list_by_zlevel[container.z][CHUNKID(container.x, container.y)]
 		chunk_reference.hearers -= src
-	SIGNAL_HANDLER
 
 
 // This is done by the mob itself because keeping track of them with reference solving is trash and unefficient