Merge branch 'master' into bullet-stax

.github/workflows/ci_suite.yml

@@ -11,7 +11,7 @@ on:
       - master
 jobs:
   run_linters:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
     name: Run Linters
     runs-on: ubuntu-22.04
     steps:
@@ -70,6 +70,7 @@ jobs:
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
 
       - name: Annotate Lints
+        if: always()
         uses: yogstation13/DreamAnnotate@v2
         with:
           outputFile: output-annotations.txt
@@ -83,7 +84,7 @@ jobs:
           cat check_regex_output.txt
 
   compile_all_maps:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
     name: Compile Maps
     runs-on: ubuntu-latest
     steps:
@@ -105,7 +106,7 @@ jobs:
           tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT
 
   run_all_tests:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
     name: Integration Tests
     strategy:
       fail-fast: false
@@ -135,7 +136,7 @@ jobs:
 #      minor: ${{ matrix.minor }}
 
   test_windows:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
     name: Windows Build
     runs-on: windows-latest
     steps:

_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm

@@ -605,12 +605,6 @@
 	},
 /turf/open/floor/concrete/slab_4,
 /area/ruin/beach/complex)
-"kK" = (
-/obj/structure/closet/crate/bin,
-/obj/item/reagent_containers/food/snacks/breadslice/moldy,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/concrete/slab_4,
-/area/ruin/beach/complex)
 "kM" = (
 /obj/effect/turf_decal/trimline/opaque/white/filled/warning{
 	dir = 5
@@ -1406,6 +1400,12 @@
 /obj/structure/spacevine/weak,
 /turf/open/floor/plating/grass/beach/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"wq" = (
+/obj/structure/closet/crate/bin,
+/obj/item/food/breadslice/moldy,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/concrete/slab_4,
+/area/ruin/beach/complex)
 "wr" = (
 /turf/open/floor/plating/grass{
 	light_range = 2
@@ -1458,21 +1458,6 @@
 /obj/structure/spacevine/weak,
 /turf/open/floor/plasteel/mono,
 /area/ruin/beach/complex)
-"wV" = (
-/obj/item/kitchen/knife/hunting{
-	name = "machete";
-	pixel_y = 8;
-	desc = "Space vines HATE this one simple trick!"
-	},
-/obj/structure/spacevine/weak,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/concrete/slab_1,
-/area/ruin/beach/complex/wall)
 "wZ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2298,6 +2283,21 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ruin/beach/complex/shuttle)
+"JP" = (
+/obj/item/melee/knife/hunting{
+	name = "machete";
+	pixel_y = 8;
+	desc = "Space vines HATE this one simple trick!"
+	},
+/obj/structure/spacevine/weak,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/beach/complex/wall)
 "JS" = (
 /obj/machinery/light/small/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4766,7 +4766,7 @@ YA
 Jh
 Jh
 Qa
-wV
+JP
 PF
 Sv
 VA
@@ -6408,7 +6408,7 @@ Gs
 aj
 AA
 AA
-kK
+wq
 jE
 Vw
 Ks

_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm

@@ -1232,7 +1232,7 @@
 /obj/machinery/atmospherics/components/unary/passive_vent{
 	dir = 1
 	},
-/obj/item/fireaxe{
+/obj/item/melee/axe/fire{
 	name = "rusty fire axe"
 	},
 /turf/open/floor/engine/airless,

_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -160,6 +160,11 @@
 /obj/structure/flora/junglebush/b,
 /turf/open/floor/plating/grass/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"hH" = (
+/obj/structure/bed/dogbed,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/walnut,
+/area/ruin/beach)
 "hY" = (
 /obj/structure/railing/wood{
 	dir = 8
@@ -200,13 +205,6 @@
 /obj/structure/railing/corner,
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"kj" = (
-/obj/structure/closet/cabinet,
-/obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
-/turf/open/floor/wood,
-/area/ruin/beach)
 "kr" = (
 /obj/effect/turf_decal/weather/sand/corner{
 	dir = 1
@@ -281,11 +279,6 @@
 	},
 /turf/open/floor/plating/asteroid/sand,
 /area/overmap_encounter/planetoid/cave/explored)
-"mq" = (
-/obj/item/storage/box/ammo/c38,
-/obj/structure/closet/crate/wooden,
-/turf/open/floor/wood,
-/area/ruin/beach)
 "my" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 5
@@ -412,6 +405,15 @@
 	},
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"qg" = (
+/obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/table/reinforced,
+/obj/item/melee/knife/butcher,
+/turf/open/floor/plastic,
+/area/ruin/beach)
 "qh" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green{
@@ -523,15 +525,6 @@
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom,
 /turf/open/floor/plastic,
 /area/ruin/beach)
-"vM" = (
-/obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 6
-	},
-/obj/structure/table/reinforced,
-/obj/item/kitchen/knife/butcher,
-/turf/open/floor/plastic,
-/area/ruin/beach)
 "wg" = (
 /obj/effect/turf_decal/borderfloor/corner{
 	dir = 8
@@ -550,6 +543,20 @@
 	},
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"xp" = (
+/obj/structure/table/wood/reinforced,
+/obj/effect/turf_decal/corner/opaque/pink/diagonal,
+/obj/item/melee/knife/kitchen{
+	pixel_y = 12;
+	pixel_x = 9
+	},
+/obj/item/reagent_containers/food/snacks/fishfingers{
+	pixel_y = 5;
+	pixel_x = -4
+	},
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/plastic,
+/area/ruin/beach)
 "xt" = (
 /obj/structure/table/wood,
 /obj/item/storage/fancy/cigarettes/cigpack_carp{
@@ -716,6 +723,16 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"BS" = (
+/obj/structure/closet/cabinet,
+/obj/item/pneumatic_cannon/speargun,
+/obj/item/storage/backpack/magspear_quiver,
+/obj/item/melee/knife/hunting,
+/obj/machinery/light/small/directional/east{
+	light_color = "#d8b1b1"
+	},
+/turf/open/floor/wood,
+/area/ruin/beach)
 "BW" = (
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/concrete/tiles,
@@ -829,6 +846,13 @@
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/plastic,
 /area/ruin/beach)
+"GO" = (
+/obj/structure/closet/cabinet,
+/obj/item/pneumatic_cannon/speargun,
+/obj/item/storage/backpack/magspear_quiver,
+/obj/item/melee/knife/hunting,
+/turf/open/floor/wood,
+/area/ruin/beach)
 "GP" = (
 /obj/structure/chair/sofa/brown/right/directional/south,
 /obj/effect/decal/cleanable/cobweb,
@@ -1029,41 +1053,22 @@
 	},
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"Os" = (
-/obj/structure/table/wood/reinforced,
-/obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/obj/item/kitchen/knife{
-	pixel_y = 12;
-	pixel_x = 9
-	},
-/obj/item/reagent_containers/food/snacks/fishfingers{
-	pixel_y = 5;
-	pixel_x = -4
-	},
-/obj/machinery/light/dim/directional/east,
-/turf/open/floor/plastic,
-/area/ruin/beach)
 "Ow" = (
 /obj/effect/turf_decal/borderfloor/corner,
 /obj/effect/turf_decal/siding/white/corner,
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"PB" = (
-/obj/structure/closet/cabinet,
-/obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
-/obj/machinery/light/small/directional/east{
-	light_color = "#d8b1b1"
-	},
-/turf/open/floor/wood,
-/area/ruin/beach)
 "PC" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 10
 	},
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"PE" = (
+/obj/item/storage/box/ammo/c38,
+/obj/structure/closet/crate/wooden,
+/turf/open/floor/wood,
+/area/ruin/beach)
 "PM" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -1243,12 +1248,6 @@
 	},
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"Vt" = (
-/obj/item/nullrod/carp,
-/obj/structure/bed/dogbed,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/walnut,
-/area/ruin/beach)
 "VZ" = (
 /obj/structure/spacevine,
 /turf/open/water/beach/deep,
@@ -1769,7 +1768,7 @@ GP
 Ol
 hh
 ov
-Vt
+hH
 ut
 RR
 xt
@@ -2099,7 +2098,7 @@ yK
 tQ
 ut
 Uj
-Os
+xp
 HW
 LM
 ut
@@ -2189,9 +2188,9 @@ sz
 ut
 Ty
 oS
-mq
-kj
-PB
+PE
+GO
+BS
 ut
 BW
 BN
@@ -2225,7 +2224,7 @@ SX
 ny
 gm
 ut
-vM
+qg
 Gt
 eV
 ut

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -193,7 +193,7 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "eZ" = (
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /turf/open/floor/wood{
 	light_range = 2
 	},
@@ -1314,10 +1314,10 @@
 /area/ruin/beach/float_resort)
 "Ja" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/ketchup{
+/obj/item/reagent_containers/condiment/ketchup{
 	pixel_y = 18
 	},
-/obj/item/reagent_containers/food/condiment/mayonnaise{
+/obj/item/reagent_containers/condiment/mayonnaise{
 	pixel_x = -8;
 	pixel_y = 16
 	},