Merge branch 'master' of github.com:DaedalusDock/daedalusdock into ca…

…llbacktitlemusic

.github/workflows/ci_suite.yml

@@ -12,7 +12,10 @@ jobs:
   run_linters:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Run Linters
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04 #Pinning this for now, the correct way is to port Mothblocks' update to 22.*
+    concurrency:
+      group: run_linters-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
       - name: Restore SpacemanDMM cache
@@ -67,7 +70,7 @@ jobs:
   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: Restore BYOND cache
@@ -84,7 +87,7 @@ jobs:
   find_all_maps:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Find Maps to Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       maps: ${{ steps.map_finder.outputs.maps }}
       alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
@@ -142,15 +145,15 @@ jobs:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]' )
     name: Check Alternate Tests
     needs: [run_alternate_tests]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - run: echo Alternate tests passed.
 
   compare_screenshots:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') && (success() || failure()) )
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') && (always() && (!failure() && !cancelled())) )
     needs: [run_all_tests, run_alternate_tests]
     name: Compare Screenshot Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       # If we ever add more artifacts, this is going to break, but it'll be obvious.

.github/workflows/compile_changelogs.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   compile:
     name: "Compile changelogs"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
         id: value_holder
@@ -17,7 +17,7 @@ jobs:
         run: |
           unset SECRET_EXISTS
           if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
-          echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
+          echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: "Setup python"
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: actions/setup-python@v1
@@ -31,9 +31,10 @@ jobs:
           sudo apt-get install  dos2unix
       - name: "Checkout"
         if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
         with:
           fetch-depth: 25
+          persist-credentials: false
       - name: "Compile"
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |

.github/workflows/generate_documentation.yml

@@ -8,7 +8,7 @@ jobs:
     permissions:
       contents: write  # for JamesIves/github-pages-deploy-action to push changes in repo
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     concurrency: gen-docs
     steps:
       - uses: actions/checkout@v3

.github/workflows/pr_emoji.yml

@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   title_and_changelog:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: Wayland-Smithy/emoji-stripper-action@8f4c2fe9748bb9b02f105be4e72a1a42b0f34d84
       with:

.github/workflows/round_id_linker.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   link_rounds:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: tgstation/round_linker@master
       with:

.github/workflows/run_integration_tests.yml

@@ -15,7 +15,7 @@ on:
         type: string
 jobs:
   run_integration_tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     services:
       mysql:
         image: mysql:latest
@@ -40,9 +40,6 @@ jobs:
           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: Configure version
         run: |

.github/workflows/show_screenshot_test_results.yml

@@ -13,7 +13,7 @@ jobs:
   show_screenshot_test_results:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') && github.event.workflow_run.run_attempt == 1 )
     name: Show Screenshot Test Results
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: "Check for ARTIFACTS_FILE_HOUSE_KEY"
         id: secrets_set

.github/workflows/stale.yml

@@ -4,10 +4,16 @@ on:
   schedule:
   - cron: "0 0 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   stale:
 
-    runs-on: ubuntu-20.04
+    permissions:
+      issues: write  # for actions/stale to close stale issues
+      pull-requests: write  # for actions/stale to close stale PRs
+    runs-on: ubuntu-22.04
 
     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/SpaceRuins/TheDerelict.dmm

@@ -940,10 +940,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ruin/space/derelict/singularity_engine)
-"fw" = (
-/obj/effect/mob_spawn/ghost_role/drone/derelict,
-/turf/open/floor/iron/airless,
-/area/ruin/space/derelict/bridge/access)
 "fx" = (
 /turf/open/floor/iron/airless,
 /area/ruin/space/derelict/bridge/access)
@@ -1433,10 +1429,6 @@
 /obj/item/storage/box/lights/mixed,
 /turf/open/floor/plating/airless,
 /area/ruin/space/derelict/singularity_engine)
-"in" = (
-/obj/effect/mob_spawn/ghost_role/drone/derelict,
-/turf/open/floor/plating/airless,
-/area/ruin/space/derelict/singularity_engine)
 "ip" = (
 /obj/item/stack/cable_coil/cut,
 /obj/effect/mapping_helpers/broken_floor,
@@ -2516,7 +2508,6 @@
 	dir = 1
 	},
 /obj/structure/cable/smart_cable/color/yellow,
-/obj/effect/mob_spawn/ghost_role/drone/derelict,
 /turf/open/floor/iron/airless,
 /area/ruin/space/derelict/se_solar)
 "nV" = (
@@ -7552,7 +7543,7 @@ ez
 ez
 ez
 dW
-in
+dW
 dr
 iP
 ay
@@ -9458,7 +9449,7 @@ aa
 aa
 GI
 cs
-fw
+fx
 fx
 fx
 fR

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -383,7 +383,7 @@
 "gt" = (
 /obj/effect/turf_decal/bot_white,
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
+/obj/item/gun/ballistic/revolver/grenadelauncher,
 /turf/open/floor/iron/dark/airless,
 /area/shuttle/caravan/freighter3)
 "gv" = (

_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm

@@ -1178,9 +1178,7 @@
 	dir = 1
 	},
 /obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/crowbar/large{
-	pixel_y = 4
-	},
+/obj/item/crowbar,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "AI" = (

_maps/RandomRuins/SpaceRuins/oldAIsat.dmm

@@ -246,13 +246,6 @@
 /obj/item/paper/crumpled,
 /turf/open/floor/iron/airless,
 /area/ruin/tcommsat_oldaisat)
-"aX" = (
-/obj/item/food/meat/slab/synthmeat{
-	name = "Cuban Pete-Meat"
-	},
-/obj/item/stack/spacecash/c200,
-/turf/open/floor/engine,
-/area/ruin/tcommsat_oldaisat)
 "aY" = (
 /obj/structure/chair{
 	dir = 4
@@ -2910,7 +2903,7 @@ ag
 ao
 aE
 aE
-aX
+aE
 ag
 ag
 ag

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -4068,18 +4068,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/ancientstation/delta/rnd)
-"kr" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mob_spawn/ghost_role/human/oldsec,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/ancientstation/charlie/dorms)
 "ks" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -4234,18 +4222,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/ancientstation/charlie/dorms)
-"kO" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mob_spawn/ghost_role/human/oldsci,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/ancientstation/charlie/dorms)
 "kP" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -4411,18 +4387,6 @@
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/ancientstation/delta/ai)
-"ln" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mob_spawn/ghost_role/human/oldeng,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/ancientstation/charlie/dorms)
 "lo" = (
 /turf/closed/mineral/silver,
 /area/ruin/unpowered)
@@ -4444,7 +4408,6 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/mob_spawn/ghost_role/human/oldsci,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/ancientstation/charlie/dorms)
 "ls" = (
@@ -9345,9 +9308,9 @@ jJ
 cq
 jS
 bN
-ln
+lr
 bN
-kO
+lr
 bN
 lr
 pm
@@ -9541,9 +9504,9 @@ jJ
 FV
 jT
 Fv
-kr
+lr
 bN
-ln
+lr
 bN
 kp
 pk

_maps/RandomRuins/SpaceRuins/onehalf.dmm

@@ -281,12 +281,10 @@
 	pixel_y = 32
 	},
 /obj/machinery/button/door/directional/north{
-	custom_acid_overlay = "onehalf_drone2int";
 	name = "Drone 2 Internal Hatch Override";
 	pixel_x = 8
 	},
 /obj/machinery/button/door/directional/north{
-	custom_acid_overlay = "onehalf_drone1int";
 	name = "Drone 1 Internal Hatch Override";
 	pixel_x = -8
 	},
@@ -315,12 +313,10 @@
 	pixel_y = 32
 	},
 /obj/machinery/button/door/directional/north{
-	custom_acid_overlay = "onehalf_drone4int";
 	name = "Drone 4 Internal Hatch Override";
 	pixel_x = 8
 	},
 /obj/machinery/button/door/directional/north{
-	custom_acid_overlay = "onehalf_drone3int";
 	name = "Drone 3 Internal Hatch Override";
 	pixel_x = -8
 	},