marge branch

.github/workflows/autowiki.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   autowiki:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: "Check for AUTOWIKI_USERNAME"
       id: secrets_set

.github/workflows/ci_suite.yml

@@ -11,8 +11,9 @@ on:
       - master
 jobs:
   run_linters:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
@@ -66,8 +67,9 @@ jobs:
           cat check_regex_output.txt
 
   compile_all_maps:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Python setup
@@ -90,54 +92,22 @@ jobs:
           tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT
 
   run_all_tests:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-    services:
-      mysql:
-        image: mysql:latest
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup cache
-        id: cache-byond
-        uses: actions/cache@v3
-        with:
-          path: ~/BYOND
-          key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
-      - name: Install BYOND
-        if: steps.cache-byond.outputs.cache-hit != 'true'
-        run: bash tools/ci/install_byond.sh
-      - name: Setup database
-        run: |
-          sudo systemctl start mysql
-          mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
-          mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
-          mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
-          mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
-      - name: Install rust-g
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
-          bash tools/ci/install_rust_g.sh
-      - name: Install auxmos
-        run: |
-          bash tools/ci/install_auxmos.sh
-      - name: Compile Tests
-        run: |
-          bash tools/ci/install_byond.sh
-          source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
-      - name: Run Tests
-        run: |
-          source $HOME/BYOND/byond/bin/byondsetup
-          bash tools/ci/run_server.sh
+    uses: ./.github/workflows/run_integration_tests.yml
+
+#  run_alternate_tests:
+#    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+#    name: Alternate Tests
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        major: [515]
+#        minor: [1614]
+#    uses: ./.github/workflows/run_integration_tests.yml
+#    with:
+#      major: ${{ matrix.major }}
+#      minor: ${{ matrix.minor }}
 
   test_windows:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"

.github/workflows/compile_changelogs.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   compile:
     name: "Compile changelogs"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: "Check for ACTION_ENABLER secret and pass it to output if it exists to be checked by later steps"
         id: value_holder

.github/workflows/docker_publish.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   publish:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/generate_documentation.yml

@@ -21,7 +21,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Restore SpacemanDMM cache

.github/workflows/make_changelogs.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   MakeCL:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - name: Checkout

.github/workflows/round_id_linker.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   link_rounds:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: shiptest-ss13/[email protected]
         with:

.github/workflows/run_integration_tests.yml

@@ -0,0 +1,61 @@
+# This is a reusable workflow to run integration tests.
+# This is run for every single map in ci_suite.yml. You might want to edit that instead.
+name: Run Integration Tests
+on:
+  workflow_call:
+    inputs:
+      major:
+        required: false
+        type: string
+      minor:
+        required: false
+        type: string
+jobs:
+  run_integration_tests:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup cache
+        id: cache-byond
+        uses: actions/cache@v3
+        with:
+          path: ~/BYOND
+          key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
+      - name: Setup database
+        run: |
+          sudo systemctl start mysql
+          mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
+          mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
+          mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
+          mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
+      - name: Install rust-g
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
+          bash tools/ci/install_rust_g.sh
+      - name: Install auxmos
+        run: |
+          bash tools/ci/install_auxmos.sh
+      - name: Configure version
+        if: ${{ inputs.major }}
+        run: |
+          echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
+          echo "BYOND_MINOR=${{ inputs.minor }}" >> $GITHUB_ENV
+      - name: Compile Tests
+        run: |
+          bash tools/ci/install_byond.sh
+          source $HOME/BYOND/byond/bin/byondsetup
+          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
+      - name: Run Tests
+        run: |
+          source $HOME/BYOND/byond/bin/byondsetup
+          bash tools/ci/run_server.sh

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   stale:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/stale@v4

.github/workflows/update_tgs_dmapi.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   update-dmapi:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Update the TGS DMAPI
     steps:
       - name: Clone

_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm

@@ -1456,32 +1456,34 @@
 /area/ruin)
 "dA" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 10
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 10
+	},
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin)
 "dB" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin)
 "dC" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 6
+	},
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

_maps/RandomRuins/SpaceRuins/provinggrounds.dmm

@@ -324,7 +324,6 @@
 /area/ruin/space/has_grav/syndicircle/winter)
 "iR" = (
 /obj/effect/mine/shrapnel,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/item/stack/tile/mineral/snow,
 /obj/machinery/light/dim/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,

_maps/outpost/nanotrasen_asteroid.dmm

@@ -580,16 +580,13 @@
 	pixel_y = -3
 	},
 /obj/item/toy/plush/beeplushie,
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 5
-	},
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 6
-	},
 /obj/item/reagent_containers/food/drinks/mug/tea{
 	pixel_y = -14;
 	pixel_x = -4
 	},
+/obj/effect/turf_decal/weather/snow/surround{
+	dir = 4
+	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
 /area/outpost/external)
 "cm" = (
@@ -998,7 +995,7 @@
 /area/outpost/maintenance/fore)
 "dO" = (
 /obj/effect/turf_decal/snow,
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 8
 	},
 /turf/open/floor/concrete/reinforced,
@@ -3253,7 +3250,7 @@
 	pixel_y = 3;
 	pixel_x = -1
 	},
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 9
 	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
@@ -6619,7 +6616,7 @@
 /area/outpost/hallway/central)
 "xk" = (
 /obj/structure/bonfire/prelit,
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
@@ -9282,7 +9279,7 @@
 	pixel_y = 5;
 	pixel_x = 1
 	},
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 10
 	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
@@ -11618,13 +11615,13 @@
 /turf/open/floor/concrete/slab_3,
 /area/outpost/hallway/central)
 "Os" = (
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 6
-	},
 /obj/item/shovel,
 /obj/item/flashlight/lantern{
 	pixel_x = 7
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 6
+	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
 /area/outpost/external)
 "Ot" = (

_maps/shuttles/independent/independent_beluga.dmm

@@ -647,6 +647,7 @@
 /obj/item/clothing/head/hopcap,
 /obj/item/gun/energy/e_gun/mini,
 /obj/item/clothing/head/HoS/cowboy,
+/obj/item/clothing/suit/jacket/leather/duster/command,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ge" = (
@@ -3504,10 +3505,9 @@
 	pixel_x = -28
 	},
 /obj/item/clothing/under/rank/command/captain,
-/obj/item/clothing/under/rank/command/lieutenant,
+/obj/item/clothing/under/rank/command,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/suit/armor/vest/capcarapace/alt,
 /obj/item/clothing/suit/armor/vest/capcarapace/duster,
 /obj/item/clothing/head/beret/captain,
 /obj/item/clothing/head/caphat,
@@ -3521,6 +3521,7 @@
 /obj/item/areaeditor/shuttle,
 /obj/effect/turf_decal/spline/fancy/opaque/bottlegreen,
 /obj/item/clothing/head/caphat/cowboy,
+/obj/item/clothing/suit/armor/vest/capcarapace/captunic,
 /turf/open/floor/wood/walnut,
 /area/ship/bridge)
 "Hv" = (

_maps/shuttles/independent/independent_dwayne.dmm

@@ -1552,8 +1552,9 @@
 /obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
-/obj/item/clothing/head/caphat/cowboy,
 /obj/item/radio/intercom/wideband/directional/east,
+/obj/item/clothing/suit/armor/vest/capcarapace/duster,
+/obj/item/clothing/head/caphat/cowboy,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ka" = (

_maps/shuttles/independent/independent_kilo.dmm

@@ -646,6 +646,7 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
+/obj/item/clothing/suit/armor/vest/capcarapace/duster,
 /turf/open/floor/carpet,
 /area/ship/crew)
 "da" = (