Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-25504

.github/workflows/ci_suite.yml

@@ -54,6 +54,11 @@ jobs:
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-rust
+      - name: Restore Cutter cache
+        uses: actions/cache@v3
+        with:
+          path: tools/icon_cutter/cache
+          key: ${{ runner.os }}-cutter-${{ hashFiles('dependencies.sh') }}
       - name: Install Tools
         run: |
           pip3 install setuptools
@@ -91,6 +96,9 @@ jobs:
         run: |
           tools/bootstrap/python -m mapmerge2.dmm_test
           tools/bootstrap/python -m tools.maplint.source
+      - name: Check Cutter
+        if: steps.linter-setup.conclusion == 'success' && !cancelled()
+        run: tools/bootstrap/python -m tools.icon_cutter.check
       - name: Run DMI Tests
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: tools/bootstrap/python -m dmi.test
@@ -111,7 +119,7 @@ jobs:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Compile Maps
     needs: [collect_data]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     concurrency:
       group: compile_all_maps-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
@@ -136,7 +144,7 @@ jobs:
   collect_data:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Collect data for other tasks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       maps: ${{ steps.map_finder.outputs.maps }}
       alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
@@ -202,15 +210,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-22.04
     steps:
       - run: echo Alternate tests passed.
 
   compare_screenshots:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') && (success() || failure()) )
     needs: [run_all_tests, run_alternate_tests]
     name: Compare Screenshot Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     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

.github/workflows/generate_documentation.yml

@@ -11,7 +11,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@de0c1d158edee50700583d6454aa5f5117337599
       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/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

@@ -13,7 +13,7 @@ jobs:
     permissions:
       issues: write  # for actions/stale to close stale issues
       pull-requests: write  # for actions/stale to close stale PRs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/stale@v4

.github/workflows/test_merge_bot.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   test_merge_bot:
       name: Test Merge Detector
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-22.04
       steps:
         - name: Check for GET_TEST_MERGES_URL
           id: secrets_set

.github/workflows/update_tgs_dmapi.yml

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

_maps/map_files/Mafia/mafia_spiderclan.dmm

@@ -67,8 +67,8 @@
 	name = "Station Night Shutters"
 	},
 /turf/closed/indestructible/fakeglass{
-	icon = 'icons/obj/smooth_structures/paperframes.dmi';
-	icon_state = "paper"
+	icon = 'icons/obj/smooth_structures/structure_variations.dmi';
+	icon_state = "paper-whole"
 	},
 /area/centcom/mafia)
 "q" = (

_maps/safehouses/abductor.dmm

@@ -0,0 +1,94 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/abductor,
+/area/virtual_domain/safehouse)
+"b" = (
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/plating/abductor,
+/area/virtual_domain/safehouse)
+"d" = (
+/obj/modular_map_connector,
+/turf/open/floor/plating/abductor,
+/area/virtual_domain/safehouse)
+"n" = (
+/turf/open/floor/plating/abductor,
+/area/virtual_domain/safehouse)
+"o" = (
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/turf/open/floor/plating/abductor2,
+/area/virtual_domain/safehouse)
+"t" = (
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/plating/abductor2,
+/area/virtual_domain/safehouse)
+"u" = (
+/obj/machinery/abductor/console,
+/turf/open/floor/plating/abductor,
+/area/virtual_domain/safehouse)
+"v" = (
+/obj/machinery/door/airlock/abductor,
+/turf/open/floor/plating/abductor,
+/area/virtual_domain/safehouse)
+"E" = (
+/obj/machinery/abductor/pad{
+	desc = "A funky looking disc, built into the floor."
+	},
+/turf/open/floor/plating/abductor,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+n
+a
+a
+a
+a
+d
+"}
+(2,1,1) = {"
+a
+E
+t
+t
+b
+a
+"}
+(3,1,1) = {"
+a
+n
+n
+n
+n
+a
+"}
+(4,1,1) = {"
+v
+n
+n
+n
+n
+v
+"}
+(5,1,1) = {"
+a
+n
+n
+n
+n
+a
+"}
+(6,1,1) = {"
+a
+u
+o
+o
+n
+a
+"}
+(7,1,1) = {"
+n
+a
+a
+a
+a
+n
+"}