Merge remote-tracking branch 'upstream/master'

.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

@@ -183,7 +183,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
@@ -219,7 +219,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'

_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/map_files/Birdshot/birdshot.dmm

@@ -9394,10 +9394,9 @@
 /obj/machinery/airalarm/directional/north,
 /obj/structure/table/wood,
 /obj/machinery/chem_dispenser/drinks,
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "dxZ" = (
@@ -10072,6 +10071,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/stone,
 /area/station/service/bar)
 "dMm" = (
@@ -20930,6 +20930,7 @@
 	},
 /obj/machinery/vending/boozeomat,
 /obj/effect/turf_decal/siding/wood,
+/obj/structure/sign/warning/no_smoking/circle/directional/north,
 /turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "hsC" = (
@@ -30567,11 +30568,6 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/machinery/barsign{
-	chosen_sign = "thecavern";
-	icon_state = "thecavern";
-	pixel_y = 32
-	},
 /obj/machinery/reagentgrinder{
 	pixel_x = -5;
 	pixel_y = 10
@@ -33247,11 +33243,14 @@
 	pixel_x = -7;
 	pixel_y = 15
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 9
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
+	},
+/obj/machinery/barsign{
+	chosen_sign = "thecavern";
+	icon_state = "thecavern";
+	pixel_y = 32
 	},
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/sign/warning/no_smoking/circle/directional/north,
 /turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "lnI" = (
@@ -50833,12 +50832,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/service/lawoffice)
-"rrX" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/turf/open/floor/stone,
-/area/station/service/bar)
 "rrZ" = (
 /obj/structure/closet/crate/trashcart,
 /obj/effect/spawner/random/trash/garbage,
@@ -56445,11 +56438,14 @@
 /turf/open/floor/eighties/red,
 /area/station/hallway/primary/central/fore)
 "tjT" = (
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/chem_master/condimaster,
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
+	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 5
+	dir = 4
 	},
-/turf/open/floor/stone,
+/turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "tjY" = (
 /obj/machinery/atmospherics/components/binary/pump/on{
@@ -58695,7 +58691,7 @@
 	},
 /obj/machinery/chem_dispenser/drinks/beer,
 /obj/effect/turf_decal/siding/wood,
-/obj/machinery/digital_clock/directional/north,
+/obj/structure/fish_mount/bar/directional/north,
 /turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "tVt" = (
@@ -100086,7 +100082,7 @@ iXW
 dRb
 sON
 tjT
-rrX
+xkV
 lAV
 fYJ
 eGU