Merge remote-tracking branch 'upstream/master' into meet-the-smith

.github/workflows/ci.yml

@@ -99,20 +99,42 @@ jobs:
           tools/ci/generate_maplist.sh
           DreamMaker -DMULTIINSTANCE -DCIMAP paradise.dme
 
+  station_mapload_tests:
+    name: Station Tests
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false # Let all map tests run to completion
+      matrix:
+        station:
+          ['boxstation', 'deltastation', 'metastation', 'cerestation', 'emeraldstation']
+        byondtype: ['STABLE', 'BETA']
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Cache
+        uses: actions/cache@v4
+        with:
+          path: $HOME/BYOND
+          key: ${{ runner.os }}-byond
+      - name: Install RUST_G Deps
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install zlib1g-dev:i386
+          tools/ci/install_rustg.sh
+      - name: Compile & Run Unit Tests
+        run: |
+          tools/ci/install_byond.sh '${{ matrix.byondtype }}'
+          source $HOME/BYOND/byond/bin/byondsetup
+          DreamMaker -DMAP_TESTS -DTEST_CONFIG_OVERRIDE=\"unit_tests\" -DMULTIINSTANCE -DCIBUILDING paradise.dme
+          echo '/datum/map/${{ matrix.station }}' > data/next_map.txt
+          tools/ci/run_server.sh
+
   unit_tests_and_sql:
     name: Unit Tests + SQL Validation
     runs-on: ubuntu-22.04
     strategy:
-      fail-fast: false # Let all map tests run to completion
+      fail-fast: false
       matrix:
-        maptype:
-          [
-            '/datum/map/boxstation',
-            '/datum/map/deltastation',
-            '/datum/map/metastation',
-            '/datum/map/cerestation',
-            '/datum/map/emeraldstation',
-          ]
         byondtype: ['STABLE', 'BETA']
     services:
       mariadb:
@@ -144,8 +166,8 @@ jobs:
         run: |
           tools/ci/install_byond.sh '${{ matrix.byondtype }}'
           source $HOME/BYOND/byond/bin/byondsetup
-          DreamMaker -DMULTIINSTANCE -DCIBUILDING paradise.dme
-          echo '${{ matrix.maptype }}' > data/next_map.txt
+          DreamMaker -DGAME_TESTS -DTEST_CONFIG_OVERRIDE=\"unit_tests\" -DMULTIINSTANCE -DCIBUILDING paradise.dme
+          echo '/datum/map/test_tiny' > data/next_map.txt
           tools/ci/run_server.sh
 
   windows_dll_tests:

SQL/paradise_schema.sql

@@ -83,6 +83,7 @@ CREATE TABLE `characters` (
   `runechat_color` VARCHAR(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#FFFFFF',
   `cyborg_brain_type` ENUM('MMI', 'Robobrain', 'Positronic') NOT NULL DEFAULT 'MMI',
   `pda_ringtone` VARCHAR(16) NULL DEFAULT NULL COLLATE 'utf8mb3_general_ci',
+  `species_subtype` VARCHAR(45) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'None',
   PRIMARY KEY (`id`),
   KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=125467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

SQL/updates/63-64.sql

@@ -0,0 +1,5 @@
+# Updates the DB from 63 to 64 ~SpaghettiBit
+# Adds a subtype race to be stored on character saves
+# Add species_subtype after pda_ringtone
+ALTER TABLE `characters`
+	ADD COLUMN `species_subtype` VARCHAR(45) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'None' AFTER `pda_ringtone`;

_maps/__MAP_DEFINES.dm

@@ -13,6 +13,8 @@
 	#define STATION_CONTACT "Station Contact"
 	// A level dedicated to admin use
 	#define ADMIN_LEVEL "Admin Level"
+	// For Z-levels dedicated to auto-spawning stuff in
+	#define Z_FLAG_RESERVED "Reserved"
 	// A level that can be navigated to by the crew without admin intervention or the emergency shuttle.
 	#define REACHABLE_BY_CREW "Reachable"
 	// For away missions - used by some consoles

_maps/map_files/stations/boxstation.dmm

@@ -35,7 +35,6 @@
 "aag" = (
 /obj/machinery/hologram/holopad,
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/mouse,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/incinerator)
 "aah" = (
@@ -5895,7 +5894,6 @@
 "avE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/stack/cable_coil/random,
-/mob/living/simple_animal/mouse/white,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
 "avF" = (
@@ -10106,7 +10104,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/pod_2)
 "aJW" = (
-/mob/living/simple_animal/mouse,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/effect/mapping_helpers/turfs/damage,
 /turf/simulated/floor/wood,
@@ -10117,11 +10114,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint2)
-"aJY" = (
-/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
 "aJZ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -11131,10 +11123,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
-"aNi" = (
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
 "aNj" = (
 /obj/structure/table,
 /turf/simulated/floor/plating,
@@ -12262,10 +12250,6 @@
 	icon_state = "arrival"
 	},
 /area/station/hallway/secondary/entry/north)
-"aRg" = (
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
 "aRh" = (
 /obj/machinery/sleeper{
 	dir = 4
@@ -25796,10 +25780,6 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/station/maintenance/port)
-"bKH" = (
-/mob/living/simple_animal/mouse/gray,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
 "bKI" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -32438,7 +32418,6 @@
 /turf/simulated/floor/plating/airless,
 /area/station/science/toxins/test)
 "clF" = (
-/mob/living/simple_animal/mouse,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
 	},
@@ -33633,7 +33612,6 @@
 /area/station/command/office/ntrep)
 "cqK" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/mouse,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
@@ -34885,12 +34863,6 @@
 /obj/item/stack/rods,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/apmaint)
-"cvl" = (
-/mob/living/simple_animal/mouse/gray,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
 "cvm" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -44090,7 +44062,6 @@
 /area/station/maintenance/turbine)
 "dev" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/mouse,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/turbine)
 "dew" = (
@@ -45618,10 +45589,6 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
-"dkv" = (
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
 "dky" = (
 /obj/machinery/camera{
 	c_tag = "Central Hallway North-East"
@@ -49245,10 +49212,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/port/east)
-"egi" = (
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
 "egq" = (
 /obj/structure/closet/secure_closet/brig,
 /obj/machinery/power/apc/directional/east,
@@ -53693,7 +53656,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/mob/living/simple_animal/mouse,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint2)
 "gsl" = (
@@ -53954,11 +53916,6 @@
 	icon_state = "freezerfloor"
 	},
 /area/station/public/toilet/unisex)
-"gyA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/explorer,
-/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
 "gyG" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
@@ -57631,6 +57588,21 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
+"ivC" = (
+/obj/merge_conflict_marker{
+	name = "Merge Conflict Marker: <<<"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/explorer,
+/obj/merge_conflict_marker{
+	name = "Merge Conflict Marker: ---"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/merge_conflict_marker{
+	name = "Merge Conflict Marker: >>>"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
 "ivE" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -72054,22 +72026,6 @@
 	icon_state = "caution"
 	},
 /area/station/engineering/break_room)
-"pUR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint2)
 "pUU" = (
 /obj/structure/filingcabinet,
 /turf/simulated/floor/carpet,
@@ -80531,7 +80487,6 @@
 	},
 /area/station/maintenance/asmaint)
 "uql" = (
-/mob/living/simple_animal/mouse,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
@@ -102043,7 +101998,7 @@ nxX
 aGn
 aPW
 aQb
-aRg
+aHS
 aHl
 aGn
 rPS
@@ -103576,7 +103531,7 @@ bat
 aDA
 aEH
 aEJ
-aJY
+aHl
 aIK
 aGn
 aHS
@@ -103608,7 +103563,7 @@ blM
 bvq
 cho
 bwZ
-cvl
+pcH
 bCr
 pwm
 cwA
@@ -107179,7 +107134,7 @@ aaa
 aaa
 loS
 dEG
-aRg
+aHS
 vbm
 aJX
 jQt
@@ -108238,7 +108193,7 @@ bnK
 bnK
 cJV
 blQ
-bKH
+bnK
 bxb
 bIX
 bQf
@@ -111312,7 +111267,7 @@ bkg
 blX
 wrU
 kBW
-gyA
+ivC
 rsA
 bDJ
 wrU
@@ -111859,7 +111814,7 @@ bBf
 pnc
 nIY
 cqs
-egi
+coL
 xxQ
 omB
 coL
@@ -131594,7 +131549,7 @@ aGX
 aQI
 aGY
 aGX
-aNi
+aGY
 aGY
 aGX
 aGX
@@ -132438,7 +132393,7 @@ bGG
 qZN
 oyY
 oyY
-pUR
+upd
 bGG
 qZN
 dQM
@@ -137600,7 +137555,7 @@ cNq
 cga
 ePu
 ePu
-dkv
+csL
 isD
 csL
 jPw