Merge branch 'master' into 1730

Signed-off-by: Theos <[email protected]>

.github/labeler.yml

@@ -1,49 +1,67 @@
 Admin:
-  - "code/modules/admin/**"
+  - any-glob-to-any-file:
+    - "code/modules/admin/**"
 
 # Any file within the config subfolder
 Config:
-  - "config/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "config/**"
 
 Dependencies:
-  - "**/package.json"
-  - "**/package-lock.json"
-  - "**/yarn.lock"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/package.json"
+    - "**/package-lock.json"
+    - "**/yarn.lock"
 
 # When the .DME is changed
 DME Edit:
-  - "./*.dme"
-  - "**/*.dme"
+- changed-files:
+  - any-glob-to-any-file:
+    - "./*.dme"
+    - "**/*.dme"
 
 # Any .dmi changes
 Sprites:
-  - "**/*.dmi"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dmi"
 
 # Changes to a .dm or anything in the code subfolder
 Code Change:
-  - "**/*.dm"
-  - "code/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dm"
+    - "code/**"
 
 # Changes to a .dmm or anything in the _map subfolder
 Map Change:
-  - "**/*.dmm"
-  - "_maps/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dmm"
+    - "_maps/**"
 
 # Any changes to .ogg files are marked as sound
 Sound:
-  - "**/*.ogg"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.ogg"
 
 # Changes to the SQL subfolder
 SQL:
-  - "SQL/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "SQL/**"
 
 # Changes to the tgui subfolder
 tgui:
-  - "tgui/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "tgui/**"
 
 # Changes to the .Github subfolder
 Github:
-  - ".github/**"
-
-Deprecated Modularization:
-  - "whitesands/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - ".github/**"

.github/workflows/labeler.yml

@@ -18,7 +18,7 @@ jobs:
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
       - name: Apply labels based on changed files
         if: github.event_name != 'push'
-        uses: actions/labeler@main
+        uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -5624,8 +5624,8 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "LM" = (
 /obj/structure/closet,
-/obj/item/clothing/suit/aclf,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/officer,
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
@@ -7308,8 +7308,8 @@
 "XC" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/vomit/old,
-/obj/item/clothing/under/syndicate/aclf,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/gorlex,
 /obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)