Merge branch 'master' into free-golems-mining-again

Author: PollardTheDragon

.github/CODEOWNERS

@@ -13,9 +13,8 @@
 # CI + Tooling
 _build_dependencies.sh @AffectedArc07
 
-# Server Stuff
+# Database Stuff
 /SQL/ @AffectedArc07
-/config/ @AffectedArc07
 
 # Executables that need to be security-cleared
 dreamchecker.exe @AffectedArc07
@@ -33,3 +32,9 @@ rustlibs_516_prod.dll @AffectedArc07
 ### Burzah
 # TGUI stuff
 /tgui/bin @Burzah
+/tgui/docs @Burzah
+
+
+### Multiple Owners
+# Config Stuff
+/config/ @AffectedArc07 @Burzah @Contrabang @warriorstar-orion

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,14 +21,11 @@
 
 <!-- How did you test the PR, if at all? -->
 
-<hr>
-
-### Declaration
+## Declaration
 
 - [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
   <!-- Replace the box with [x] to mark as complete. -->
   <!-- Ensure there are no spaces between the x and the square brackets [] else this will not work properly. -->
-<hr>
 
 ## Changelog
 

.github/actions/restore_or_install_byond/action.yml

@@ -0,0 +1,41 @@
+# This action attempts to restore BYOND from a cache, or to install it otherwise.
+name: Restore or Install BYOND
+description: Attempts to restore a specified BYOND version from cache; if it can't, it installs it.
+
+inputs:
+  release:
+    description: "The release channel of BYOND to install. Either STABLE or BETA."
+    required: false
+    type: string
+    default: "STABLE"
+
+runs:
+  using: composite
+  steps:
+    - name: Configure BYOND version from _build_dependencies.sh
+      shell: bash
+      run: |
+        source _build_dependencies.sh
+        echo "BYOND_MAJOR=$${{ inputs.release }}_BYOND_MAJOR" >> $GITHUB_ENV
+        echo "BYOND_MINOR=$${{ inputs.release }}_BYOND_MINOR" >> $GITHUB_ENV
+
+    # The use of `actions/cache/restore` and `actions/cache/save` here is deliberate, as we want to
+    # save the BYOND install to a cache as early as possible. If we used just `actions/cache`, it
+    # would only attempt to save the cache at the end of a job. This ensures that if a workflow run
+    # is cancelled, we already have a cache to restore from.
+    - name: Restore BYOND cache
+      id: restore_byond_cache
+      uses: actions/cache/restore@v4
+      with:
+        path: ~/BYOND
+        key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
+    - name: Install BYOND
+      if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
+      shell: bash
+      run: bash tools/ci/install_byond.sh
+    - name: Save BYOND cache
+      if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
+      uses: actions/cache/save@v4
+      with:
+        path: ~/BYOND
+        key: ${{ steps.restore_byond_cache.outputs.cache-primary-key }}

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Cache
         uses: actions/cache@v4
         with:
-          path: $HOME/SpacemanDMM
+          path: ~/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm
 
       - name: Install Tools
@@ -79,13 +79,16 @@ jobs:
   compile_all_maps:
     name: Compile All Maps
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        byondtype: ['STABLE', 'BETA']
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Cache
-        uses: actions/cache@v4
+      - name: Restore BYOND from Cache
+        uses: ./.github/actions/restore_or_install_byond
         with:
-          path: $HOME/BYOND
-          key: ${{ runner.os }}-byond
+          release: ${{ matrix.byondtype }}
       # We test PARADISE_PRODUCTION_HARDWARE here because we dont in station_mapload_tests
       - name: Compile All Maps
         run: |
@@ -104,11 +107,10 @@ jobs:
         byondtype: ['STABLE', 'BETA']
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Cache
-        uses: actions/cache@v4
+      - name: Restore BYOND from Cache
+        uses: ./.github/actions/restore_or_install_byond
         with:
-          path: $HOME/BYOND
-          key: ${{ runner.os }}-byond
+          release: ${{ matrix.byondtype }}
       - name: Install RUST_G Deps
         run: |
           sudo dpkg --add-architecture i386
@@ -132,11 +134,10 @@ jobs:
         byondtype: ['STABLE', 'BETA']
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Cache
-        uses: actions/cache@v4
+      - name: Restore BYOND from Cache
+        uses: ./.github/actions/restore_or_install_byond
         with:
-          path: $HOME/BYOND
-          key: ${{ runner.os }}-byond
+          release: ${{ matrix.byondtype }}
       - name: Setup & Validate DB
         run: |
           sudo systemctl start mysql

.gitignore

@@ -72,7 +72,8 @@ $RECYCLE.BIN
 # VIM swap files.
 *.swp
 
-# Rust output.
+# Rust output and test output files.
+/rust/src/mapmanip/test/*_out.dmm
 /rust/target/*
 rustlibs_panic.txt
 

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',
+  `quirks` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=125467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

SQL/updates/66-67.sql

@@ -0,0 +1,4 @@
+#Updates the DB from 66 to 67
+#Adds a column to the characters table that stores quirks in a JSON format
+ALTER TABLE `characters`
+	ADD column `quirks` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL AFTER `pda_ringtone`;

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm

@@ -178,7 +178,7 @@
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aO" = (
-/obj/machinery/door/airlock/multi_tile/glass,
+/obj/machinery/door/airlock/multi_tile/glass/directional/east,
 /obj/structure/fans/tiny,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
@@ -341,7 +341,7 @@
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "vf" = (
-/obj/machinery/door/airlock/multi_tile/glass,
+/obj/machinery/door/airlock/multi_tile/glass/directional/east,
 /obj/structure/fans/tiny,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered/snow_cabin)
@@ -381,7 +381,7 @@
 /area/ruin/powered/snow_biodome)
 "Ez" = (
 /obj/structure/fans/tiny,
-/obj/machinery/door/airlock/multi_tile/glass,
+/obj/machinery/door/airlock/multi_tile/glass/directional/east,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
 "FP" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm

@@ -1496,7 +1496,7 @@
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_excavation)
 "WH" = (
-/obj/machinery/door/poddoor/multi_tile/three_tile_hor,
+/obj/machinery/door/poddoor/multi_tile/triple/directional/east,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/althland_excavation)
 "Xl" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm

@@ -1714,9 +1714,8 @@
 	},
 /area/mine/outpost/hallway/west)
 "jQ" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Main Airlock";
-	dir = 1
+/obj/machinery/door/airlock/multi_tile/glass/directional/north{
+	name = "Main Airlock"
 	},
 /obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
@@ -3964,7 +3963,7 @@
 /area/mine/outpost/production)
 "vP" = (
 /obj/structure/fans/tiny,
-/obj/machinery/door/airlock/multi_tile/glass{
+/obj/machinery/door/airlock/multi_tile/glass/directional/east{
 	name = "Main Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,