Merge branch 'master' into suits

.github/alternate_byond_versions.txt

@@ -2,7 +2,11 @@
 # This is useful for making sure we maintain compatibility with both older and newer versions,
 # while still having our main tests run on a guaranteed pinned version.
 
-# Format is version: map
+# Format is "version: map" or "version: map;max_required_client_version"
 # Example:
 # 500.1337: runtimestation
+# 516.1638: runtimestation;516
+# Lowest supported version
 515.1627: runtimestation
+# Beta version
+516.1648: runtimestation;516

.github/guides/STANDARDS.md

@@ -68,8 +68,6 @@ var/path_type = "/obj/item/baseball_bat"
 
 * You are expected to help maintain the code that you add, meaning that if there is a problem then you are likely to be approached in order to fix any issues, runtimes, or bugs.
 
-* Do not divide when you can easily convert it to multiplication. (ie `4/2` should be done as `4*0.5`)
-
 * Separating single lines into more readable blocks is not banned, however you should use it only where it makes new information more accessible, or aids maintainability. We do not have a column limit, and mass conversions will not be received well.
 
 * If you used regex to replace code during development of your code, post the regex in your PR for the benefit of future developers and downstream users.

.github/workflows/ci_suite.yml

@@ -187,7 +187,7 @@ jobs:
       - name: Find Alternate Tests
         id: alternate_test_finder
         run: |
-          ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>.+)$")]' .github/alternate_byond_versions.txt)
+          ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>[^;]+);?(?<max_client_version>[0-9]+)?$")]' .github/alternate_byond_versions.txt)
           echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT
       - name: Collect byond client version configuration
         id: max_required_byond_client
@@ -223,7 +223,7 @@ jobs:
       map: ${{ matrix.setup.map }}
       major: ${{ matrix.setup.major }}
       minor: ${{ matrix.setup.minor }}
-      max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}}
+      max_required_byond_client: ${{ matrix.setup.max_client_version || needs.collect_data.outputs.max_required_byond_client }}
 
   compare_screenshots:
     if: needs.collect_data.outputs.alternate_tests == '[]' || needs.run_alternate_tests.result == 'success'
@@ -291,7 +291,7 @@ jobs:
   completion_gate: # Serves as a non-moving target for branch rulesets
     if: always() && !cancelled()
     name: Completion Gate
-    needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ]
+    needs: [ test_windows, compare_screenshots, compile_all_maps, run_all_tests, run_alternate_tests, run_linters ]
     runs-on: ubuntu-latest
     steps:
       - name: Decide whether the needed jobs succeeded or failed

_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm

@@ -993,9 +993,6 @@
 /area/ruin/comms_agent)
 "UI" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/security/laptop/syndie{
-	dir = 1
-	},
 /obj/item/paper/monitorkey{
 	pixel_x = -15;
 	pixel_y = 7

_maps/RandomRuins/SpaceRuins/bigderelict1.dmm

@@ -584,7 +584,7 @@
 	name = "dried blood trail"
 	},
 /mob/living/basic/creature{
-	desc = "Awh its so sm-OH GOD WHAT THE FUCK.";
+	desc = "Awh, it's so sm-OH GOD, WHAT THE FUCK.";
 	health = 25;
 	maxHealth = 25;
 	name = "hatchling";

_maps/bandastation/automapper/automapper_config.toml

@@ -25,18 +25,97 @@ required_map = "builtin"
 coordinates = [12, 53, 1]
 trait_name = "CentCom"
 
-# IceBoxStation Detective's Office
+# DeltaStation
+[templates.deltastation_lawyer_office]
+map_files = ["deltastation_lawyer_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/deltastation/"
+required_map = "DeltaStation2.dmm"
+coordinates = [123, 143, 1]
+trait_name = "Station"
+
+[templates.deltastation_magistrate_office]
+map_files = ["deltastation_magistrate_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/deltastation/"
+required_map = "DeltaStation2.dmm"
+coordinates = [185, 122, 1]
+trait_name = "Station"
+
+[templates.deltastation_ntr_blueshield_office]
+map_files = ["deltastation_ntr_blueshield_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/deltastation/"
+required_map = "DeltaStation2.dmm"
+coordinates = [146, 108, 1]
+trait_name = "Station"
+
+# MetaStation
+[templates.metastation_lawyer_office]
+map_files = ["metastation_lawyer_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/metastation/"
+required_map = "MetaStation.dmm"
+coordinates = [57, 119, 1]
+trait_name = "Station"
+
+[templates.metastation_magistrate_office]
+map_files = ["metastation_magistrate_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/metastation/"
+required_map = "MetaStation.dmm"
+coordinates = [119, 151, 1]
+trait_name = "Station"
+
+[templates.metastation_ntr_blueshield_office]
+map_files = ["metastation_ntr_blueshield_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/metastation/"
+required_map = "MetaStation.dmm"
+coordinates = [101, 115, 1]
+trait_name = "Station"
+
+# IceBoxStation
+[templates.iceboxstation_blueshield_office]
+map_files = ["iceboxstation_blueshield_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/iceboxstation/"
+required_map = "IceBoxStation.dmm"
+coordinates = [99, 154, 3]
+trait_name = "Station"
+
 [templates.iceboxstation_detective_office]
 map_files = ["iceboxstation_detective_office.dmm"]
 directory = "_maps/bandastation/automapper/templates/iceboxstation/"
 required_map = "IceBoxStation.dmm"
 coordinates = [86, 161, 2]
 trait_name = "Station"
 
-# TramStation Detective's Office
+[templates.iceboxstation_magistrate_office]
+map_files = ["iceboxstation_magistrate_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/iceboxstation/"
+required_map = "IceBoxStation.dmm"
+coordinates = [99, 150, 2]
+trait_name = "Station"
+
+[templates.iceboxstation_ntr_office]
+map_files = ["iceboxstation_ntr_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/iceboxstation/"
+required_map = "IceBoxStation.dmm"
+coordinates = [92, 147, 2]
+trait_name = "Station"
+
+# TramStation
 [templates.tramstation_detective_office]
 map_files = ["tramstation_detective_office.dmm"]
 directory = "_maps/bandastation/automapper/templates/tramstation/"
 required_map = "tramstation.dmm"
 coordinates = [82, 126, 2]
 trait_name = "Station"
+
+[templates.tramstation_magistrate_lawyer_office]
+map_files = ["tramstation_magistrate_lawyer_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/tramstation/"
+required_map = "tramstation.dmm"
+coordinates = [107, 142, 1]
+trait_name = "Station"
+
+[templates.tramstation_ntr_blueshield_office]
+map_files = ["tramstation_ntr_blueshield_office.dmm"]
+directory = "_maps/bandastation/automapper/templates/tramstation/"
+required_map = "tramstation.dmm"
+coordinates = [79, 130, 2]
+trait_name = "Station"