Merge branch 'master' into fuck-you

Signed-off-by: Erika Fox <[email protected]>

.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

@@ -1458,7 +1458,7 @@
 /turf/open/floor/plasteel/mono,
 /area/ruin/beach/complex)
 "wV" = (
-/obj/item/kitchen/knife/hunting{
+/obj/item/melee/knife/hunting{
 	name = "machete";
 	pixel_y = 8;
 	desc = "Space vines HATE this one simple trick!"

_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

@@ -204,7 +204,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
 /obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "kr" = (
@@ -529,7 +529,7 @@
 	dir = 6
 	},
 /obj/structure/table/reinforced,
-/obj/item/kitchen/knife/butcher,
+/obj/item/melee/knife/butcher,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "wg" = (
@@ -1032,7 +1032,7 @@
 "Os" = (
 /obj/structure/table/wood/reinforced,
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/obj/item/kitchen/knife{
+/obj/item/melee/knife/kitchen{
 	pixel_y = 12;
 	pixel_x = 9
 	},
@@ -1052,7 +1052,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
 /obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /obj/machinery/light/small/directional/east{
 	light_color = "#d8b1b1"
 	},
@@ -1244,7 +1244,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,

_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
 	},

_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm

@@ -1628,7 +1628,7 @@
 /obj/effect/turf_decal/weather/sand{
 	dir = 5
 	},
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /obj/item/reagent_containers/food/snacks/sausage,
 /turf/open/floor/plating/dirt{
 	light_range = 2
@@ -2304,7 +2304,7 @@
 /obj/effect/turf_decal/weather/sand{
 	dir = 8
 	},
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /turf/open/floor/plating/dirt{
 	light_range = 2
 	},

_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm

@@ -16,7 +16,7 @@
 /area/ruin/beach/piratecrash/storage)
 "af" = (
 /obj/structure/table/wood,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/corner/opaque/black/diagonal,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -37,7 +37,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/fishfry,
-/obj/item/kitchen/knife/shiv{
+/obj/item/melee/knife/shiv{
 	pixel_x = -6;
 	pixel_y = 5
 	},

_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm

@@ -887,7 +887,7 @@
 /area/ruin/unpowered/crashed_holemaker)
 "oC" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -242,9 +242,9 @@
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
 /obj/effect/turf_decal/corner/opaque/black{
 	dir = 1
 	},
@@ -332,7 +332,7 @@
 /obj/item/restraints/legcuffs/beartrap,
 /obj/item/reagent_containers/glass/bottle/venom,
 /obj/item/reagent_containers/glass/bottle/curare,
-/obj/item/kitchen/knife/combat/survival,
+/obj/item/melee/knife/survival,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/reagent_containers/food/snacks/meat/slab/human,
 /obj/item/reagent_containers/food/snacks/meat/slab/human,
@@ -384,7 +384,7 @@
 /obj/effect/decal/cleanable/blood/gibs/torso,
 /obj/structure/safe,
 /obj/item/ammo_box/a12g/slug,
-/obj/item/kitchen/knife/combat,
+/obj/item/melee/knife/combat,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,

_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm

@@ -367,23 +367,6 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"sf" = (
-/obj/structure/table/wood,
-/obj/item/nullrod{
-	block_chance = 50;
-	desc = "This massive chart appears to be the layout of a SolGov outpost. It's covered in marks, scribbles in a language you don't recognize, and several stains. It's unusually sturdy.";
-	icon_state = "blueprints";
-	item_state = "blueprints";
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
-	name = "facility blueprints";
-	pixel_y = 10;
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi';
-	w_class = 5
-	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 "si" = (
 /obj/structure/flora/rock/jungle,
 /obj/structure/flora/grass/jungle/b,
@@ -1248,13 +1231,6 @@
 	},
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/unpowered)
-"Zs" = (
-/obj/structure/table/wood,
-/obj/item/banhammer,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 
 (1,1,1) = {"
 aW
@@ -2252,7 +2228,7 @@ Hb
 aW
 WH
 jy
-Zs
+ib
 WH
 WH
 WH
@@ -2284,7 +2260,7 @@ Hb
 aW
 Br
 ib
-sf
+ib
 WH
 WH
 fB

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -1034,7 +1034,7 @@
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -8;
 	pixel_y = 5
 	},

_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm

@@ -41,7 +41,7 @@
 	dir = 5
 	},
 /obj/item/stack/cable_coil/cut/green,
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/condiment/peppermill,
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/interceptor/starhall)
 "au" = (
@@ -992,9 +992,9 @@
 /obj/structure/closet/wall/directional/east,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ruin/jungle/interceptor/starhall)
 "hO" = (
@@ -2887,7 +2887,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 5;
 	pixel_y = 5
 	},

_maps/RandomRuins/JungleRuins/jungle_paradise.dmm

@@ -798,7 +798,7 @@
 /area/ruin/jungle/paradise/construction)
 "eY" = (
 /obj/structure/table/reinforced,
-/obj/item/kitchen/knife/butcher,
+/obj/item/melee/knife/butcher,
 /obj/item/clothing/gloves/butchering,
 /turf/open/floor/pod/dark,
 /area/overmap_encounter/planetoid/cave/explored)
@@ -1465,19 +1465,19 @@
 	pixel_x = 9
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -3;
 	pixel_y = 6
 	},
 /obj/item/reagent_containers/glass/beaker{
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
@@ -5181,7 +5181,7 @@
 	pixel_x = 7;
 	pixel_y = 6
 	},
-/obj/structure/fireaxecabinet{
+/obj/structure/cabinet/fireaxe{
 	pixel_y = 28
 	},
 /turf/open/floor/mineral/titanium,

_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm

@@ -308,7 +308,7 @@
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/syndifort/jerry)
 "ik" = (
-/obj/item/kitchen/knife/combat{
+/obj/item/melee/knife/combat{
 	name = "bushcutter";
 	force = 18
 	},
@@ -627,7 +627,7 @@
 /area/ruin/jungle/syndifort/jerry)
 "ud" = (
 /obj/structure/table,
-/obj/item/kitchen/knife/combat{
+/obj/item/melee/knife/combat{
 	name = "bushcutter";
 	force = 18
 	},

_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm

@@ -1324,7 +1324,7 @@
 /obj/item/cutting_board{
 	anchored = 1
 	},
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ruin/unpowered/listening_post/canteen)
@@ -2100,11 +2100,11 @@
 	pixel_y = 29;
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 17;
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_y = 17;
 	pixel_x = 4
 	},
@@ -2549,7 +2549,7 @@
 	pixel_y = 7;
 	pixel_x = -9
 	},
-/obj/item/reagent_containers/food/condiment/bbqsauce{
+/obj/item/reagent_containers/condiment/bbqsauce{
 	pixel_y = 6;
 	pixel_x = 7
 	},