diff --git a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
index f3ef635247c61..9ef60315a701b 100644
--- a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
@@ -51,7 +51,7 @@
/area/template_noop)
"i" = (
/obj/structure/closet,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
/turf/open/floor/plating,
/area/template_noop)
"j" = (
@@ -236,11 +236,11 @@
/area/template_noop)
"L" = (
/obj/effect/decal/cleanable/blood/old,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
/turf/open/floor/plating,
/area/template_noop)
"M" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
/turf/open/floor/plating,
/area/template_noop)
"N" = (
diff --git a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
index d7e9f12af0d93..181c7f562ed19 100644
--- a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
@@ -40,11 +40,11 @@
"t" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/snacks/meat/slab/human{
+/obj/item/food/meat/slab/human{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human,
+/obj/item/food/meat/slab/human,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/template_noop)
diff --git a/_maps/RandomRooms/3x3/sk_rdm110_lipidchamber.dmm b/_maps/RandomRooms/3x3/sk_rdm110_lipidchamber.dmm
index b93185c6074fd..647b3294359d6 100644
--- a/_maps/RandomRooms/3x3/sk_rdm110_lipidchamber.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm110_lipidchamber.dmm
@@ -29,7 +29,7 @@
icon_state = "tracks";
dir = 10
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human{
+/obj/item/food/meat/slab/human{
pixel_y = 10
},
/turf/open/floor/plasteel/grimy,
diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
index 30f32129bea61..fb5601380fa33 100644
--- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
+++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -378,11 +378,6 @@
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
-"by" = (
-/obj/item/reagent_containers/food/snacks/cubancarp,
-/obj/structure/table/wood/fancy/blue,
-/turf/open/floor/carpet,
-/area/ruin/space/has_grav/powered/macspace)
"bz" = (
/obj/structure/chair/wood/wings{
dir = 8
@@ -402,11 +397,6 @@
/obj/item/food/burger/fish,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
-"bD" = (
-/obj/structure/table/wood/fancy/red,
-/obj/item/reagent_containers/food/snacks/fishfingers,
-/turf/open/floor/plasteel/cafeteria,
-/area/ruin/space/has_grav/powered/macspace)
"bE" = (
/obj/structure/table/wood/fancy/red,
/obj/item/food/burger/superbite,
@@ -528,11 +518,6 @@
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
-"cc" = (
-/obj/item/food/honkdae,
-/obj/structure/table/wood/fancy/blue,
-/turf/open/floor/carpet,
-/area/ruin/space/has_grav/powered/macspace)
"cd" = (
/obj/item/food/toastedsandwich,
/obj/structure/table/wood/fancy/blue,
@@ -587,11 +572,6 @@
/obj/item/gun/ballistic/shotgun,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
-"cn" = (
-/obj/item/reagent_containers/food/snacks/kebab/human,
-/obj/structure/table/wood/fancy/blue,
-/turf/open/floor/carpet,
-/area/ruin/space/has_grav/powered/macspace)
"co" = (
/obj/item/food/pie/grapetart,
/obj/structure/table/wood/fancy/blue,
@@ -604,12 +584,6 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
-"cq" = (
-/obj/item/reagent_containers/food/snacks/bearsteak,
-/obj/structure/table/wood/fancy/blue,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/cafeteria,
-/area/ruin/space/has_grav/powered/macspace)
"cr" = (
/obj/item/reagent_containers/food/snacks/crab_rangoon,
/obj/structure/table/wood/fancy/blue,
@@ -652,11 +626,6 @@
/obj/effect/decal/cleanable/food/egg_smudge,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
-"cz" = (
-/obj/item/reagent_containers/food/snacks/kebab/tail,
-/obj/structure/table/wood/fancy/blue,
-/turf/open/floor/carpet,
-/area/ruin/space/has_grav/powered/macspace)
"cA" = (
/obj/item/food/pie/appletart,
/obj/structure/table/wood/fancy/blue,
@@ -699,11 +668,6 @@
/obj/structure/chair/wood/wings,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
-"cH" = (
-/obj/item/reagent_containers/food/snacks/kebab/rat/double,
-/obj/structure/table/wood/fancy/blue,
-/turf/open/floor/plasteel/cafeteria,
-/area/ruin/space/has_grav/powered/macspace)
"cI" = (
/obj/item/food/salad/validsalad,
/obj/structure/table/wood/fancy/blue,
@@ -724,22 +688,11 @@
/obj/effect/decal/cleanable/food/egg_smudge,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
-"cN" = (
-/obj/item/reagent_containers/food/snacks/fishfingers,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table/wood/fancy/blue,
-/turf/open/floor/plasteel/cafeteria,
-/area/ruin/space/has_grav/powered/macspace)
"cO" = (
/obj/item/food/carneburrito,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
-"cP" = (
-/obj/item/reagent_containers/food/snacks/fishandchips,
-/obj/structure/table/wood/fancy/blue,
-/turf/open/floor/plasteel/cafeteria,
-/area/ruin/space/has_grav/powered/macspace)
"cQ" = (
/obj/item/food/pizza/donkpocket,
/obj/structure/table/wood/fancy/blue,
@@ -986,12 +939,33 @@
/obj/item/toy/figure/md,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
+"lN" = (
+/obj/item/food/kebab/rat/double,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/plasteel/cafeteria,
+/area/ruin/space/has_grav/powered/macspace)
+"lR" = (
+/obj/item/food/fishfingers,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/plasteel/cafeteria,
+/area/ruin/space/has_grav/powered/macspace)
+"lS" = (
+/obj/item/food/honkdae,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/carpet,
+/area/ruin/space/has_grav/powered/macspace)
"mo" = (
/obj/structure/chair/stool/bar,
/obj/item/toy/figure/engineer,
/obj/item/toy/plush/carpplushie,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
+"mB" = (
+/obj/item/food/kebab/human,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/carpet,
+/area/ruin/space/has_grav/powered/macspace)
"rA" = (
/obj/structure/chair/wood/wings{
dir = 4
@@ -999,6 +973,12 @@
/obj/item/toy/figure/chemist,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
+"tG" = (
+/obj/item/food/bearsteak,
+/obj/structure/table/wood/fancy/blue,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/cafeteria,
+/area/ruin/space/has_grav/powered/macspace)
"uO" = (
/obj/structure/chair/wood/wings{
dir = 8
@@ -1015,6 +995,26 @@
/obj/item/toy/figure/engineer,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
+"KW" = (
+/obj/item/food/cubancarp,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/carpet,
+/area/ruin/space/has_grav/powered/macspace)
+"Lk" = (
+/obj/item/food/fishandchips,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/plasteel/cafeteria,
+/area/ruin/space/has_grav/powered/macspace)
+"Pv" = (
+/obj/structure/table/wood/fancy/red,
+/obj/item/food/fishfingers,
+/turf/open/floor/plasteel/cafeteria,
+/area/ruin/space/has_grav/powered/macspace)
+"VJ" = (
+/obj/item/food/kebab/tail,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/carpet,
+/area/ruin/space/has_grav/powered/macspace)
"Xp" = (
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav/powered/macspace)
@@ -1174,9 +1174,9 @@ bx
ag
aP
cg
-cq
+tG
cB
-cH
+lN
cW
ae
ac
@@ -1198,7 +1198,7 @@ aH
aS
ag
bl
-by
+KW
bM
bW
ch
@@ -1366,7 +1366,7 @@ ag
ae
aZ
bq
-bD
+Pv
KA
bY
cl
@@ -1484,7 +1484,7 @@ dx
dz
dD
dH
-cN
+lR
aR
dd
dh
@@ -1540,7 +1540,7 @@ dy
dB
dB
cE
-cP
+Lk
aR
ae
dj
@@ -1676,9 +1676,9 @@ ay
bb
ag
bB
-cc
-cn
-cz
+lS
+mB
+VJ
bM
ag
aM
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index d0aee7ab345c4..a025292382ac4 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -66,7 +66,7 @@
/obj/structure/fluff/bus/passable/seat{
icon_state = "backseat"
},
-/obj/item/reagent_containers/food/snacks/meatball,
+/obj/item/food/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -90,7 +90,7 @@
/obj/structure/fluff/bus/passable/seat{
icon_state = "backseat"
},
-/obj/item/reagent_containers/food/snacks/meatball,
+/obj/item/food/meatball,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
@@ -158,9 +158,9 @@
"aA" = (
/obj/structure/fluff/bus/passable,
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/meatball,
-/obj/item/reagent_containers/food/snacks/meatball,
-/obj/item/reagent_containers/food/snacks/meatball,
+/obj/item/food/meatball,
+/obj/item/food/meatball,
+/obj/item/food/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -182,7 +182,7 @@
/area/ruin/unpowered/no_grav)
"aD" = (
/obj/structure/fluff/bus/passable,
-/obj/item/reagent_containers/food/snacks/meatball,
+/obj/item/food/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -256,7 +256,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aP" = (
-/obj/item/reagent_containers/food/snacks/meatball,
+/obj/item/food/meatball,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aQ" = (
@@ -282,7 +282,7 @@
icon_state = "backseat"
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/snacks/meatball,
+/obj/item/food/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -318,7 +318,7 @@
"aZ" = (
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/snacks/meatball,
+/obj/item/food/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index d7d7c41464b4a..6c5f974e8280f 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -59,8 +59,8 @@
/area/awaymission/BMPship/Midship)
"dx" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab,
/turf/open/floor/plasteel/white,
/area/awaymission/BMPship/Aft)
"dF" = (
@@ -862,7 +862,7 @@
/area/awaymission/BMPship/Aft)
"wk" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/food/meat,
/turf/open/floor/plasteel/showroomfloor,
/area/awaymission/BMPship/Aft)
"ww" = (
@@ -1067,8 +1067,8 @@
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/food/snacks/hugemushroomslice,
/obj/item/organ/appendix,
-/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab/human/mutant/golem/adamantine,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -1360,8 +1360,8 @@
"HE" = (
/obj/structure/closet/crate/freezer,
/obj/item/organ/appendix,
-/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab/human/mutant/golem,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -1641,8 +1641,8 @@
"NX" = (
/obj/structure/closet/crate/freezer,
/obj/item/organ/brain,
-/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab/human/mutant/slime,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -2011,7 +2011,7 @@
/obj/structure/table,
/obj/item/knife/butcher,
/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/food/meat,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
index 52b36eb659cd2..51a5e0b4d352f 100644
--- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -97,38 +97,38 @@
"m" = (
/obj/structure/closet/crate/freezer,
/obj/item/stack/sheet/animalhide/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
/turf/open/floor/plasteel/airless/dark,
/area/ruin/space/has_grav/gasthelizard)
"n" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
/obj/machinery/light{
dir = 1
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
/turf/open/floor/plasteel/airless/dark,
/area/ruin/space/has_grav/gasthelizard)
"o" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/clothing/under/rank/prisoner,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
/turf/open/floor/plasteel/airless/dark,
/area/ruin/space/has_grav/gasthelizard)
"r" = (
diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
index cc764372d1d8f..d90d2388cefd9 100644
--- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -692,7 +692,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
@@ -722,35 +722,35 @@
/obj/structure/closet/crate/freezer{
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
@@ -852,7 +852,7 @@
"NJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
},
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index 7023fd7174a38..05db110cc21d0 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -156,7 +156,7 @@
/turf/open/floor/plasteel/airless,
/area/tcommsat/oldaisat)
"aE" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
name = "Cuban Pete-Meat"
},
/turf/open/floor/engine,
@@ -270,7 +270,7 @@
/turf/open/floor/plasteel/airless,
/area/tcommsat/oldaisat)
"aX" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/meat/slab/synthmeat{
name = "Cuban Pete-Meat"
},
/obj/item/stack/spacecash,
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index b46370bfc5c51..79a2e9809ef4f 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -2307,39 +2307,39 @@
/area/ruin/space/has_grav/hotel/bar)
"hu" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi,
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/pug,
-/obj/item/reagent_containers/food/snacks/meat/slab/pug,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/corgi,
+/obj/item/food/meat/slab/corgi,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/pug,
+/obj/item/food/meat/slab/pug,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/plant,
+/obj/item/food/meat/slab/human/mutant/plant,
/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/hotel/bar)
"hv" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi,
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/pug,
-/obj/item/reagent_containers/food/snacks/meat/slab/pug,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/corgi,
+/obj/item/food/meat/slab/corgi,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/pug,
+/obj/item/food/meat/slab/pug,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/plant,
+/obj/item/food/meat/slab/human/mutant/plant,
/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/hotel/bar)
"hw" = (
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 39a4ca111159c..7fd16bd703e51 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -920,10 +920,10 @@
/area/awaymission/cabin)
"cG" = (
/obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat,
+/obj/item/food/meat/slab/synthmeat,
+/obj/item/food/meat/slab/synthmeat,
+/obj/item/food/meat/slab/synthmeat,
+/obj/item/food/meat/slab/synthmeat,
/turf/open/floor/plasteel/freezer,
/area/awaymission/cabin)
"cH" = (
@@ -1360,8 +1360,8 @@
/turf/open/floor/plating/snowed/temperatre,
/area/awaymission/cabin/snowforest/sovietsurface)
"ea" = (
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
/turf/open/floor/plating/ice/smooth,
/area/awaymission/cabin/snowforest)
"eb" = (
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index 5911997c41f0e..383c91d3ee3ec 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -857,11 +857,11 @@
/area/awaymission/beach)
"cw" = (
/obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/spider,
-/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
+/obj/item/food/meat/slab/goliath,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/spider,
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/meat/slab/bear,
/turf/open/floor/wood,
/area/awaymission/beach)
"cx" = (
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 5d6fd25b0bf10..6ba252483cf60 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -5073,10 +5073,10 @@
name = "meat fridge";
req_access_txt = "201"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
/turf/open/floor/plasteel/showroomfloor{
heat_capacity = 1e+006;
initial_temperature = 273.15
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index 8d9e8732a6a55..65f17ed474994 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -537,7 +537,7 @@
/area/awaymission/spacebattle/cruiser)
"cC" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/snacks/sausage,
+/obj/item/food/sausage,
/turf/open/floor/plasteel/cafeteria{
dir = 2
},
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 7b91ade751a74..2be79ac3de000 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -960,6 +960,7 @@
"cM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5;
+
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -1258,20 +1259,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
-"dM" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/structure/closet/secure_closet/freezer{
- locked = 0;
- name = "meat fridge";
- req_access_txt = "201"
- },
-/turf/open/floor/plasteel/showroomfloor{
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"dN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
@@ -2639,14 +2626,6 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"hS" = (
-/obj/structure/table,
-/obj/item/food/mint,
-/turf/open/floor/plasteel/cafeteria{
- dir = 5;
- heat_capacity = 1e+006
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"hT" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -2659,6 +2638,7 @@
"hU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
+
},
/obj/structure/table,
/obj/item/book/manual/chef_recipes,
@@ -2671,6 +2651,7 @@
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
+
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -7030,6 +7011,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
+
},
/obj/machinery/door/airlock/maintenance{
name = "Research Maintenance";
@@ -10252,6 +10234,20 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/engineering)
+"zO" = (
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/structure/closet/secure_closet/freezer{
+ locked = 0;
+ name = "meat fridge";
+ req_access_txt = "201"
+ },
+/turf/open/floor/plasteel/showroomfloor{
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"zR" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -12054,6 +12050,14 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
+"So" = (
+/obj/structure/table,
+/obj/item/food/mint,
+/turf/open/floor/plasteel/cafeteria{
+ dir = 5;
+ heat_capacity = 1e+006
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"Sq" = (
/obj/machinery/firealarm{
dir = 8;
@@ -48399,12 +48403,12 @@ fw
fN
ga
fZ
-dM
+zO
fO
gE
gO
hr
-hS
+So
iq
gO
gO
diff --git a/_maps/arenas/beach.dmm b/_maps/arenas/beach.dmm
index 3467ae7b89d12..2974272221bff 100644
--- a/_maps/arenas/beach.dmm
+++ b/_maps/arenas/beach.dmm
@@ -51,7 +51,7 @@
/turf/open/floor/plating/beach/sand,
/area/tdome/arena)
"k" = (
-/obj/item/reagent_containers/food/snacks/meat/crab,
+/obj/item/food/meat/crab,
/turf/open/floor/plating/beach/sand,
/area/tdome/arena)
"l" = (
diff --git a/_maps/holodeck/skatepark.dmm b/_maps/holodeck/skatepark.dmm
index 1238c9f21bec8..b8dd5519436f8 100644
--- a/_maps/holodeck/skatepark.dmm
+++ b/_maps/holodeck/skatepark.dmm
@@ -13,10 +13,6 @@
/obj/structure/table,
/turf/open/floor/holofloor/plating,
/area/template_noop)
-"H" = (
-/obj/structure/table,
-/turf/open/floor/holofloor/plating,
-/area/template_noop)
(1,1,1) = {"
a
@@ -32,8 +28,8 @@ a
"}
(2,1,1) = {"
a
-H
-H
+t
+t
a
a
a
@@ -44,24 +40,24 @@ l
"}
(3,1,1) = {"
a
-H
-H
-H
-H
+t
+t
+t
+t
a
-H
-H
+t
+t
a
l
"}
(4,1,1) = {"
a
a
-H
-H
-H
-H
-H
+t
+t
+t
+t
+t
a
a
l
@@ -69,11 +65,11 @@ l
(5,1,1) = {"
a
a
-H
+t
t
a
-H
-H
+t
+t
a
a
l
@@ -81,10 +77,10 @@ l
(6,1,1) = {"
a
a
-H
-H
-H
-H
+t
+t
+t
+t
a
a
a
@@ -92,25 +88,25 @@ l
"}
(7,1,1) = {"
a
-H
-H
-H
-H
+t
+t
+t
+t
a
-H
-H
+t
+t
a
l
"}
(8,1,1) = {"
a
-H
+t
a
a
a
a
-H
-H
+t
+t
a
a
"}
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 71521ecafb065..b502d94feba93 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -2849,12 +2849,6 @@
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/maintenance/port/fore)
-"arO" = (
-/obj/machinery/monkey_recycler,
-/obj/item/reagent_containers/food/snacks/monkeycube,
-/obj/item/reagent_containers/food/snacks/monkeycube,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
"arP" = (
/turf/closed/wall,
/area/maintenance/fore)
@@ -6153,11 +6147,6 @@
/obj/machinery/portable_atmospherics/canister/water_vapor,
/turf/open/floor/plasteel,
/area/janitor)
-"aTM" = (
-/obj/structure/table,
-/obj/item/food/mint,
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
"aTN" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
@@ -55256,6 +55245,12 @@
/obj/item/book/manual/wiki/security_space_law,
/turf/open/floor/plasteel,
/area/security/checkpoint/engineering)
+"uid" = (
+/obj/machinery/monkey_recycler,
+/obj/item/food/monkeycube,
+/obj/item/food/monkeycube,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
"uis" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60344,6 +60339,11 @@
},
/turf/open/floor/plasteel,
/area/security/main)
+"wYI" = (
+/obj/structure/table,
+/obj/item/food/mint,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"wYO" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -82117,7 +82117,7 @@ alU
amC
amC
amC
-arO
+uid
alU
nrr
iiF
@@ -101154,7 +101154,7 @@ eGg
aJI
aRy
fQm
-aTM
+wYI
aVB
aVz
aVz
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 60244610e2506..ef1b4bf237b9f 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -1781,6 +1781,15 @@
},
/turf/open/floor/plating/foam,
/area/asteroid/nearstation)
+"axM" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/food/tofu/prison,
+/turf/open/floor/plasteel/dark,
+/area/vacant_room/commissary/commissaryFood)
"axS" = (
/obj/machinery/power/apc/auto_name/south,
/obj/structure/cable/yellow,
@@ -16068,6 +16077,17 @@
},
/turf/open/floor/plasteel/techmaint,
/area/crew_quarters/heads/hop)
+"enl" = (
+/obj/structure/table,
+/obj/effect/turf_decal/bot,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/flour{
+ pixel_x = 4
+ },
+/obj/item/food/chocolatebar,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"enm" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -40975,17 +40995,6 @@
},
/turf/closed/wall/r_wall,
/area/engine/supermatter)
-"kMK" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = 4
- },
-/obj/item/food/chocolatebar,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
"kNb" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -48780,15 +48789,6 @@
/obj/structure/table/wood,
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms)
-"mJV" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/snacks/tofu/prison,
-/turf/open/floor/plasteel/dark,
-/area/vacant_room/commissary/commissaryFood)
"mJZ" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -48903,14 +48903,6 @@
/obj/machinery/light,
/turf/open/floor/plasteel/dark/side,
/area/ai_monitored/storage/eva)
-"mLj" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/item/storage/box/ingredients/wildcard,
-/obj/item/food/mint,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
"mLS" = (
/obj/machinery/light{
dir = 8
@@ -58159,6 +58151,26 @@
/obj/machinery/light,
/turf/open/floor/plasteel/sepia,
/area/science/shuttle)
+"phE" = (
+/obj/structure/table,
+/obj/item/food/mint{
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = 2
+ },
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_y = 2
+ },
+/obj/structure/noticeboard{
+ dir = 8;
+ pixel_x = 26
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/vacant_room/commissary/commissaryFood)
"phJ" = (
/obj/machinery/door/airlock/public/glass{
name = "Courtroom";
@@ -77422,26 +77434,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/r_wall,
/area/teleporter)
-"tPo" = (
-/obj/structure/table,
-/obj/item/food/mint{
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_y = 2
- },
-/obj/structure/noticeboard{
- dir = 8;
- pixel_x = 26
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners{
- dir = 1
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/vacant_room/commissary/commissaryFood)
"tPC" = (
/obj/structure/holohoop{
dir = 1
@@ -81534,6 +81526,14 @@
/obj/structure/sign/nanotrasen,
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/captain/private)
+"uNX" = (
+/obj/structure/table,
+/obj/effect/turf_decal/bot,
+/obj/item/storage/box/ingredients/wildcard,
+/obj/item/food/mint,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"uOa" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -115546,7 +115546,7 @@ ovf
ocT
cZb
qar
-mJV
+axM
sha
xDh
wxd
@@ -117085,7 +117085,7 @@ cqq
aoI
foJ
mxb
-tPo
+phE
sha
sha
sha
@@ -121464,8 +121464,8 @@ iLg
pYP
qxm
mib
-mLj
-kMK
+uNX
+enl
mib
qrj
jOJ
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 01341239eb6d4..f7ba19db580fb 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -6240,12 +6240,6 @@
"atn" = (
/turf/closed/wall/r_wall/rust,
/area/security/courtroom)
-"ato" = (
-/obj/structure/table,
-/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/snacks/fishfingers,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/bar/atrium)
"atq" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -14251,16 +14245,6 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/turf/open/floor/engine,
/area/science/xenobiology)
-"bdE" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet{
- name = "kitchen closet"
- },
-/obj/item/clothing/suit/toggle/chef,
-/obj/item/food/chococoin,
-/turf/open/floor/plating,
-/area/maintenance/starboard)
"bdJ" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/research{
@@ -44878,6 +44862,15 @@
},
/turf/open/floor/plasteel/dark,
/area/quartermaster/storage)
+"eQU" = (
+/obj/structure/table,
+/obj/item/storage/bag/tray,
+/obj/item/food/sausage,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/bar/atrium)
"eRb" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -48066,6 +48059,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel,
/area/engine/break_room)
+"gif" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet{
+ name = "kitchen closet"
+ },
+/obj/item/clothing/suit/toggle/chef,
+/obj/item/food/chococoin,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
"gin" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -58487,15 +58490,6 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
-"kyV" = (
-/obj/structure/table,
-/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/snacks/sausage,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/bar/atrium)
"kzl" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/decal/cleanable/dirt,
@@ -64090,6 +64084,12 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/surgery)
+"nat" = (
+/obj/structure/table,
+/obj/item/storage/bag/tray,
+/obj/item/food/fishfingers,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/bar/atrium)
"nav" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -65770,23 +65770,6 @@
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/open/floor/plasteel/dark,
/area/security/prison)
-"nPI" = (
-/obj/structure/table,
-/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/sugar{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/beaker,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/kitchen)
"nQw" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/effect/turf_decal/delivery,
@@ -74673,6 +74656,23 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
+"rvi" = (
+/obj/structure/table,
+/obj/item/food/mint,
+/obj/item/reagent_containers/food/condiment/enzyme{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/condiment/sugar{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/glass/beaker,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/kitchen)
"rvC" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -125593,7 +125593,7 @@ rKa
dxP
bna
bqL
-kyV
+eQU
lOa
dqg
tBK
@@ -125858,7 +125858,7 @@ eeK
ohZ
bmA
fKZ
-nPI
+rvi
xQc
ubM
icj
@@ -126882,7 +126882,7 @@ eUu
sZl
ges
wCW
-ato
+nat
mNG
bwi
ajt
@@ -130481,7 +130481,7 @@ aRI
oIt
sfd
baV
-bdE
+gif
bbf
cbk
bhG
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 2d245ce730b6f..46335b1f1e202 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -907,7 +907,7 @@
"gD" = (
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/snacks/tofu/prison,
+/obj/item/food/tofu/prison,
/obj/item/knife/kitchen,
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/kitchen/rollingpin,
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 159c322751195..62c815ab1e069 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -6550,7 +6550,7 @@
pixel_y = 32
},
/obj/machinery/vending/sustenance{
- products = list(/obj/item/reagent_containers/food/snacks/tofu/prison=24,/obj/item/reagent_containers/food/drinks/ice/prison=12,/obj/item/food/candy_corn/prison=6,/obj/item/storage/fancy/cigarettes=5,/obj/item/storage/box/matches=10)
+ products = list(/obj/item/food/tofu/prison=24,/obj/item/reagent_containers/food/drinks/ice/prison=12,/obj/item/food/candy_corn/prison=6,/obj/item/storage/fancy/cigarettes=5,/obj/item/storage/box/matches=10)
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
@@ -56032,8 +56032,8 @@
"rvD" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/snacks/meat/slab/penguin,
-/obj/item/reagent_containers/food/snacks/meat/slab/penguin,
+/obj/item/food/meat/slab/penguin,
+/obj/item/food/meat/slab/penguin,
/obj/machinery/power/apc/auto_name/north{
pixel_y = 24
},
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 49485a0bcd138..3f4c51d12c311 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -429,15 +429,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"bK" = (
-/obj/structure/table/reinforced,
-/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_y = 5
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/plasteel/dark,
-/area/tdome/tdomeobserve)
"bL" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/regular,
@@ -778,6 +769,10 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/plasteel,
/area/centcom/evac)
+"di" = (
+/obj/item/food/meat/slab/human/mutant/lizard,
+/turf/open/floor/grass,
+/area/wizard_station)
"dk" = (
/obj/structure/trap/ctf/blue,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
@@ -862,6 +857,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/centcom/evac)
+"dE" = (
+/obj/structure/table/wood,
+/obj/item/food/sashimi,
+/turf/open/floor/wood,
+/area/centcom/holding)
"dH" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
@@ -1171,6 +1171,32 @@
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/turf/open/floor/plasteel/white,
/area/centcom/holding)
+"eI" = (
+/obj/structure/closet/secure_closet/freezer/meat/open,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
+/obj/item/food/sausage,
+/obj/item/food/sausage,
+/obj/item/food/meat/rawcutlet,
+/obj/item/food/meat/rawcutlet,
+/obj/item/food/meat/rawcutlet,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/plasteel/dark,
+/area/tdome/tdomeobserve)
"eJ" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/plasteel/dark,
@@ -3398,6 +3424,10 @@
},
/turf/open/floor/plasteel/white,
/area/centcom/ferry)
+"nE" = (
+/obj/item/food/meat/slab/human/mutant/slime,
+/turf/open/floor/grass,
+/area/wizard_station)
"nF" = (
/obj/machinery/newscaster{
pixel_y = -32
@@ -3565,28 +3595,6 @@
/obj/item/storage/fancy/donut_box,
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
-"oE" = (
-/obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/food/spaghetti/raw,
-/obj/item/food/spaghetti/raw,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/plasteel/dark,
-/area/tdome/tdomeobserve)
"oF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
@@ -4203,6 +4211,10 @@
},
/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership/control)
+"rl" = (
+/obj/item/food/meat/slab/xeno,
+/turf/open/floor/grass,
+/area/wizard_station)
"rm" = (
/obj/machinery/computer/shuttle_flight/labor,
/obj/effect/turf_decal/stripes/line{
@@ -5107,6 +5119,10 @@
},
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
+"uk" = (
+/obj/item/food/meat/slab/corgi,
+/turf/open/floor/grass,
+/area/wizard_station)
"ul" = (
/obj/machinery/computer/emergency_shuttle{
dir = 1
@@ -5305,6 +5321,15 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel,
/area/centcom/evac)
+"vf" = (
+/obj/structure/closet/secure_closet/freezer/meat/open,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
+/obj/item/food/fishmeat/carp,
+/turf/open/floor/plasteel/cafeteria,
+/area/centcom/holding)
"vg" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -6209,10 +6234,6 @@
/obj/item/staff,
/turf/open/floor/engine/cult,
/area/wizard_station)
-"yH" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/turf/open/floor/grass,
-/area/wizard_station)
"yI" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/cleanable/blood/gibs/body,
@@ -6411,10 +6432,6 @@
"zq" = (
/turf/open/floor/grass,
/area/wizard_station)
-"zr" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi,
-/turf/open/floor/grass,
-/area/wizard_station)
"zt" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/plasteel,
@@ -6519,15 +6536,6 @@
},
/turf/open/floor/mineral/titanium/yellow,
/area/centcom/evac)
-"zV" = (
-/obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"zX" = (
/obj/structure/table,
/obj/machinery/light{
@@ -6655,10 +6663,6 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/grass,
/area/wizard_station)
-"AA" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
-/turf/open/floor/grass,
-/area/wizard_station)
"AB" = (
/obj/effect/decal/remains/xeno,
/turf/open/floor/grass,
@@ -6794,10 +6798,6 @@
/obj/machinery/light,
/turf/open/floor/engine/cult,
/area/wizard_station)
-"Bi" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/turf/open/floor/grass,
-/area/wizard_station)
"Bk" = (
/obj/machinery/firealarm{
dir = 1;
@@ -7604,11 +7604,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
-"Fe" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/sashimi,
-/turf/open/floor/wood,
-/area/centcom/holding)
"Fg" = (
/obj/effect/landmark/thunderdome/two,
/obj/machinery/arena_spawn/red{
@@ -8754,6 +8749,15 @@
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/turf/open/floor/plasteel/white,
/area/centcom/holding)
+"Kq" = (
+/obj/structure/table/reinforced,
+/obj/item/food/mint,
+/obj/item/reagent_containers/food/condiment/enzyme{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/plasteel/dark,
+/area/tdome/tdomeobserve)
"KA" = (
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/sparsegrass,
@@ -9586,6 +9590,28 @@
/obj/structure/table/optable,
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
+"NB" = (
+/obj/structure/closet/secure_closet/freezer/meat/open,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/goliath,
+/obj/item/food/meat/slab/goliath,
+/obj/item/food/meat/slab/goliath,
+/obj/item/food/meat/slab/goliath,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/spaghetti/raw,
+/obj/item/food/spaghetti/raw,
+/obj/item/food/meat/rawcutlet,
+/obj/item/food/meat/rawcutlet,
+/obj/item/food/meat/rawcutlet,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/plasteel/dark,
+/area/tdome/tdomeobserve)
"ND" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -10456,32 +10482,6 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/plasteel/dark,
/area/ctf)
-"Rq" = (
-/obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
-/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
-/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
-/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
-/obj/item/reagent_containers/food/snacks/sausage,
-/obj/item/reagent_containers/food/snacks/sausage,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/plasteel/dark,
-/area/tdome/tdomeobserve)
"Rr" = (
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase{
@@ -20728,7 +20728,7 @@ uE
vl
uE
Ax
-yH
+di
yK
zQ
Az
@@ -20988,7 +20988,7 @@ Ax
yI
zq
yI
-AA
+nE
yI
Ax
qZ
@@ -21243,7 +21243,7 @@ vn
uE
Ax
yJ
-zr
+uk
yK
zq
yK
@@ -21503,7 +21503,7 @@ yK
zq
yI
AB
-Bi
+rl
qE
Ax
Ax
@@ -38730,7 +38730,7 @@ YN
Nd
Vm
Fh
-zV
+vf
Nd
Nd
Fa
@@ -40789,7 +40789,7 @@ Fh
Fh
BV
Xk
-Fe
+dE
UE
Xk
Xk
@@ -53128,10 +53128,10 @@ Ev
ai
ZL
Ep
-Rq
+eI
VN
Ti
-bK
+Kq
NR
hg
gJ
@@ -54156,7 +54156,7 @@ dP
VD
Gh
Ep
-oE
+NB
Uk
Hq
Gx
diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm
index 1a83528e972fc..de4e9a34565e3 100644
--- a/_maps/shuttles/emergency/emergency_corg.dmm
+++ b/_maps/shuttles/emergency/emergency_corg.dmm
@@ -480,6 +480,19 @@
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
+"rX" = (
+/obj/structure/closet/secure_closet/freezer/kitchen,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
"sw" = (
/obj/machinery/light/small{
dir = 4
@@ -740,19 +753,6 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
-"yG" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/obj/item/reagent_containers/food/snacks/meat/rawbacon,
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
"yL" = (
/obj/machinery/computer/communications,
/obj/effect/turf_decal/stripes/line{
@@ -1022,6 +1022,20 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
+"Iy" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/condiment/enzyme{
+ pixel_y = 5
+ },
+/obj/item/food/chocolatebar,
+/obj/item/food/chocolatebar,
+/obj/item/food/chocolatebar,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
"Iz" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -1314,20 +1328,6 @@
},
/turf/open/floor/plating,
/area/shuttle/escape)
-"QZ" = (
-/obj/effect/turf_decal/box/corners,
-/obj/effect/turf_decal/box/corners{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_y = 5
- },
-/obj/item/food/chocolatebar,
-/obj/item/food/chocolatebar,
-/obj/item/food/chocolatebar,
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
"Rb" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2120,7 +2120,7 @@ nR
ia
ZZ
iX
-yG
+rX
pB
Yw
qE
@@ -2158,7 +2158,7 @@ Bt
Bt
qE
ia
-QZ
+Iy
uR
aJ
pB
diff --git a/_maps/shuttles/emergency/emergency_luxury.dmm b/_maps/shuttles/emergency/emergency_luxury.dmm
index 4de8b489a9566..1dbd58df0b21d 100644
--- a/_maps/shuttles/emergency/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency/emergency_luxury.dmm
@@ -142,26 +142,11 @@
/obj/item/food/spaghetti/pastatomato,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
-"aA" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/kebab/tofu,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aB" = (
-/obj/structure/table/wood/fancy,
-/obj/item/food/honkdae,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
"aC" = (
/obj/structure/table/wood/fancy,
/obj/item/food/enchiladas,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
-"aD" = (
-/obj/structure/table/wood/fancy,
-/obj/item/food/candiedapple,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
"aE" = (
/obj/structure/table/wood/fancy,
/obj/item/food/burger/baconburger,
@@ -243,11 +228,6 @@
/obj/item/food/spaghetti/copypasta,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
-"aU" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/bearsteak,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
"aV" = (
/obj/structure/table/wood/fancy,
/obj/item/food/spaghetti/boiledspaghetti,
@@ -341,15 +321,30 @@
},
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
+"cx" = (
+/obj/structure/table/wood/fancy,
+/obj/item/food/honkdae,
+/turf/open/floor/carpet,
+/area/shuttle/escape/luxury)
"hA" = (
/obj/structure/table/optable,
/obj/item/surgical_drapes,
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
+"js" = (
+/obj/structure/table/wood/fancy,
+/obj/item/food/candiedapple,
+/turf/open/floor/carpet,
+/area/shuttle/escape/luxury)
"nZ" = (
/obj/item/pool/pool_noodle,
/turf/open/indestructible/sound/pool,
/area/shuttle/escape/luxury)
+"rw" = (
+/obj/structure/table/wood/fancy,
+/obj/item/food/bearsteak,
+/turf/open/floor/carpet,
+/area/shuttle/escape/luxury)
"vB" = (
/obj/item/kirbyplants{
icon_state = "plant-21";
@@ -396,6 +391,11 @@
/obj/structure/table/wood/fancy,
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
+"SN" = (
+/obj/structure/table/wood/fancy,
+/obj/item/food/kebab/tofu,
+/turf/open/floor/carpet,
+/area/shuttle/escape/luxury)
"Ui" = (
/obj/item/pool/rubber_ring,
/turf/open/indestructible/sound/pool,
@@ -556,7 +556,7 @@ ag
ab
aj
au
-aA
+SN
aQ
bd
aj
@@ -572,7 +572,7 @@ ao
ab
aj
au
-aB
+cx
aR
bd
aj
@@ -604,7 +604,7 @@ af
ab
aj
au
-aD
+js
aT
bd
aj
@@ -621,7 +621,7 @@ ab
aj
au
aE
-aU
+rw
bd
aj
Jr
diff --git a/_maps/shuttles/ferry/ferry_meat.dmm b/_maps/shuttles/ferry/ferry_meat.dmm
index 1d586a7276937..7bafbf8d83bcf 100644
--- a/_maps/shuttles/ferry/ferry_meat.dmm
+++ b/_maps/shuttles/ferry/ferry_meat.dmm
@@ -30,35 +30,35 @@
/obj/structure/closet/secure_closet/freezer/meat/open{
name = "\"meat\" fridge"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi,
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
-/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
-/obj/item/reagent_containers/food/snacks/meat/slab/pug,
-/obj/item/reagent_containers/food/snacks/meat/slab/spider,
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/obj/item/reagent_containers/food/snacks/meat/slab/human{
+/obj/item/food/meat/slab/bear,
+/obj/item/food/meat/slab/corgi,
+/obj/item/food/meat/slab/goliath,
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/meat/slab/pug,
+/obj/item/food/meat/slab/spider,
+/obj/item/food/meat/slab/xeno,
+/obj/item/food/meat/slab/human{
name = "human meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly{
+/obj/item/food/meat/slab/human/mutant/fly{
name = "flyman meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine{
+/obj/item/food/meat/slab/human/mutant/golem/adamantine{
name = "golem meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard{
+/obj/item/food/meat/slab/human/mutant/lizard{
name = "lizard meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant{
+/obj/item/food/meat/slab/human/mutant/plant{
name = "podperson meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow{
+/obj/item/food/meat/slab/human/mutant/shadow{
name = "shadowling meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime{
+/obj/item/food/meat/slab/human/mutant/slime{
name = "slimeperson meat"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie{
+/obj/item/food/meat/slab/human/mutant/zombie{
name = "rotten meat"
},
/turf/open/floor/plasteel/freezer,
diff --git a/_maps/shuttles/hunter/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm
index cc9f963c1502a..9a57e48a871b1 100644
--- a/_maps/shuttles/hunter/hunter_russian.dmm
+++ b/_maps/shuttles/hunter/hunter_russian.dmm
@@ -949,11 +949,11 @@
/obj/machinery/microwave{
pixel_y = 4
},
-/obj/item/reagent_containers/food/snacks/meat/slab/bear{
+/obj/item/food/meat/slab/bear{
pixel_y = 8;
pixel_x = 4
},
-/obj/item/reagent_containers/food/snacks/meat/slab/bear{
+/obj/item/food/meat/slab/bear{
pixel_y = 1;
pixel_x = -3
},
diff --git a/_maps/shuttles/whiteship/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm
index a122457581b2a..c7dc634705c47 100644
--- a/_maps/shuttles/whiteship/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship/whiteship_box.dmm
@@ -1904,7 +1904,7 @@
pixel_y = 4
},
/obj/item/food/muffin/berry,
-/obj/item/reagent_containers/food/snacks/tofu,
+/obj/item/food/tofu,
/obj/item/food/burrito,
/obj/structure/cable/yellow{
icon_state = "0-8"
diff --git a/_maps/shuttles/whiteship/whiteship_delta.dmm b/_maps/shuttles/whiteship/whiteship_delta.dmm
index f00e8667c44bc..58d72242740d5 100644
--- a/_maps/shuttles/whiteship/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_delta.dmm
@@ -133,32 +133,6 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/bar)
-"aw" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/turf_decal/bot_white,
-/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/snacks/candy{
- pixel_x = -3;
- pixel_y = 1
- },
-/obj/item/reagent_containers/food/snacks/candy,
-/obj/item/reagent_containers/food/snacks/candy{
- pixel_x = 3;
- pixel_y = -1
- },
-/obj/item/food/cookie{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/food/cookie{
- pixel_x = -5;
- pixel_y = -5
- },
-/obj/item/food/chocolatebar,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/abandoned/bar)
"ax" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/bar)
@@ -1788,6 +1762,32 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/cargo)
+"vH" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/food/snacks/candy{
+ pixel_x = -3;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/food/snacks/candy,
+/obj/item/reagent_containers/food/snacks/candy{
+ pixel_x = 3;
+ pixel_y = -1
+ },
+/obj/item/food/cookie{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/item/food/cookie{
+ pixel_x = -5;
+ pixel_y = -5
+ },
+/obj/item/food/chocolatebar,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/abandoned/bar)
"wb" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/box/white/corners{
@@ -2102,6 +2102,27 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/cargo)
+"NM" = (
+/obj/machinery/airalarm/all_access{
+ dir = 1;
+ pixel_y = -24
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/secure_closet/freezer{
+ locked = 0;
+ name = "fridge"
+ },
+/obj/item/food/sausage,
+/obj/item/reagent_containers/food/drinks/beer{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/food/sandwich,
+/obj/structure/spider/stickyweb,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned/bar)
"Qd" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
@@ -2202,27 +2223,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/cargo)
-"Vn" = (
-/obj/machinery/airalarm/all_access{
- dir = 1;
- pixel_y = -24
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/secure_closet/freezer{
- locked = 0;
- name = "fridge"
- },
-/obj/item/reagent_containers/food/snacks/sausage,
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/food/sandwich,
-/obj/structure/spider/stickyweb,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/plasteel,
-/area/shuttle/abandoned/bar)
"WI" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/spider/stickyweb,
@@ -2704,7 +2704,7 @@ hz
pr
AK
AK
-Vn
+NM
ae
aa
aa
@@ -2757,7 +2757,7 @@ cz
"}
(25,1,1) = {"
ae
-aw
+vH
ae
bh
ae
diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm
index 2368d9220d408..fd0b1ec2d5d1f 100644
--- a/_maps/shuttles/whiteship/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_meta.dmm
@@ -999,25 +999,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/bar)
-"dj" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
- pixel_x = 3;
- pixel_y = -3
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/shuttle/abandoned/bar)
"dk" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -1742,6 +1723,25 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/cargo)
+"qi" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/item/reagent_containers/food/condiment/flour{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/food/meat/slab/synthmeat{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/food/meat/slab/synthmeat,
+/obj/item/food/meat/slab/synthmeat{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/shuttle/abandoned/bar)
"qY" = (
/obj/effect/turf_decal/box/white/corners{
dir = 4
@@ -1777,24 +1777,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/cargo)
-"rX" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box{
- pixel_x = -11;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = 6;
- pixel_y = 14
- },
-/obj/item/food/chocolatebar{
- pixel_x = 5;
- pixel_y = -3
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/plasteel,
-/area/shuttle/abandoned/bar)
"sE" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -2280,6 +2262,24 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/plasteel,
/area/shuttle/abandoned/bar)
+"GG" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table,
+/obj/item/storage/fancy/donut_box{
+ pixel_x = -11;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/drinks/beer{
+ pixel_x = 6;
+ pixel_y = 14
+ },
+/obj/item/food/chocolatebar{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned/bar)
"GJ" = (
/obj/machinery/light/small/built{
dir = 8
@@ -3104,7 +3104,7 @@ bq
bD
fb
rl
-rX
+GG
uW
Pb
bD
@@ -3184,7 +3184,7 @@ hg
cD
bQ
cU
-dj
+qi
dB
dQ
ed
diff --git a/beestation.dme b/beestation.dme
index 811462e9bc397..f03aa4a501ef3 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -1416,7 +1416,10 @@
#include "code\game\objects\items\food\dough.dm"
#include "code\game\objects\items\food\egg.dm"
#include "code\game\objects\items\food\frozen.dm"
+#include "code\game\objects\items\food\meatdish.dm"
+#include "code\game\objects\items\food\meatslab.dm"
#include "code\game\objects\items\food\mexican.dm"
+#include "code\game\objects\items\food\monkeycube.dm"
#include "code\game\objects\items\food\packaged.dm"
#include "code\game\objects\items\food\pancakes.dm"
#include "code\game\objects\items\food\pastries.dm"
@@ -2571,10 +2574,8 @@
#include "code\modules\food_and_drinks\food\condiment.dm"
#include "code\modules\food_and_drinks\food\customizables.dm"
#include "code\modules\food_and_drinks\food\snacks.dm"
-#include "code\modules\food_and_drinks\food\snacks_meat.dm"
#include "code\modules\food_and_drinks\food\snacks_other.dm"
#include "code\modules\food_and_drinks\food\snacks_vend.dm"
-#include "code\modules\food_and_drinks\food\snacks\meat.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
diff --git a/code/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm
index 2809bac4d55e9..0352bb7156893 100644
--- a/code/__HELPERS/randoms.dm
+++ b/code/__HELPERS/randoms.dm
@@ -11,12 +11,12 @@
/obj/item/food/cakeslice,
/obj/item/reagent_containers/food/snacks/store,
/obj/item/food/pie,
- /obj/item/reagent_containers/food/snacks/kebab,
+ /obj/item/food/kebab,
/obj/item/food/pizza,
/obj/item/food/pizzaslice,
/obj/item/food/salad,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat/slab,
+ /obj/item/food/meat,
+ /obj/item/food/meat/slab,
/obj/item/food/soup,
/obj/item/reagent_containers/food/snacks/grown,
/obj/item/reagent_containers/food/snacks/grown/mushroom,
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index e46d9e87f6901..955ebd9de1644 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -114,12 +114,12 @@ SUBSYSTEM_DEF(traumas)
/obj/item/spear, /obj/item/clothing/mask/gas/old)),
"lizards" = typecacheof(list(
- /obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail,
+ /obj/item/toy/plush/lizardplushie, /obj/item/food/kebab/tail,
/obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
"skeletons" = typecacheof(list(
/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
- /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton,
+ /obj/item/food/meat/slab/human/mutant/skeleton,
/obj/effect/decal/remains/human)),
"conspiracies" = typecacheof(list(
@@ -202,7 +202,7 @@ SUBSYSTEM_DEF(traumas)
"anime" = typecacheof(list(
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/katana,
- /obj/item/reagent_containers/food/snacks/sashimi,
+ /obj/item/food/sashimi,
/obj/item/food/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/throwing_star,
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 7361fabba0780..32e82743084eb 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -333,13 +333,13 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
hits = 2
heavy = 1
meteorsound = 'sound/effects/blobattack.ogg'
- meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/human, /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/)
+ meteordrop = list(/obj/item/food/meat/slab/human, /obj/item/food/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/)
var/meteorgibs = /obj/effect/gibspawner/generic
threat = 2
/obj/effect/meteor/meaty/Initialize(mapload)
for(var/path in meteordrop)
- if(path == /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant)
+ if(path == /obj/item/food/meat/slab/human/mutant)
meteordrop -= path
meteordrop += pick(subtypesof(path))
@@ -365,7 +365,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
//Meaty Ore Xeno edition
/obj/effect/meteor/meaty/xeno
color = "#5EFF00"
- meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno, /obj/item/organ/tongue/alien)
+ meteordrop = list(/obj/item/food/meat/slab/xeno, /obj/item/organ/tongue/alien)
meteorgibs = /obj/effect/gibspawner/xeno
/obj/effect/meteor/meaty/xeno/Initialize(mapload)
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index e8d8a2be55246..1b80a82c1e2fa 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -249,7 +249,7 @@
/datum/objective_item/special/corgimeat
name = "a piece of corgi meat."
- targetitem = /obj/item/reagent_containers/food/snacks/meat/slab/corgi
+ targetitem = /obj/item/food/meat/slab/corgi
difficulty = 5
/datum/objective_item/stack/New()
diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm
index f919392891559..a0891e05a326b 100644
--- a/code/game/machinery/fat_sucker.dm
+++ b/code/game/machinery/fat_sucker.dm
@@ -198,7 +198,7 @@
new C.type_of_meat (drop_location())
while(nutrients >= nutrient_to_meat / 3)
nutrients -= nutrient_to_meat / 3
- new /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain (drop_location())
+ new /obj/item/food/meat/rawcutlet/plain (drop_location())
nutrients = 0
/obj/machinery/fat_sucker/screwdriver_act(mob/living/user, obj/item/I)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index f391abebf6e9c..8d05eb58a2600 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -219,7 +219,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
return
/obj/item/clothing/suit/hooded/ian_costume/machine_wash(obj/machinery/washing_machine/WM)
- new /obj/item/reagent_containers/food/snacks/meat/slab/corgi(loc)
+ new /obj/item/food/meat/slab/corgi(loc)
qdel(src)
/obj/item/clothing/head/mob_holder/machine_wash(obj/machinery/washing_machine/WM)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index ce177b5d33b08..ec4b04a546237 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -115,9 +115,9 @@
/obj/item/food/salad/jungle,
/obj/item/food/salad/aesirsalad)
var/mains = list(
- /obj/item/reagent_containers/food/snacks/bearsteak,
+ /obj/item/food/bearsteak,
/obj/item/food/enchiladas,
- /obj/item/reagent_containers/food/snacks/stewedsoymeat,
+ /obj/item/food/stewedsoymeat,
/obj/item/food/burger/bigbite,
/obj/item/food/burger/superbite,
/obj/item/food/burger/fivealarm)
diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm
index 87cddc63be1a7..fcb00e429f887 100644
--- a/code/game/objects/items/food/bread.dm
+++ b/code/game/objects/items/food/bread.dm
@@ -257,11 +257,6 @@
)
foodtypes = GRAIN | FRUIT
-/obj/item/food/breadslice/custom
- name = "bread slice"
- icon_state = "tofubreadslice"
- foodtypes = GRAIN
-
/obj/item/food/baguette
name = "baguette"
desc = "Bon appetit!"
diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm
index 414e19676fa3d..578923d2ce017 100644
--- a/code/game/objects/items/food/burgers.dm
+++ b/code/game/objects/items/food/burgers.dm
@@ -50,7 +50,7 @@
/obj/item/food/burger/human/CheckParts(list/parts_list)
..()
- var/obj/item/reagent_containers/food/snacks/meat/M = locate(/obj/item/reagent_containers/food/snacks/meat/steak/plain/human) in contents
+ var/obj/item/food/meat/M = locate(/obj/item/food/meat/steak/plain/human) in contents
if(M)
subjectname = M.subjectname
subjectjob = M.subjectjob
diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm
new file mode 100644
index 0000000000000..a85613814cd8b
--- /dev/null
+++ b/code/game/objects/items/food/meatdish.dm
@@ -0,0 +1,453 @@
+//Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu
+
+
+////////////////////////////////////////////FISH////////////////////////////////////////////
+
+/obj/item/food/cubancarp
+ name = "\improper Cuban carp"
+ desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "cubancarp"
+ bite_consumption = 3
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2,
+ /datum/reagent/consumable/nutriment/protein = 6,
+ /datum/reagent/consumable/capsaicin = 1,
+ /datum/reagent/consumable/nutriment/vitamin = 4
+ )
+ tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
+ foodtypes = MEAT | FRIED
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/fishmeat
+ name = "fish fillet"
+ desc = "A fillet of some fish meat."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "fishfillet"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ bite_consumption = 6
+ tastes = list("fish" = 1)
+ foodtypes = MEAT
+ eatverbs = list("bite", "chew", "gnaw", "swallow", "chomp")
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/fishmeat/carp
+ name = "carp fillet"
+ desc = "A fillet of spess carp meat."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/toxin/carpotoxin = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+
+/obj/item/food/fishmeat/carp/imitation
+ name = "imitation carp fillet"
+ desc = "Almost just like the real thing, kinda."
+
+
+/obj/item/food/fishfingers
+ name = "fish fingers"
+ desc = "A finger of fish."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "fishfingers"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2,
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ bite_consumption = 1
+ tastes = list("fish" = 1, "breadcrumbs" = 1)
+ foodtypes = MEAT | FRIED
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/fishandchips
+ name = "fish and chips"
+ desc = "I do say so myself chap."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "fishandchips"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("fish" = 1, "chips" = 1)
+ foodtypes = MEAT | VEGETABLES | FRIED
+
+/*
+/obj/item/food/fishfry
+ name = "fish fry"
+ desc = "All that and no bag of chips..."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "fishfry"
+ food_reagents = list (/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
+ tastes = list("fish" = 1, "pan seared vegtables" = 1)
+ foodtypes = SEAFOOD | VEGETABLES | FRIED
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/fishtaco
+ name = "fish taco"
+ desc = "A taco with fish, cheese, and cabbage."
+ icon_state = "fishtaco"
+ food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
+ tastes = list("taco" = 4, "fish" = 2, "cheese" = 2, "cabbage" = 1)
+ foodtypes = SEAFOOD | DAIRY | GRAIN | VEGETABLES
+ w_class = WEIGHT_CLASS_SMALL
+*/
+
+////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
+
+/obj/item/food/tofu
+ name = "tofu"
+ desc = "We all love tofu."
+ icon_state = "tofu"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 2,
+ )
+ tastes = list("tofu" = 1)
+ foodtypes = VEGETABLES
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/tofu/prison
+ name = "soggy tofu"
+ desc = "You refuse to eat this strange bean curd."
+ tastes = list("sour, rotten water" = 1)
+ foodtypes = GROSS
+
+/obj/item/food/spiderleg
+ name = "spider leg"
+ desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "spiderleg"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 3,
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/toxin = 2
+ )
+ tastes = list("cobwebs" = 1)
+ foodtypes = MEAT | TOXIC
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/cornedbeef
+ name = "corned beef and cabbage"
+ desc = "Now you can feel like a real tourist vacationing in Ireland."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "cornedbeef"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2,
+ /datum/reagent/consumable/nutriment/protein = 6,
+ /datum/reagent/consumable/nutriment/vitamin = 4
+ )
+ tastes = list("meat" = 1, "cabbage" = 1)
+ foodtypes = MEAT | VEGETABLES
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/bearsteak
+ name = "Filet migrawr"
+ desc = "Because eating bear wasn't manly enough."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "bearsteak"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 9,
+ /datum/reagent/consumable/ethanol/manly_dorf = 5
+ )
+ tastes = list("meat" = 1, "salmon" = 1)
+ foodtypes = MEAT | ALCOHOL
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/meatball
+ name = "meatball"
+ desc = "A great meal all round. Not a cord of wood."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "meatball"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 2,
+ /datum/reagent/consumable/nutriment = 3,
+ )
+ tastes = list("meat" = 1)
+ foodtypes = MEAT
+ food_flags = FOOD_FINGER_FOOD
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/sausage
+ name = "sausage"
+ desc = "A piece of mixed, long meat."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "sausage"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("meat" = 1)
+ foodtypes = MEAT | BREAKFAST
+ food_flags = FOOD_FINGER_FOOD
+ eatverbs = list("bite", "chew", "nibble", "deep throat", "gobble", "chomp")
+ w_class = WEIGHT_CLASS_SMALL
+ var/roasted = FALSE
+
+/obj/item/food/sausage/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 3 SECONDS, table_required = TRUE,/* screentip_verb = "Slice"*/)
+
+/obj/item/food/salami
+ name = "salami"
+ desc = "A slice of cured salami. Surely they can have a little..."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "salami"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 1
+ )
+ tastes = list("meat" = 1, "smoke" = 1)
+ foodtypes = MEAT
+ food_flags = FOOD_FINGER_FOOD
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/rawkhinkali
+ name = "raw khinkali"
+ desc = "One hundred khinkalis? Do I look like a pig?"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "khinkali"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 1,
+ /datum/reagent/consumable/nutriment/protein = 1,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/garlic = 1
+ )
+ tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
+ foodtypes = MEAT | RAW
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/khinkali
+ name = "khinkali"
+ desc = "One hundred khinkalis? Do I look like a pig?"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "khinkali"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 1,
+ /datum/reagent/consumable/nutriment/protein = 1,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/garlic = 1
+ )
+ bite_consumption = 3
+ tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
+ foodtypes = MEAT
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/meatbun
+ name = "meat bun"
+ desc = "Has the potential to not be dog."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "meatbun"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 7,
+ /datum/reagent/consumable/nutriment/vitamin = 4,
+ )
+ tastes = list("bun" = 3, "meat" = 2)
+ foodtypes = GRAIN | MEAT | VEGETABLES
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/stewedsoymeat
+ name = "stewed soy meat"
+ desc = "Even non-vegetarians will LOVE this!"
+ icon_state = "stewedsoymeat"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 5,
+ /datum/reagent/consumable/nutriment/protein = 6,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("soy" = 1, "vegetables" = 1)
+ eatverbs = list("slurp", "sip", "inhale", "drink")
+ foodtypes = VEGETABLES
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/boiledspiderleg
+ name = "boiled spider leg"
+ desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "spiderlegcooked"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/consumable/capsaicin = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("hot peppers" = 1, "cobwebs" = 1)
+ foodtypes = MEAT
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/spidereggsham
+ name = "green eggs and ham"
+ desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "spidereggsham"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 8,
+ /datum/reagent/consumable/nutriment/vitamin = 3
+ )
+ bite_consumption = 4
+ tastes = list("meat" = 1, "the colour green" = 1)
+ foodtypes = MEAT | BREAKFAST
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/sashimi
+ name = "carp sashimi"
+ desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself. You sure hope whoever made this is skilled."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "sashimi"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 10,
+ /datum/reagent/consumable/capsaicin = 9,
+ /datum/reagent/consumable/nutriment/vitamin = 4
+ )
+ tastes = list("fish" = 1, "hot peppers" = 1)
+ foodtypes = MEAT
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/food/nugget
+ name = "chicken nugget"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2,
+ /datum/reagent/consumable/nutriment/protein = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state_preview = "nugget_lizard"
+ tastes = list("\"chicken\"" = 1)
+ foodtypes = MEAT
+ food_flags = FOOD_FINGER_FOOD
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/food/nugget/Initialize(mapload)
+ . = ..()
+ var/shape = pick("lump", "star", "lizard", "corgi")
+ desc = "A 'chicken' nugget vaguely shaped like a [shape]."
+ icon_state = "nugget_[shape]"
+
+/obj/item/food/pigblanket
+ name = "pig in a blanket"
+ desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "pigblanket"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 5,
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("meat" = 1, "butter" = 1)
+ foodtypes = MEAT | DAIRY | GRAIN
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/food/bbqribs
+ name = "bbq ribs"
+ desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "ribs"
+ w_class = WEIGHT_CLASS_NORMAL
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 3,
+ /datum/reagent/consumable/bbqsauce = 10
+ )
+ tastes = list("meat" = 3, "smokey sauce" = 1)
+ foodtypes = MEAT | SUGAR
+
+/obj/item/food/meatclown
+ name = "meat clown"
+ desc = "A delicious, round piece of meat clown. How horrifying."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "meatclown"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/banana = 2
+ )
+ tastes = list("meat" = 5, "clowns" = 3, "sixteen teslas" = 1)
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/meatclown/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/slippery, 3 SECONDS)
+
+//////////////////////////////////////////// KEBABS AND OTHER SKEWERS ////////////////////////////////////////////
+
+/obj/item/food/kebab
+ trash_type = /obj/item/stack/rods
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "kebab"
+ w_class = WEIGHT_CLASS_NORMAL
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 14
+ )
+ tastes = list("meat" = 3, "metal" = 1)
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/kebab/human
+ name = "human-kebab"
+ desc = "A human meat, on a stick."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 16,
+ /datum/reagent/consumable/nutriment/vitamin = 6
+ )
+ tastes = list("tender meat" = 3, "metal" = 1)
+ foodtypes = MEAT | GORE
+
+/obj/item/food/kebab/monkey
+ name = "meat-kebab"
+ desc = "Delicious meat, on a stick."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 16,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("meat" = 3, "metal" = 1)
+ foodtypes = MEAT
+
+/obj/item/food/kebab/tofu
+ name = "tofu-kebab"
+ desc = "Vegan meat, on a stick."
+ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 15)
+ tastes = list("tofu" = 3, "metal" = 1)
+ foodtypes = VEGETABLES
+
+/obj/item/food/kebab/tail
+ name = "lizard-tail kebab"
+ desc = "Severed lizard tail on a stick."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 30,
+ /datum/reagent/consumable/nutriment/vitamin = 4
+ )
+ tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
+ foodtypes = MEAT
+
+/obj/item/food/kebab/rat
+ name = "rat-kebab"
+ desc = "Not so delicious rat meat, on a stick."
+ icon_state = "ratkebab"
+ w_class = WEIGHT_CLASS_NORMAL
+ trash_type = null
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("rat meat" = 1, "metal" = 1)
+ foodtypes = MEAT | GORE
+
+/obj/item/food/kebab/rat/double
+ name = "double rat-kebab"
+ icon_state = "doubleratkebab"
+ tastes = list("rat meat" = 2, "metal" = 1)
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 4,
+ /datum/reagent/iron = 2
+ )
+
+/obj/item/food/kebab/fiesta
+ name = "fiesta skewer"
+ icon_state = "fiestaskewer"
+ tastes = list("tex-mex" = 3, "cumin" = 2)
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 12,
+ /datum/reagent/consumable/nutriment/vitamin = 6,
+ /datum/reagent/consumable/capsaicin = 3
+ )
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
new file mode 100644
index 0000000000000..f41c171d67c9c
--- /dev/null
+++ b/code/game/objects/items/food/meatslab.dm
@@ -0,0 +1,812 @@
+/obj/item/food/meat
+ //custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 4)
+ w_class = WEIGHT_CLASS_SMALL
+ icon = 'icons/obj/food/meat.dmi'
+ var/subjectname = ""
+ var/subjectjob = null
+
+/obj/item/food/meat/slab
+ name = "meat"
+ desc = "A slab of meat."
+ icon_state = "meat"
+ //dried_type = /obj/item/food//sosjerky/healthy
+ microwaved_type = /obj/item/food/meat/steak/plain
+ bite_consumption = 3
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 6,
+ /datum/reagent/consumable/cooking_oil = 2
+ ) //Meat has fats that a food processor can process into cooking oil
+ tastes = list("meat" = 1)
+ foodtypes = MEAT | RAW
+ ///Legacy code, handles the coloring of the overlay of the cutlets made from this.
+ var/slab_color = "#FF0000"
+
+/*
+/obj/item/food/meat/slab/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/plain)
+*/
+
+/obj/item/food/meat/slab/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain, 3, 30)
+
+///////////////////////////////////// HUMAN MEATS //////////////////////////////////////////////////////
+
+/obj/item/food/meat/slab/human
+ name = "meat"
+ microwaved_type = /obj/item/food/meat/steak/plain/human
+ tastes = list("tender meat" = 1)
+ foodtypes = MEAT | RAW | GORE
+
+/*
+/obj/item/food/meat/slab/human/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/plain/human)
+*/
+
+/obj/item/food/meat/slab/human/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain/human, 3, 30)
+
+/obj/item/food/meat/slab/human/mutant/slime
+ icon_state = "slimemeat"
+ desc = "Because jello wasn't offensive enough to vegans."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/toxin/slimejelly = 3
+ )
+ tastes = list("slime" = 1, "jelly" = 1)
+ foodtypes = MEAT | RAW | TOXIC
+
+/obj/item/food/meat/slab/human/mutant/golem
+ icon_state = "golemmeat"
+ desc = "Edible rocks, welcome to the future."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/iron = 3
+ )
+ tastes = list("rock" = 1)
+ foodtypes = MEAT | RAW | GROSS
+
+/obj/item/food/meat/slab/human/mutant/golem/adamantine
+ icon_state = "agolemmeat"
+ desc = "From the slime pen to the rune to the kitchen, science."
+ foodtypes = MEAT | RAW | GROSS
+
+/obj/item/food/meat/slab/human/mutant/lizard
+ icon_state = "lizardmeat"
+ desc = "Delicious dino damage."
+ microwaved_type = /obj/item/food/meat/steak/plain/human/lizard
+ tastes = list("meat" = 4, "scales" = 1)
+ foodtypes = MEAT | RAW | GORE
+
+/*
+/obj/item/food/meat/slab/human/mutant/lizard/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/plain/human/lizard)
+*/
+
+/obj/item/food/meat/slab/human/mutant/plant
+ icon_state = "plantmeat"
+ desc = "All the joys of healthy eating with all the fun of cannibalism."
+ tastes = list("salad" = 1, "wood" = 1)
+ foodtypes = VEGETABLES
+
+/obj/item/food/meat/slab/human/mutant/shadow
+ icon_state = "shadowmeat"
+ desc = "Ow, the edge."
+ tastes = list("darkness" = 1, "meat" = 1)
+ foodtypes = MEAT | RAW | GORE
+
+/obj/item/food/meat/slab/human/mutant/fly
+ icon_state = "flymeat"
+ desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/uranium = 3
+ )
+ tastes = list("maggots" = 1, "the inside of a reactor" = 1)
+ foodtypes = MEAT | RAW | GROSS | GORE
+
+/obj/item/food/meat/slab/human/mutant/moth
+ icon_state = "mothmeat"
+ desc = "Unpleasantly powdery and dry. Kind of pretty, though."
+ tastes = list("dust" = 1, "powder" = 1, "meat" = 2)
+ foodtypes = MEAT | RAW | GORE
+
+/obj/item/food/meat/slab/human/mutant/skeleton
+ name = "bone"
+ icon_state = "skeletonmeat"
+ desc = "There's a point where this needs to stop, and clearly we have passed it."
+ tastes = list("bone" = 1)
+ foodtypes = GROSS | GORE
+
+/obj/item/food/meat/slab/human/mutant/skeleton/make_processable()
+ return //skeletons dont have cutlets. Its a bone, Genius.
+
+/obj/item/food/meat/slab/human/mutant/zombie
+ name = " meat (rotten)"
+ icon_state = "rottenmeat"
+ desc = "Halfway to becoming fertilizer for your garden."
+ tastes = list("brains" = 1, "meat" = 1)
+ foodtypes = RAW | MEAT | TOXIC | GORE | GROSS // who the hell would eat this
+
+/obj/item/food/meat/slab/human/mutant/ethereal
+ icon_state = "etherealmeat"
+ desc = "So shiny you feel like ingesting it might make you shine too"
+ food_reagents = list(/datum/reagent/consumable/liquidelectricity = 3)
+ tastes = list("pure electricity" = 2, "meat" = 1)
+ foodtypes = RAW | MEAT | TOXIC | GORE
+
+/obj/item/food/meat/slab/human/mutant/apid
+ icon_state = "apidmeat"
+ desc = "Smells like flowers, hopefully doesn't taste like one."
+ tastes = list("honey" = 1, "flowers" = 1, "meat" = 2)
+ foodtypes = MEAT | RAW | GORE
+
+/obj/item/food/meat/slab/human/mutant/psyphoza
+ icon_state = "psyphoza_meat"
+ desc = "Psychically awaiting consumption, spooky."
+ food_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 3)
+ tastes = list("pop candy" = 1, "meat" = 1)
+ foodtypes = VEGETABLES | RAW | GORE
+ microwaved_type = /obj/item/food/meat/steak/plain/human/psyphoza
+
+////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
+
+
+/obj/item/food/meat/slab/synthmeat
+ name = "synthmeat"
+ desc = "A synthetic slab of... ethical* meat?"
+ foodtypes = RAW | MEAT // If it looks like a duck, quacks like a duck, its probably...
+
+/obj/item/food/meat/slab/meatproduct
+ name = "meat product"
+ //icon_state = "meatproduct"
+ microwaved_type = /obj/item/food/meat/steak/meatproduct
+ desc = "A slab of station reclaimed and chemically processed meat product."
+ tastes = list("meat flavoring" = 2, "modified starches" = 2, "natural & artificial dyes" = 1, "butyric acid" = 1) // its supposed to be various processed chemicals seen in very processed food. Butyric acid is a reference to how a certain North American Candymaker puts a chemical commonly seen in vomit into chocolate
+ foodtypes = RAW | MEAT
+
+/*
+/obj/item/food/meat/slab/meatproduct/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/meatproduct)
+*/
+
+/obj/item/food/meat/slab/monkey
+ name = "monkey meat"
+ foodtypes = RAW | MEAT
+
+/obj/item/food/meat/slab/mouse
+ name = "mouse meat"
+ desc = "A slab of mouse meat. Best not eat it raw."
+ foodtypes = RAW | MEAT | GORE
+
+/obj/item/food/meat/slab/corgi
+ name = "corgi meat"
+ desc = "Tastes like... well you know..."
+ tastes = list("meat" = 4, "a fondness for wearing hats" = 1)
+ foodtypes = RAW | MEAT | GORE
+
+/obj/item/food/meat/slab/pug
+ name = "pug meat"
+ desc = "Tastes like... well you know..."
+ foodtypes = RAW | MEAT | GORE
+
+/obj/item/food/meat/slab/hamster
+ name = "hamster meat"
+ desc = "Hey, they eat eachother, so its justified... right..?"
+ tastes = list("meat" = 4, "fluffly adorableness" = 1)
+ foodtypes = RAW | MEAT | GORE
+
+/obj/item/food/meat/slab/killertomato
+ name = "killer tomato meat"
+ desc = "A slice from a huge tomato."
+ icon_state = "tomatomeat"
+ microwaved_type = /obj/item/food/meat/steak/killertomato
+ food_reagents = list(/datum/reagent/consumable/nutriment = 2)
+ tastes = list("tomato" = 1)
+ foodtypes = FRUIT // Yeah, tomatoes are FRUIT. Bite me.
+
+/*
+/obj/item/food/meat/slab/killertomato/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/killertomato)
+*/
+
+/obj/item/food/meat/slab/killertomato/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/killertomato, 3, 30)
+
+/obj/item/food/meat/slab/bear
+ name = "bear meat"
+ desc = "A very manly slab of meat."
+ icon_state = "bearmeat"
+ microwaved_type = /obj/item/food/meat/steak/bear
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 16,
+ /datum/reagent/medicine/morphine = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 2,
+ /datum/reagent/consumable/cooking_oil = 6
+ )
+ tastes = list("meat" = 1, "salmon" = 1)
+ foodtypes = RAW | MEAT
+
+/*
+/obj/item/food/meat/slab/bear/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/bear)
+*/
+
+/obj/item/food/meat/slab/bear/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/bear, 3, 30)
+
+/obj/item/food/meat/slab/xeno
+ name = "xeno meat"
+ desc = "A slab of meat."
+ icon_state = "xenomeat"
+ microwaved_type = /obj/item/food/meat/steak/xeno
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 8,
+ /datum/reagent/consumable/nutriment/vitamin = 3
+ )
+ bite_consumption = 4
+ tastes = list("meat" = 1, "acid" = 1)
+ foodtypes = RAW | MEAT
+
+/*
+/obj/item/food/meat/slab/xeno/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/xeno)
+*/
+
+/obj/item/food/meat/slab/xeno/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/xeno, 3, 30)
+
+/obj/item/food/meat/slab/spider
+ name = "spider meat"
+ desc = "A slab of spider meat. That is so Kafkaesque."
+ icon_state = "spidermeat"
+ microwaved_type = /obj/item/food/meat/steak/xeno
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/toxin = 3,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("cobwebs" = 1)
+ foodtypes = RAW | MEAT | TOXIC
+
+/*
+/obj/item/food/meat/slab/spider/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/spider)
+*/
+
+/obj/item/food/meat/slab/spider/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/spider, 3, 30)
+
+/obj/item/food/meat/slab/goliath
+ name = "goliath meat"
+ desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/toxin = 5,
+ /datum/reagent/consumable/cooking_oil = 3
+ )
+ icon_state = "goliathmeat"
+ tastes = list("meat" = 1)
+ foodtypes = RAW | MEAT | TOXIC
+
+/obj/item/food/meat/slab/goliath/burn()
+ visible_message("[src] finishes cooking!")
+ new /obj/item/food/meat/steak/goliath(loc)
+ qdel(src)
+
+/obj/item/food/meat/slab/meatwheat
+ name = "meatwheat clump"
+ desc = "This doesn't look like meat, but your standards aren't that high to begin with."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 2,
+ /datum/reagent/blood = 5,
+ /datum/reagent/consumable/cooking_oil = 1
+ )
+ icon_state = "meatwheat_clump"
+ bite_consumption = 4
+ tastes = list("meat" = 1, "wheat" = 1)
+ foodtypes = GRAIN
+
+/obj/item/food/meat/slab/gorilla
+ name = "gorilla meat"
+ desc = "Much meatier than monkey meat."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 7,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/cooking_oil = 5 //Plenty of fat!
+ )
+
+/obj/item/food/meat/rawbacon
+ name = "raw piece of bacon"
+ desc = "A raw piece of bacon."
+ icon_state = "bacon"
+ microwaved_type = /obj/item/food/meat/bacon
+ bite_consumption = 2
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 2,
+ /datum/reagent/consumable/cooking_oil = 3
+ )
+ tastes = list("bacon" = 1)
+ foodtypes = RAW | MEAT | BREAKFAST
+
+/*
+/obj/item/food/meat/rawbacon/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/bacon)
+*/
+
+/obj/item/food/meat/bacon
+ name = "piece of bacon"
+ desc = "A delicious piece of bacon."
+ icon_state = "baconcooked"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/cooking_oil = 2
+ )
+ tastes = list("bacon" = 1)
+ foodtypes = MEAT | BREAKFAST
+
+/obj/item/food/meat/slab/gondola
+ name = "gondola meat"
+ desc = "According to legends of old, consuming raw gondola flesh grants one inner peace."
+ microwaved_type = /obj/item/food/meat/steak/gondola
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/tranquility = 5,
+ /datum/reagent/consumable/cooking_oil = 3
+ )
+ tastes = list("meat" = 4, "tranquility" = 1)
+ foodtypes = RAW | MEAT
+
+/*
+/obj/item/food/meat/slab/gondola/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/gondola)
+*/
+
+/obj/item/food/meat/slab/gondola/make_processable()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/gondola, 3, 30)
+
+/obj/item/food/meat/slab/penguin
+ name = "penguin meat"
+ //icon_state = "birdmeat"
+ microwaved_type = /obj/item/food/meat/steak/penguin
+ desc = "A slab of penguin meat."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/consumable/cooking_oil = 3
+ )
+ tastes = list("beef" = 1, "cod fish" = 1)
+
+/*
+/obj/item/food/meat/slab/penguin/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/penguin)
+*/
+
+/obj/item/food/meat/slab/penguin/make_processable()
+ . = ..()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/penguin, 3, 30)
+
+/obj/item/food/meat/rawcrab
+ name = "raw crab meat"
+ desc = "A pile of raw crab meat."
+ icon_state = "crabmeatraw"
+ microwaved_type = /obj/item/food/meat/crab
+ bite_consumption = 3
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 3,
+ /datum/reagent/consumable/cooking_oil = 3
+ )
+ tastes = list("raw crab" = 1)
+ foodtypes = RAW | MEAT
+
+/*
+/obj/item/food/meat/rawcrab/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/crab)
+*/
+
+/obj/item/food/meat/crab
+ name = "crab meat"
+ desc = "Some deliciously cooked crab meat."
+ icon_state = "crabmeat"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 2,
+ /datum/reagent/consumable/cooking_oil = 2
+ )
+ tastes = list("crab" = 1)
+ foodtypes = MEAT
+
+/obj/item/food/meat/slab/chicken
+ name = "chicken meat"
+ //icon_state = "birdmeat"
+ microwaved_type = /obj/item/food/meat/steak/chicken
+ desc = "A slab of raw chicken. Remember to wash your hands!"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 6
+ ) //low fat
+ tastes = list("chicken" = 1)
+/*
+/obj/item/food/meat/slab/chicken/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/chicken)
+*/
+
+/obj/item/food/meat/slab/chicken/make_processable()
+ . = ..()
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/chicken, 3, 30)
+
+/obj/item/food/meat/slab/mothroach
+ name = "mothroach meat"
+ desc = "a light slab of mothroach meat"
+ tastes = list("gross" = 1)
+ foodtypes = RAW | MEAT | GORE
+
+/obj/item/food/meat/slab/dolphinmeat
+ name = "uncooked dolphin fillet"
+ desc = "A fillet of spess dolphin meat."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "fishfillet"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ bite_consumption = 6
+ tastes = list("fish" = 1,"cruelty" = 2)
+ foodtypes = MEAT | RAW
+
+
+////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
+/obj/item/food/meat/steak
+ name = "steak"
+ desc = "A piece of hot spicy meat."
+ icon_state = "meatsteak"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 8,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ )
+ foodtypes = MEAT
+ tastes = list("meat" = 1)
+
+/obj/item/food/meat/steak/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(on_microwave_cooked))
+
+/obj/item/food/meat/steak/proc/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency = 1)
+ SIGNAL_HANDLER
+
+ name = "[source_item.name] steak"
+
+/obj/item/food/meat/steak/plain
+ foodtypes = MEAT
+
+/obj/item/food/meat/steak/plain/human
+ tastes = list("tender meat" = 1)
+ foodtypes = MEAT | GORE
+
+///Make sure the steak has the correct name
+/obj/item/food/meat/steak/plain/human/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency = 1)
+ . = ..()
+ if(!istype(source_item, /obj/item/food/meat))
+ return
+
+ var/obj/item/food/meat/origin_meat = source_item
+ subjectname = origin_meat.subjectname
+ subjectjob = origin_meat.subjectjob
+ if(subjectname)
+ name = "[origin_meat.subjectname] meatsteak"
+ else if(subjectjob)
+ name = "[origin_meat.subjectjob] meatsteak"
+
+/obj/item/food/meat/steak/killertomato
+ name = "killer tomato steak"
+ tastes = list("tomato" = 1)
+ foodtypes = FRUIT // And dont let anybody tell you otherwise!
+
+/obj/item/food/meat/steak/bear
+ name = "bear steak"
+ tastes = list("meat" = 1, "salmon" = 1)
+
+/obj/item/food/meat/steak/xeno
+ name = "xeno steak"
+ tastes = list("meat" = 1, "acid" = 1)
+
+/obj/item/food/meat/steak/spider
+ name = "spider steak"
+ tastes = list("cobwebs" = 1)
+
+/obj/item/food/meat/steak/goliath
+ name = "goliath steak"
+ desc = "A delicious, lava cooked steak."
+ resistance_flags = LAVA_PROOF | FIRE_PROOF
+ icon_state = "goliathsteak"
+ trash_type = null
+ tastes = list("meat" = 1, "rock" = 1)
+ foodtypes = MEAT
+
+/obj/item/food/meat/steak/gondola
+ name = "gondola steak"
+ tastes = list("meat" = 1, "tranquility" = 1)
+
+/obj/item/food/meat/steak/penguin
+ name = "penguin steak"
+ //icon_state = "birdsteak"
+ tastes = list("beef" = 1, "cod fish" = 1)
+
+/obj/item/food/meat/steak/chicken
+ name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites. //I concur
+ //icon_state = "birdsteak"
+ tastes = list("chicken" = 1)
+
+/obj/item/food/meat/steak/plain/human/lizard
+ name = "lizard steak"
+ //icon_state = "birdsteak"
+ tastes = list("juicy chicken" = 3, "scales" = 1)
+ foodtypes = MEAT
+
+/obj/item/food/meat/steak/plain/human/psyphoza
+ name = "psyphoza steak"
+ icon_state = "psyphoza_meat_cooked"
+ tastes = list("dirt" = 3, "wood" = 1)
+ foodtypes = VEGETABLES
+
+/obj/item/food/meat/steak/meatproduct
+ name = "thermally processed meat product"
+ //icon_state = "meatproductsteak"
+ tastes = list("enhanced char" = 2, "suspicious tenderness" = 2, "natural & artificial dyes" = 2, "emulsifying agents" = 1)
+
+/obj/item/food/meat/steak/synth
+ name = "synthsteak"
+ desc = "A synthetic meat steak. It doesn't look quite right, now does it?"
+ icon_state = "meatsteak"
+ tastes = list("meat" = 4, "cryoxandone" = 1)
+
+/obj/item/food/meat/steak/ashflake
+ name = "ashflaked steak"
+ desc = "A common delicacy among miners."
+ icon_state = "ashsteak"
+ food_reagents = list(
+ /datum/reagent/consumable/vitfro = 2
+ )
+ tastes = list("tough meat" = 2, "bubblegum" = 1)
+ foodtypes = MEAT
+
+/obj/item/food/meat/steak/dolphinmeat
+ name = "dolphin fillet"
+ desc = "A fillet of spess dolphin meat."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "fishfillet"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/consumable/nutriment/protein = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ bite_consumption = 6
+ tastes = list("fish" = 1,"cruelty" = 2)
+ foodtypes = MEAT
+
+//////////////////////////////// MEAT CUTLETS ///////////////////////////////////////////////////////
+
+//Raw cutlets
+
+/obj/item/food/meat/rawcutlet
+ name = "raw cutlet"
+ desc = "A raw meat cutlet."
+ icon_state = "rawcutlet"
+ microwaved_type = /obj/item/food/meat/cutlet/plain
+ bite_consumption = 2
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 1
+ )
+ tastes = list("meat" = 1)
+ foodtypes = MEAT | RAW
+ var/meat_type = "meat"
+
+/*
+/obj/item/food/meat/rawcutlet/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/plain)
+*/
+
+/obj/item/food/meat/rawcutlet/OnCreatedFromProcessing(mob/living/user, obj/item/work_tool, list/chosen_option, atom/original_atom)
+ . = ..()
+ if(istype(original_atom, /obj/item/food/meat/slab))
+ var/obj/item/food/meat/slab/original_slab = original_atom
+ var/mutable_appearance/filling = mutable_appearance(icon, "rawcutlet_coloration")
+ filling.color = original_slab.slab_color
+ add_overlay(filling)
+ name = "raw [original_atom.name] cutlet"
+ meat_type = original_atom.name
+
+/obj/item/food/meat/rawcutlet/plain
+ foodtypes = MEAT
+
+/obj/item/food/meat/rawcutlet/plain/human
+ microwaved_type = /obj/item/food/meat/cutlet/plain/human
+ tastes = list("tender meat" = 1)
+ foodtypes = MEAT | RAW | GORE
+
+/*
+/obj/item/food/meat/rawcutlet/plain/human/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/plain/human)
+*/
+
+/obj/item/food/meat/rawcutlet/plain/human/OnCreatedFromProcessing(mob/living/user, obj/item/I, list/chosen_option, atom/original_atom)
+ . = ..()
+ if(istype(original_atom, /obj/item/food/meat))
+ var/obj/item/food/meat/origin_meat = original_atom
+ subjectname = origin_meat.subjectname
+ subjectjob = origin_meat.subjectjob
+ if(subjectname)
+ name = "raw [origin_meat.subjectname] cutlet"
+ else if(subjectjob)
+ name = "raw [origin_meat.subjectjob] cutlet"
+
+/obj/item/food/meat/rawcutlet/killertomato
+ name = "raw killer tomato cutlet"
+ tastes = list("tomato" = 1)
+ foodtypes = FRUIT
+
+/*
+/obj/item/food/meat/rawcutlet/killertomato/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/killertomato)
+*/
+
+/obj/item/food/meat/rawcutlet/bear
+ name = "raw bear cutlet"
+ tastes = list("meat" = 1, "salmon" = 1)
+
+/*
+/obj/item/food/meat/rawcutlet/bear/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/bear)
+*/
+
+/obj/item/food/meat/rawcutlet/xeno
+ name = "raw xeno cutlet"
+ tastes = list("meat" = 1, "acid" = 1)
+
+/*
+/obj/item/food/meat/rawcutlet/xeno/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/xeno)
+*/
+
+/obj/item/food/meat/rawcutlet/spider
+ name = "raw spider cutlet"
+ tastes = list("cobwebs" = 1)
+
+/*
+/obj/item/food/meat/rawcutlet/spider/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/spider)
+*/
+
+/obj/item/food/meat/rawcutlet/gondola
+ name = "raw gondola cutlet"
+ tastes = list("meat" = 1, "tranquility" = 1)
+
+/*
+/obj/item/food/meat/rawcutlet/gondola/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/gondola)
+*/
+
+/obj/item/food/meat/rawcutlet/penguin
+ name = "raw penguin cutlet"
+ tastes = list("beef" = 1, "cod fish" = 1)
+
+/*
+/obj/item/food/meat/rawcutlet/penguin/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/penguin)
+*/
+
+/obj/item/food/meat/rawcutlet/chicken
+ name = "raw chicken cutlet"
+ tastes = list("chicken" = 1)
+
+/*
+/obj/item/food/meat/rawcutlet/chicken/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/chicken)
+*/
+
+/obj/item/food/meat/rawcutlet/grub //grub meat is small, so its in cutlets
+ name = "redgrub cutlet"
+ desc = "A tough, slimy cut of raw Redgrub. Very toxic, and probably infectious, but delicious when cooked. Do not handle without proper biohazard equipment."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "grubmeat"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 1,
+ /datum/reagent/toxin/slimejelly = 2
+ )
+ bite_consumption = 1
+ tastes = list("slime" = 1, "grub" = 1)
+ foodtypes = RAW | MEAT | TOXIC
+
+/*
+/obj/item/food/meat/rawcutlet/grub/make_microwaveable()
+ AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/grub)
+*/
+
+//Cooked cutlets
+
+//Cooked cutlets
+
+/obj/item/food/meat/cutlet
+ name = "cutlet"
+ desc = "A cooked meat cutlet."
+ icon_state = "cutlet"
+ bite_consumption = 2
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 2
+ )
+ tastes = list("meat" = 1)
+ foodtypes = MEAT
+
+/obj/item/food/meat/cutlet/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(on_microwave_cooked))
+
+///This proc handles setting up the correct meat name for the cutlet, this should definitely be changed with the food rework.
+/obj/item/food/meat/cutlet/proc/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency)
+ SIGNAL_HANDLER
+
+ if(!istype(source_item, /obj/item/food/meat/rawcutlet))
+ return
+
+ var/obj/item/food/meat/rawcutlet/original_cutlet = source_item
+ name = "[original_cutlet.meat_type] cutlet"
+
+/obj/item/food/meat/cutlet/plain
+
+/obj/item/food/meat/cutlet/plain/human
+ tastes = list("tender meat" = 1)
+ foodtypes = MEAT | GORE
+
+/obj/item/food/meat/cutlet/plain/human/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency)
+ . = ..()
+ if(!istype(source_item, /obj/item/food/meat))
+ return
+
+ var/obj/item/food/meat/origin_meat = source_item
+ if(subjectname)
+ name = "[origin_meat.subjectname] [initial(name)]"
+ else if(subjectjob)
+ name = "[origin_meat.subjectjob] [initial(name)]"
+
+/obj/item/food/meat/cutlet/killertomato
+ name = "killer tomato cutlet"
+ tastes = list("tomato" = 1)
+ foodtypes = FRUIT
+
+/obj/item/food/meat/cutlet/bear
+ name = "bear cutlet"
+ tastes = list("meat" = 1, "salmon" = 1)
+
+/obj/item/food/meat/cutlet/xeno
+ name = "xeno cutlet"
+ tastes = list("meat" = 1, "acid" = 1)
+
+/obj/item/food/meat/cutlet/spider
+ name = "spider cutlet"
+ tastes = list("cobwebs" = 1)
+
+/obj/item/food/meat/cutlet/gondola
+ name = "gondola cutlet"
+ tastes = list("meat" = 1, "tranquility" = 1)
+
+/obj/item/food/meat/cutlet/penguin
+ name = "penguin cutlet"
+ tastes = list("beef" = 1, "cod fish" = 1)
+
+/obj/item/food/meat/cutlet/chicken
+ name = "chicken cutlet"
+ tastes = list("chicken" = 1)
+
+/obj/item/food/meat/cutlet/grub
+ name = "redgrub rind"
+ desc = "Cooking redgrub meat causes it to 'pop', and renders it non-toxic, crunchy and deliciously sweet"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "grubsteak"
+ trash_type = null
+ bite_consumption = 1
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 1,
+ /datum/reagent/medicine/regen_jelly = 1
+ )
+ tastes = list("jelly" = 1, "sweet meat" = 1, "oil" = 1)
+ foodtypes = MEAT
diff --git a/code/game/objects/items/food/monkeycube.dm b/code/game/objects/items/food/monkeycube.dm
new file mode 100644
index 0000000000000..22c431cf1a0a2
--- /dev/null
+++ b/code/game/objects/items/food/monkeycube.dm
@@ -0,0 +1,42 @@
+/obj/item/food/monkeycube
+ name = "monkey cube"
+ desc = "Just add water!"
+ icon_state = "monkeycube"
+ bite_consumption = 12
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2
+ )
+ tastes = list("the jungle" = 1, "bananas" = 1)
+ foodtypes = MEAT | SUGAR
+ food_flags = FOOD_FINGER_FOOD
+ w_class = WEIGHT_CLASS_TINY
+ var/faction
+ var/spawned_mob = /mob/living/carbon/monkey
+
+/obj/item/food/monkeycube/proc/Expand()
+ if(GLOB.total_cube_monkeys >= CONFIG_GET(number/max_cube_monkeys))
+ visible_message("[src] refuses to expand!")
+ return
+ var/mob/spammer = get_mob_by_ckey(fingerprintslast)
+ var/mob/living/bananas = new spawned_mob(drop_location(), TRUE, spammer)
+ if(faction)
+ bananas.faction = faction
+ if (!QDELETED(bananas))
+ visible_message("[src] expands!")
+ bananas.log_message("Spawned via [src] at [AREACOORD(src)], Last attached mob: [key_name(spammer)].", LOG_ATTACK)
+ else if (!spammer) // Visible message in case there are no fingerprints
+ visible_message("[src] fails to expand!")
+ qdel(src)
+
+/obj/item/food/monkeycube/syndicate
+ faction = list("neutral", FACTION_SYNDICATE)
+
+/obj/item/food/monkeycube/gorilla
+ name = "gorilla cube"
+ desc = "A Waffle Co. brand gorilla cube. Now with extra molecules!"
+ bite_consumption = 20
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 15
+ )
+ tastes = list("the jungle" = 1, "bananas" = 1, "jimmies" = 1)
+ spawned_mob = /mob/living/simple_animal/hostile/gorilla
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index a1de26b2a7888..c82a1aaddd764 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -756,7 +756,7 @@
item_flags = ISWEAPON
force = 0
attack_verb = list("hit", "poked")
- var/obj/item/reagent_containers/food/snacks/sausage/held_sausage
+ var/obj/item/food/sausage/held_sausage
var/static/list/ovens
var/on = FALSE
var/datum/beam/beam
@@ -781,7 +781,7 @@
/obj/item/melee/roastingstick/attackby(atom/target, mob/user)
..()
- if (istype(target, /obj/item/reagent_containers/food/snacks/sausage))
+ if (istype(target, /obj/item/food/sausage))
if (!on)
to_chat(user, "You must extend [src] to attach anything to it!")
return
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 6622f797fa82a..d366b415ff5a4 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -421,7 +421,7 @@
STR.max_combined_w_class = 200
STR.max_items = 25
STR.insert_preposition = "in"
- STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube, /obj/item/organ, /obj/item/bodypart))
+ STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, /obj/item/bodypart))
/obj/item/storage/bag/bio/pre_attack(atom/A, mob/living/user, params)
if(istype(A, /obj/item/slimecross/reproductive))
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index b5f9e8b7c6c09..564d91b5e821b 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -582,13 +582,13 @@
desc = "Drymate brand monkey cubes. Just add water!"
icon_state = "monkeycubebox"
illustration = null
- var/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+ var/cube_type = /obj/item/food/monkeycube
/obj/item/storage/box/monkeycubes/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
- STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/monkeycube))
+ STR.can_hold = typecacheof(list(/obj/item/food/monkeycube))
/obj/item/storage/box/monkeycubes/PopulateContents()
for(var/i in 1 to 5)
@@ -596,7 +596,7 @@
/obj/item/storage/box/monkeycubes/syndicate
desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
+ cube_type = /obj/item/food/monkeycube/syndicate
/obj/item/storage/box/gorillacubes
name = "gorilla cube box"
@@ -608,11 +608,11 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 3
- STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/monkeycube))
+ STR.can_hold = typecacheof(list(/obj/item/food/monkeycube))
/obj/item/storage/box/gorillacubes/PopulateContents()
for(var/i in 1 to 3)
- new /obj/item/reagent_containers/food/snacks/monkeycube/gorilla(src)
+ new /obj/item/food/monkeycube/gorilla(src)
/obj/item/storage/box/ids
name = "box of spare IDs"
@@ -1088,7 +1088,7 @@
/obj/item/storage/box/ingredients/italian/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
- new /obj/item/reagent_containers/food/snacks/meatball(src)
+ new /obj/item/food/meatball(src)
new /obj/item/reagent_containers/food/drinks/bottle/wine(src)
/obj/item/storage/box/ingredients/vegetarian
@@ -1111,7 +1111,7 @@
new /obj/item/reagent_containers/food/snacks/grown/potato(src)
new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
new /obj/item/reagent_containers/food/snacks/grown/corn(src)
- new /obj/item/reagent_containers/food/snacks/meatball(src)
+ new /obj/item/food/meatball(src)
/obj/item/storage/box/ingredients/fruity
theme_name = "fruity"
@@ -1161,20 +1161,20 @@
theme_name = "carnivore"
/obj/item/storage/box/ingredients/carnivore/PopulateContents()
- new /obj/item/reagent_containers/food/snacks/meat/slab/bear(src)
- new /obj/item/reagent_containers/food/snacks/meat/slab/spider(src)
+ new /obj/item/food/meat/slab/bear(src)
+ new /obj/item/food/meat/slab/spider(src)
new /obj/item/reagent_containers/food/snacks/spidereggs(src)
- new /obj/item/reagent_containers/food/snacks/carpmeat(src)
- new /obj/item/reagent_containers/food/snacks/meat/slab/xeno(src)
- new /obj/item/reagent_containers/food/snacks/meat/slab/corgi(src)
- new /obj/item/reagent_containers/food/snacks/meatball(src)
+ new /obj/item/food/fishmeat/carp(src)
+ new /obj/item/food/meat/slab/xeno(src)
+ new /obj/item/food/meat/slab/corgi(src)
+ new /obj/item/food/meatball(src)
/obj/item/storage/box/ingredients/exotic
theme_name = "exotic"
/obj/item/storage/box/ingredients/exotic/PopulateContents()
for(var/i in 1 to 2)
- new /obj/item/reagent_containers/food/snacks/carpmeat(src)
+ new /obj/item/food/fishmeat/carp(src)
new /obj/item/reagent_containers/food/snacks/grown/soybeans(src)
new /obj/item/reagent_containers/food/snacks/grown/cabbage(src)
new /obj/item/reagent_containers/food/snacks/grown/chili(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index c22b69d851687..b0d10ddda9bdc 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -64,7 +64,7 @@
/obj/structure/closet/secure_closet/freezer/meat/PopulateContents()
..()
for(var/i in 1 to 4)
- new /obj/item/reagent_containers/food/snacks/meat/slab/monkey(src)
+ new /obj/item/food/meat/slab/monkey(src)
/obj/structure/closet/secure_closet/freezer/meat/open
req_access = null
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index e905396df204f..58683171015e9 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -29,7 +29,7 @@
wander = FALSE
attacktext = "glomps"
attack_sound = 'sound/effects/blobattack.ogg'
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+ butcher_results = list(/obj/item/food/meat/slab = 2)
var/morphed = FALSE
var/melee_damage_disguised = 5
diff --git a/code/modules/aquarium/aquarium_behaviour.dm b/code/modules/aquarium/aquarium_behaviour.dm
index aa1e778e17e77..7cad7c5015aea 100644
--- a/code/modules/aquarium/aquarium_behaviour.dm
+++ b/code/modules/aquarium/aquarium_behaviour.dm
@@ -170,7 +170,7 @@
var/random_case_rarity = FISH_RARITY_BASIC
/// Fish autogenerated from this behaviour will be processable into this
- var/fillet_type = /obj/item/reagent_containers/food/snacks/carpmeat/icantbelieveitsnotcarp
+ var/fillet_type = /obj/item/food/fishmeat
/// Won't breed more than this amount in single aquarium.
var/stable_population = 1
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index 1bac1c62e384b..d48f291e5bf72 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -163,7 +163,7 @@
description = "Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes."
reward = 2000
required_count = 3
- wanted_types = list(/obj/item/reagent_containers/food/snacks/monkeycube)
+ wanted_types = list(/obj/item/food/monkeycube)
/datum/bounty/item/assistant/chainsaw
name = "Chainsaw"
@@ -194,7 +194,7 @@
name = "Raw Corgi Meat"
description = "The Syndicate recently stole all of CentCom's Corgi meat. Ship out a replacement immediately."
reward = 3000
- wanted_types = list(/obj/item/reagent_containers/food/snacks/meat/slab/corgi)
+ wanted_types = list(/obj/item/food/meat/slab/corgi)
/datum/bounty/item/assistant/corgifarming
name = "Corgi Hides"
diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm
index 2bcfa1505d4b6..b47a25f0f0997 100644
--- a/code/modules/cargo/bounties/chef.dm
+++ b/code/modules/cargo/bounties/chef.dm
@@ -81,7 +81,7 @@
name = "Cuban Carp"
description = "To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom."
reward = 8000
- wanted_types = list(/obj/item/reagent_containers/food/snacks/cubancarp)
+ wanted_types = list(/obj/item/food/cubancarp)
/datum/bounty/item/chef/hotdog
name = "Hot Dog"
@@ -114,7 +114,7 @@
description = "Remove all kebab from station you are best food. Ship to CentCom to remove from the premises."
reward = 3500
required_count = 3
- wanted_types = list(/obj/item/reagent_containers/food/snacks/kebab)
+ wanted_types = list(/obj/item/food/kebab)
/datum/bounty/item/chef/soylentgreen
name = "Soylent Green"
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index a0d311fd81778..53b0899f0608f 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -3,7 +3,7 @@
description = "Admiral Pavlov has gone on hunger strike ever since the canteen started serving only monkey and monkey byproducts. She is demanding lava-cooked Goliath steaks."
reward = 5000
required_count = 3
- wanted_types = list(/obj/item/reagent_containers/food/snacks/meat/steak/goliath)
+ wanted_types = list(/obj/item/food/meat/steak/goliath)
/datum/bounty/item/mining/goliath_boat
name = "Goliath Hide Boat"
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index 92c30587378aa..5a698b7f13e7a 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -12,7 +12,7 @@
icon_living = "gondola"
SET_BASE_PIXEL(-16, -5) //2x2 sprite
layer = TABLE_LAYER//so that deliveries dont appear underneath it
- loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 2, /obj/item/reagent_containers/food/snacks/meat/slab/gondola = 2)
+ loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 2, /obj/item/food/meat/slab/gondola = 2)
//Gondolas aren't affected by cold.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 8289ee37ea841..3a043222c6074 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1763,7 +1763,7 @@
cost = 1500
max_supply = 4
access = ACCESS_VIROLOGY
- contains = list(/obj/item/reagent_containers/food/snacks/monkeycube,
+ contains = list(/obj/item/food/monkeycube,
/obj/item/reagent_containers/food/drinks/bottle/virusfood,
/obj/item/reagent_containers/glass/bottle/mutagen,
/obj/item/reagent_containers/glass/bottle/formaldehyde,
@@ -2279,16 +2279,16 @@
cost = 1700
max_supply = 5
access_budget = ACCESS_KITCHEN
- contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
- /obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
- /obj/item/reagent_containers/food/snacks/meat/slab/bear,
- /obj/item/reagent_containers/food/snacks/meat/slab/xeno,
- /obj/item/reagent_containers/food/snacks/meat/slab/spider,
- /obj/item/reagent_containers/food/snacks/meat/rawbacon,
- /obj/item/reagent_containers/food/snacks/meat/slab/penguin,
- /obj/item/reagent_containers/food/snacks/spiderleg,
- /obj/item/reagent_containers/food/snacks/carpmeat,
- /obj/item/reagent_containers/food/snacks/meat/slab/human)
+ contains = list(/obj/item/food/meat/slab/human/mutant/slime,
+ /obj/item/food/meat/slab/killertomato,
+ /obj/item/food/meat/slab/bear,
+ /obj/item/food/meat/slab/xeno,
+ /obj/item/food/meat/slab/spider,
+ /obj/item/food/meat/rawbacon,
+ /obj/item/food/meat/slab/penguin,
+ /obj/item/food/spiderleg,
+ /obj/item/food/fishmeat/carp,
+ /obj/item/food/meat/slab/human)
crate_name = "food crate"
/datum/supply_pack/organic/randomized/chef/fill(obj/structure/closet/crate/C)
@@ -2335,7 +2335,7 @@
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/food/condiment/sugar,
- /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+ /obj/item/food/meat/slab/monkey,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index e9fe8d6b7eb44..4c459f3a8dce1 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -354,7 +354,7 @@ Contains:
item_state = "space_suit_syndicate"
slowdown = 0 //Space carp magic, never stop believing
armor = list(MELEE = 20, BULLET = 10, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 100, RAD = 75, FIRE = 60, ACID = 75, STAMINA = 40)
- allowed = list(/obj/item/tank/internals, /obj/item/pneumatic_cannon/speargun, /obj/item/toy/plush/carpplushie/dehy_carp, /obj/item/toy/plush/carpplushie, /obj/item/reagent_containers/food/snacks/carpmeat) //I'm giving you a hint here
+ allowed = list(/obj/item/tank/internals, /obj/item/pneumatic_cannon/speargun, /obj/item/toy/plush/carpplushie/dehy_carp, /obj/item/toy/plush/carpplushie, /obj/item/food/fishmeat/carp) //I'm giving you a hint here
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/carp
/obj/item/clothing/head/helmet/space/hardsuit/carp/equipped(mob/living/carbon/human/user, slot)
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 543231cf0d413..a3418aa947234 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -64,8 +64,8 @@
customname = "custom"
break
if(ingredients.len == 1) //first ingredient
- if(istype(S, /obj/item/reagent_containers/food/snacks/meat))
- var/obj/item/reagent_containers/food/snacks/meat/M = S
+ if(istype(S, /obj/item/food/meat))
+ var/obj/item/food/meat/M = S
if(M.subjectname)
customname = "[M.subjectname]"
else if(M.subjectjob)
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index c652c9fec38e7..00532de4ab4de 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -30,9 +30,9 @@ All foods are distributed among various categories. Use common sense.
*/
/obj/item/reagent_containers/food/snacks
name = "snack"
- desc = "Yummy."
+ desc = "Yummy. Kill the local admin/coder who spawned this."
icon = 'icons/obj/food/food.dmi'
- icon_state = null
+ icon_state = "ERROR"
lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
obj_flags = UNIQUE_RENAME
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
deleted file mode 100644
index cee2ff9e05c9a..0000000000000
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ /dev/null
@@ -1,556 +0,0 @@
-/obj/item/reagent_containers/food/snacks/meat
- var/subjectname = ""
- var/subjectjob = null
-
-/obj/item/reagent_containers/food/snacks/meat/slab
- name = "meat"
- desc = "A slab of meat."
- icon_state = "meat"
- dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/healthy
- bitesize = 3
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2) //Meat has fats that a food processor can process into cooking oil
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain
- slices_num = 3
- filling_color = "#FF0000"
- tastes = list("meat" = 1)
- foodtype = MEAT | RAW
-
-/obj/item/reagent_containers/food/snacks/meat/slab/initialize_slice(obj/item/reagent_containers/food/snacks/meat/rawcutlet/slice, reagents_per_slice)
- ..()
- var/mutable_appearance/filling = mutable_appearance(icon, "rawcutlet_coloration")
- filling.color = filling_color
- slice.add_overlay(filling)
- slice.filling_color = filling_color
- slice.name = "raw [name] cutlet"
- slice.meat_type = name
-
-/obj/item/reagent_containers/food/snacks/meat/slab/initialize_cooked_food(obj/item/reagent_containers/food/snacks/S, cooking_efficiency)
- ..()
- S.name = "[name] steak"
-
-///////////////////////////////////// HUMAN MEATS //////////////////////////////////////////////////////
-
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human
- name = "meat"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human
- tastes = list("tender meat" = 1)
- foodtype = MEAT | RAW | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/initialize_slice(obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human/slice, reagents_per_slice)
- ..()
- slice.subjectname = subjectname
- slice.subjectjob = subjectjob
- if(subjectname)
- slice.name = "raw [subjectname] cutlet"
- else if(subjectjob)
- slice.name = "raw [subjectjob] cutlet"
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/initialize_cooked_food(obj/item/reagent_containers/food/snacks/meat/S, cooking_efficiency)
- ..()
- S.subjectname = subjectname
- S.subjectjob = subjectjob
- if(subjectname)
- S.name = "[subjectname] meatsteak"
- else if(subjectjob)
- S.name = "[subjectjob] meatsteak"
-
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
- icon_state = "slimemeat"
- desc = "Because jello wasn't offensive enough to vegans."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/slimejelly = 3)
- filling_color = "#00FFFF"
- tastes = list("slime" = 1, "jelly" = 1)
- foodtype = MEAT | RAW | TOXIC
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
- icon_state = "golemmeat"
- desc = "Edible rocks, welcome to the future."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/iron = 3)
- filling_color = "#A9A9A9"
- tastes = list("rock" = 1)
- foodtype = MEAT | RAW | GROSS
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
- icon_state = "agolemmeat"
- desc = "From the slime pen to the rune to the kitchen, science."
- filling_color = "#66CDAA"
- foodtype = MEAT | RAW | GROSS
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
- icon_state = "lizardmeat"
- desc = "Delicious dino damage."
- filling_color = "#6B8E23"
- tastes = list("meat" = 4, "scales" = 1)
- foodtype = MEAT | RAW | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
- icon_state = "plantmeat"
- desc = "All the joys of healthy eating with all the fun of cannibalism."
- filling_color = "#E9967A"
- tastes = list("salad" = 1, "wood" = 1)
- foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
- icon_state = "shadowmeat"
- desc = "Ow, the edge."
- filling_color = "#202020"
- tastes = list("darkness" = 1, "meat" = 1)
- foodtype = MEAT | RAW | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
- icon_state = "flymeat"
- desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/uranium = 3)
- tastes = list("maggots" = 1, "the inside of a reactor" = 1)
- foodtype = MEAT | RAW | GROSS | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
- icon_state = "mothmeat"
- desc = "Unpleasantly powdery and dry. Kind of pretty, though."
- filling_color = "#BF896B"
- tastes = list("dust" = 1, "powder" = 1, "meat" = 2)
- foodtype = MEAT | RAW | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
- name = "bone"
- icon_state = "skeletonmeat"
- desc = "There's a point where this needs to stop, and clearly we have passed it."
- filling_color = "#F0F0F0"
- tastes = list("bone" = 1)
- slice_path = null //can't slice a bone into cutlets
- foodtype = GROSS | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
- name = " meat (rotten)"
- icon_state = "rottenmeat"
- desc = "Halfway to becoming fertilizer for your garden."
- filling_color = "#6B8E23"
- tastes = list("brains" = 1, "meat" = 1)
- foodtype = RAW | MEAT | TOXIC | GORE | GROSS // who the hell would eat this
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ethereal
- icon_state = "etherealmeat"
- desc = "So shiny you feel like ingesting it might make you shine too"
- filling_color = "#97ee63"
- list_reagents = list(/datum/reagent/consumable/liquidelectricity = 15)
- tastes = list("pure electrictiy" = 2, "meat" = 1)
- foodtype = RAW | MEAT | TOXIC | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/apid
- icon_state = "apidmeat"
- desc = "Smells like flowers, hopefully doesn't taste like them."
- filling_color = "#BEAD07"
- tastes = list("honey" = 1, "flowers" = 1, "meat" = 2)
- foodtype = MEAT | RAW | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/psyphoza
- icon_state = "psyphoza_meat"
- desc = "Psychically awaiting consumption, spooky."
- filling_color = "#ff00ee"
- list_reagents = list(/datum/reagent/drug/mushroomhallucinogen)
- tastes = list("pop candy" = 1, "meat" = 1)
- foodtype = VEGETABLES | RAW | GROSS
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/cooked
-
-/obj/item/reagent_containers/food/snacks/meat/steak/plain/cooked
- icon_state = "psyphoza_meat_cooked"
- list_reagents = list()
-
-////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
-
-
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat
- name = "synthmeat"
- desc = "A synthetic slab of meat."
- foodtype = RAW | MEAT //hurr durr chemicals we're harmed in the production of this meat thus its non-vegan.
-
-/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct
- name = "meat product"
- desc = "A slab of station reclaimed and chemically processed meat product."
- foodtype = RAW | MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey
- name = "monkey meat"
- foodtype = RAW | MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/slab/mouse
- name = "mouse meat"
- desc = "A slab of mouse meat. Best not eat it raw."
- foodtype = RAW | MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi
- name = "corgi meat"
- desc = "Tastes like... well you know..."
- tastes = list("meat" = 4, "a fondness for wearing hats" = 1)
- foodtype = RAW | MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/pug
- name = "pug meat"
- desc = "Tastes like... well you know..."
- foodtype = RAW | MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/hamster
- name = "hamster meat"
- desc = "A slab of hamster meat."
- tastes = list("meat" = 4, "fluffly adorableness" = 1)
- foodtype = RAW | MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/slab/killertomato
- name = "killer tomato meat"
- desc = "A slice from a huge tomato."
- icon_state = "tomatomeat"
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- filling_color = "#FF0000"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
- tastes = list("tomato" = 1)
- foodtype = FRUIT
-
-/obj/item/reagent_containers/food/snacks/meat/slab/bear
- name = "bear meat"
- desc = "A very manly slab of meat."
- icon_state = "bearmeat"
- list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/medicine/morphine = 5, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cooking_oil = 6)
- filling_color = "#FFB6C1"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/bear
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/bear
- tastes = list("meat" = 1, "salmon" = 1)
- foodtype = RAW | MEAT
-
-
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno
- name = "xeno meat"
- desc = "A slab of meat."
- icon_state = "xenomeat"
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
- bitesize = 4
- filling_color = "#32CD32"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/xeno
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/xeno
- tastes = list("meat" = 1, ACID = 1)
- foodtype = RAW | MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/slab/spider
- name = "spider meat"
- desc = "A slab of spider meat."
- icon_state = "spidermeat"
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
- filling_color = "#7CFC00"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/spider
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/spider
- tastes = list("cobwebs" = 1)
- foodtype = RAW | MEAT | TOXIC
-
-
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath
- name = "goliath meat"
- desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 5, /datum/reagent/consumable/cooking_oil = 3)
- icon_state = "goliathmeat"
- tastes = list("meat" = 1)
- foodtype = RAW | MEAT | TOXIC
-
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath/burn()
- visible_message("[src] finishes cooking!")
- new /obj/item/reagent_containers/food/snacks/meat/steak/goliath(loc)
- qdel(src)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat
- name = "meatwheat clump"
- desc = "This doesn't look like meat, but your standards aren't that high to begin with."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/blood = 5, /datum/reagent/consumable/cooking_oil = 1)
- filling_color = rgb(150, 0, 0)
- icon_state = "meatwheat_clump"
- bitesize = 4
- tastes = list("meat" = 1, "wheat" = 1)
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/meat/slab/gorilla
- name = "gorilla meat"
- desc = "Much meatier than monkey meat."
- list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cooking_oil = 5) //Plenty of fat!
-
-/obj/item/reagent_containers/food/snacks/meat/rawbacon
- name = "raw piece of bacon"
- desc = "A raw piece of bacon."
- icon_state = "bacon"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/bacon
- bitesize = 2
- list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 3)
- filling_color = "#B22222"
- tastes = list("bacon" = 1)
- foodtype = RAW | MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/bacon
- name = "piece of bacon"
- desc = "A delicious piece of bacon."
- icon_state = "baconcooked"
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cooking_oil = 2)
- filling_color = "#854817"
- tastes = list("bacon" = 1)
- foodtype = MEAT | BREAKFAST
-
-/obj/item/reagent_containers/food/snacks/meat/slab/gondola
- name = "gondola meat"
- desc = "According to legends of old, consuming raw gondola flesh grants one inner peace."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/tranquility = 5, /datum/reagent/consumable/cooking_oil = 3)
- tastes = list("meat" = 4, "tranquility" = 1)
- filling_color = "#9A6750"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/gondola
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/gondola
- foodtype = RAW | MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/slab/penguin
- name = "penguin meat"
- desc = "A slab of penguin meat."
- list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cooking_oil = 3)
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/penguin
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/penguin
- filling_color = "#B22222"
- tastes = list("beef" = 1, "cod fish" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/rawcrab
- name = "raw crab meat"
- desc = "A pile of raw crab meat."
- icon_state = "crabmeatraw"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/crab
- bitesize = 3
- list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 3)
- filling_color = "#EAD079"
- tastes = list("raw crab" = 1)
- foodtype = RAW | MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/crab
- name = "crab meat"
- desc = "Some deliciously cooked crab meat."
- icon_state = "crabmeat"
- list_reagents = list("nutriment" = 2)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cooking_oil = 2)
- filling_color = "#DFB73A"
- tastes = list("crab" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/slab/chicken
- name = "chicken meat"
- desc = "A slab of raw chicken. Remember to wash your hands!"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/chicken
- slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/chicken
- tastes = list("chicken" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/mothroach
- name = "mothroach meat"
- desc = "a light slab of mothroach meat"
- tastes = list("gross" = 1)
- foodtype = RAW | MEAT | GORE
-
-////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
-
-
-/obj/item/reagent_containers/food/snacks/meat/steak
- name = "steak"
- desc = "A piece of hot spicy meat."
- icon_state = "meatsteak"
- list_reagents = list(/datum/reagent/consumable/nutriment = 5)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
- trash = /obj/item/trash/plate
- filling_color = "#B22222"
- foodtype = MEAT
- tastes = list("meat" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/steak/plain
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/steak/plain/human
- tastes = list("tender meat" = 1)
- foodtype = MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/steak/killertomato
- name = "killer tomato steak"
- tastes = list("tomato" = 1)
- foodtype = FRUIT
-
-/obj/item/reagent_containers/food/snacks/meat/steak/bear
- name = "bear steak"
- tastes = list("meat" = 1, "salmon" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/steak/xeno
- name = "xeno steak"
- tastes = list("meat" = 1, ACID = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/steak/spider
- name = "spider steak"
- tastes = list("cobwebs" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/steak/goliath
- name = "goliath steak"
- desc = "A delicious, lava cooked steak."
- resistance_flags = LAVA_PROOF | FIRE_PROOF
- icon_state = "goliathsteak"
- trash = null
- tastes = list("meat" = 1, "rock" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/steak/gondola
- name = "gondola steak"
- tastes = list("meat" = 1, "tranquility" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/steak/penguin
- name = "penguin steak"
- tastes = list("beef" = 1, "cod fish" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/steak/chicken
- name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites. //I concur
- tastes = list("chicken" = 1)
-
-//////////////////////////////// MEAT CUTLETS ///////////////////////////////////////////////////////
-
-//Raw cutlets
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet
- name = "raw cutlet"
- desc = "A raw meat cutlet."
- icon_state = "rawcutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/plain
- bitesize = 2
- list_reagents = list(/datum/reagent/consumable/nutriment = 1)
- filling_color = "#B22222"
- tastes = list("meat" = 1)
- var/meat_type = "meat"
- foodtype = MEAT | RAW
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/initialize_cooked_food(obj/item/reagent_containers/food/snacks/S, cooking_efficiency)
- ..()
- S.name = "[meat_type] cutlet"
-
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human
- tastes = list("tender meat" = 1)
- foodtype = MEAT | RAW | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human/initialize_cooked_food(obj/item/reagent_containers/food/snacks/S, cooking_efficiency)
- ..()
- if(subjectname)
- S.name = "[subjectname] [initial(S.name)]"
- else if(subjectjob)
- S.name = "[subjectjob] [initial(S.name)]"
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
- name = "raw killer tomato cutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/killertomato
- tastes = list("tomato" = 1)
- foodtype = FRUIT
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/bear
- name = "raw bear cutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/bear
- tastes = list("meat" = 1, "salmon" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/xeno
- name = "raw xeno cutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno
- tastes = list("meat" = 1, ACID = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/spider
- name = "raw spider cutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/spider
- tastes = list("cobwebs" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/gondola
- name = "raw gondola cutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/gondola
- tastes = list("meat" = 1, "tranquility" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/penguin
- name = "raw penguin cutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/penguin
- tastes = list("beef" = 1, "cod fish" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/chicken
- name = "raw chicken cutlet"
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/chicken
- tastes = list("chicken" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/grub //grub meat is small, so its in cutlets
- name = "redgrub cutlet"
- desc = "A tough, slimy cut of raw Redgrub. Very toxic, and probably infectious, but delicious when cooked. Do not handle without proper biohazard equipment."
- list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin/slimejelly = 2)
- bonus_reagents = list()
- cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/grub
- icon_state = "grubmeat"
- bitesize = 1
- tastes = list("slime" = 1, "grub" = 1)
- foodtype = RAW | MEAT | TOXIC
-
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet/grub/initialize_cooked_food(obj/item/reagent_containers/food/snacks/S) //so the toxin and taste go away
- if(reagents)
- reagents.remove_all(3)
- ..()
- S.name = "redgrub rind"
-
-//Cooked cutlets
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet
- name = "cutlet"
- desc = "A cooked meat cutlet."
- icon_state = "cutlet"
- bitesize = 2
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- filling_color = "#B22222"
- tastes = list("meat" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/plain
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human
- tastes = list("tender meat" = 1)
- foodtype = MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/killertomato
- name = "killer tomato cutlet"
- tastes = list("tomato" = 1)
- foodtype = FRUIT
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/bear
- name = "bear cutlet"
- tastes = list("meat" = 1, "salmon" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno
- name = "xeno cutlet"
- tastes = list("meat" = 1, ACID = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/spider
- name = "spider cutlet"
- tastes = list("cobwebs" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/gondola
- name = "gondola cutlet"
- tastes = list("meat" = 1, "tranquility" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/penguin
- name = "penguin cutlet"
- tastes = list("beef" = 1, "cod fish" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/chicken
- name = "chicken cutlet"
- tastes = list("chicken" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/cutlet/grub
- name = "redgrub rind"
- desc = "Cooking redgrub meat causes it to 'pop', and renders it non-toxic, crunchy and deliciously sweet"
- icon_state = "grubsteak"
- trash = null
- bitesize = 1
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/regen_jelly = 1)
- list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/regen_jelly = 1)
- tastes = list("jelly" = 1, "sweet meat" = 1, "oil" = 1)
- foodtype = MEAT
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
deleted file mode 100644
index fe08ba75015cd..0000000000000
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ /dev/null
@@ -1,403 +0,0 @@
-//Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu
-
-
-////////////////////////////////////////////FISH////////////////////////////////////////////
-
-/obj/item/reagent_containers/food/snacks/cubancarp
- name = "\improper Cuban carp"
- desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
- icon_state = "cubancarp"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
- bitesize = 3
- filling_color = "#CD853F"
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 1)
- tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/carpmeat
- name = "carp fillet"
- desc = "A fillet of spess carp meat."
- icon_state = "fishfillet"
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/carpotoxin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
- bitesize = 6
- filling_color = "#FA8072"
- tastes = list("fish" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/carpmeat/Initialize(mapload)
- . = ..()
- eatverb = pick("bite","chew","gnaw","swallow","chomp")
-
-/obj/item/reagent_containers/food/snacks/carpmeat/imitation
- name = "imitation carp fillet"
- desc = "Almost just like the real thing, kinda."
-
-/obj/item/reagent_containers/food/snacks/carpmeat/icantbelieveitsnotcarp
- name = "fish fillet"
- desc = "A fillet of unspecified fish meat."
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) //No carpotoxin
-
-
-/obj/item/reagent_containers/food/snacks/fishfingers
- name = "fish fingers"
- desc = "A finger of fish."
- icon_state = "fishfingers"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 4)
- bitesize = 1
- filling_color = "#CD853F"
- tastes = list("fish" = 1, "breadcrumbs" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/fishandchips
- name = "fish and chips"
- desc = "I do say so myself chap."
- icon_state = "fishandchips"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 6)
- filling_color = "#FA8072"
- tastes = list("fish" = 1, "chips" = 1)
- foodtype = MEAT | VEGETABLES | FRIED
-
-////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
-
-/obj/item/reagent_containers/food/snacks/tofu
- name = "tofu"
- desc = "We all love tofu."
- icon_state = "tofu"
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- filling_color = "#F0E68C"
- tastes = list("tofu" = 1)
- foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/tofu/prison
- name = "soggy tofu"
- desc = "You refuse to eat this strange bean curd."
- tastes = list("sour, rotten water" = 1)
- foodtype = GROSS
-
-/obj/item/reagent_containers/food/snacks/spiderleg
- name = "spider leg"
- desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
- icon_state = "spiderleg"
- list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
- cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg
- filling_color = "#000000"
- tastes = list("cobwebs" = 1)
- foodtype = MEAT | TOXIC
-
-/obj/item/reagent_containers/food/snacks/cornedbeef
- name = "corned beef and cabbage"
- desc = "Now you can feel like a real tourist vacationing in Ireland."
- icon_state = "cornedbeef"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
- list_reagents = list(/datum/reagent/consumable/nutriment = 5)
- tastes = list("meat" = 1, "cabbage" = 1)
- foodtype = MEAT | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/bearsteak
- name = "Filet migrawr"
- desc = "Because eating bear wasn't manly enough."
- icon_state = "bearsteak"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
- list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/ethanol/manly_dorf = 5)
- tastes = list("meat" = 1, "salmon" = 1)
- foodtype = MEAT | ALCOHOL
-
-/obj/item/reagent_containers/food/snacks/meatball
- name = "meatball"
- desc = "A great meal all round. Not a cord of wood."
- icon_state = "meatball"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
- filling_color = "#800000"
- tastes = list("meat" = 1)
- foodtype = MEAT
- /*food_flags = FOOD_FINGER_FOOD*/
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/reagent_containers/food/snacks/sausage
- name = "sausage"
- desc = "A piece of mixed, long meat."
- icon_state = "sausage"
- filling_color = "#CD5C5C"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("meat" = 1)
- slices_num = 6
- slice_path = /obj/item/reagent_containers/food/snacks/salami
- foodtype = MEAT | BREAKFAST
- /*food_flags = FOOD_FINGER_FOOD*/
- var/roasted = FALSE
-
-/obj/item/reagent_containers/food/snacks/sausage/Initialize(mapload)
- . = ..()
- eatverb = pick("bite","chew","nibble","gobble","chomp")
-
-/obj/item/reagent_containers/food/snacks/salami
- name = "salami"
- desc = "A slice of cured salami. Surely they can have a little..."
- icon_state = "salami"
- list_reagents = list(/datum/reagent/consumable/nutriment = 1)
- tastes = list("meat" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/rawkhinkali
- name = "raw khinkali"
- desc = "One hundred khinkalis? Do I look like a pig?"
- icon_state = "khinkali"
- list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/garlic = 1)
- cooked_type = /obj/item/reagent_containers/food/snacks/khinkali
- tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/khinkali
- name = "khinkali"
- desc = "One hundred khinkalis? Do I look like a pig?"
- icon_state = "khinkali"
- list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/garlic = 1)
- bitesize = 3
- filling_color = "#F0F0F0"
- tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meatbun
- name = "meat bun"
- desc = "Has the potential to not be Dog."
- icon_state = "meatbun"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
- filling_color = "#8B0000"
- tastes = list("bun" = 3, "meat" = 2)
- foodtype = GRAIN | MEAT | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/monkeycube
- name = "monkey cube"
- desc = "Just add water!"
- icon_state = "monkeycube"
- bitesize = 12
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- filling_color = "#CD853F"
- tastes = list("the jungle" = 1, "bananas" = 1)
- foodtype = MEAT | SUGAR
- /*food_flags = FOOD_FINGER_FOOD*/
- w_class = WEIGHT_CLASS_TINY
- var/faction
- var/spawned_mob = /mob/living/carbon/monkey
-
-/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
- if(GLOB.total_cube_monkeys >= CONFIG_GET(number/max_cube_monkeys))
- visible_message("[src] refuses to expand!")
- return
- var/mob/spammer = get_mob_by_ckey(fingerprintslast)
- var/mob/living/bananas = new spawned_mob(drop_location(), TRUE, spammer)
- if(faction)
- bananas.faction = faction
- if (!QDELETED(bananas))
- visible_message("[src] expands!")
- bananas.log_message("Spawned via [src] at [AREACOORD(src)], Last attached mob: [key_name(spammer)].", LOG_ATTACK)
- else if (!spammer) // Visible message in case there are no fingerprints
- visible_message("[src] fails to expand!")
- qdel(src)
-
-/obj/item/reagent_containers/food/snacks/monkeycube/syndicate
- faction = list("neutral", FACTION_SYNDICATE)
-
-/obj/item/reagent_containers/food/snacks/monkeycube/gorilla
- name = "gorilla cube"
- desc = "A Waffle Co. brand gorilla cube. Now with extra molecules!"
- bitesize = 20
- list_reagents = list(/datum/reagent/consumable/nutriment = 15)
- tastes = list("the jungle" = 1, "bananas" = 1, "jimmies" = 1)
- spawned_mob = /mob/living/simple_animal/hostile/gorilla
-
-/obj/item/reagent_containers/food/snacks/stewedsoymeat
- name = "stewed soy meat"
- desc = "Even non-vegetarians will LOVE this!"
- icon_state = "stewedsoymeat"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
- list_reagents = list(/datum/reagent/consumable/nutriment = 8)
- filling_color = "#D2691E"
- tastes = list("soy" = 1, "vegetables" = 1)
- foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize(mapload)
- . = ..()
- eatverb = pick("slurp","sip","inhale","drink")
-
-/obj/item/reagent_containers/food/snacks/boiledspiderleg
- name = "boiled spider leg"
- desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
- icon_state = "spiderlegcooked"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/capsaicin = 2)
- filling_color = "#000000"
- tastes = list("hot peppers" = 1, "cobwebs" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/spidereggsham
- name = "green eggs and ham"
- desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
- icon_state = "spidereggsham"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
- list_reagents = list(/datum/reagent/consumable/nutriment = 6)
- bitesize = 4
- filling_color = "#7FFF00"
- tastes = list("meat" = 1, "the colour green" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/sashimi
- name = "carp sashimi"
- desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
- icon_state = "sashimi"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5)
- filling_color = "#FA8072"
- tastes = list("fish" = 1, "hot peppers" = 1)
- foodtype = MEAT | TOXIC
-
-/obj/item/reagent_containers/food/snacks/nugget
- name = "chicken nugget"
- filling_color = "#B22222"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- tastes = list("\"chicken\"" = 1)
- foodtype = MEAT
- icon_state_preview = "nugget_lizard"
- /*food_flags = FOOD_FINGER_FOOD*/
- w_class = WEIGHT_CLASS_TINY
-
-/obj/item/reagent_containers/food/snacks/nugget/Initialize(mapload)
- . = ..()
- var/shape = pick("lump", "star", "lizard", "corgi")
- desc = "A 'chicken' nugget vaguely shaped like a [shape]."
- icon_state = "nugget_[shape]"
-
-/obj/item/reagent_containers/food/snacks/pigblanket
- name = "pig in a blanket"
- desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it."
- icon_state = "pigblanket"
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- filling_color = "#800000"
- tastes = list("meat" = 1, "butter" = 1)
-
-/obj/item/reagent_containers/food/snacks/bbqribs
- name = "bbq ribs"
- desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
- icon_state = "ribs"
- w_class = WEIGHT_CLASS_NORMAL
- list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("meat" = 3, "smokey sauce" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meatclown
- name = "meat clown"
- desc = "A delicious, round piece of meat clown. How horrifying."
- icon_state = "meatclown"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/banana = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- tastes = list("meat" = 5, "clowns" = 3, "sixteen teslas" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/meatclown/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/slippery, 30)
-
-//////////////////////////////////////////// KEBABS AND OTHER SKEWERS ////////////////////////////////////////////
-
-/obj/item/reagent_containers/food/snacks/kebab
- trash = /obj/item/stack/rods
- icon_state = "kebab"
- w_class = WEIGHT_CLASS_NORMAL
- list_reagents = list(/datum/reagent/consumable/nutriment = 8)
- tastes = list("meat" = 3, "metal" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/kebab/human
- name = "human-kebab"
- desc = "A human meat, on a stick."
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
- tastes = list("tender meat" = 3, "metal" = 1)
- foodtype = MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/kebab/monkey
- name = "meat-kebab"
- desc = "Delicious meat, on a stick."
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
- tastes = list("meat" = 3, "metal" = 1)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/kebab/tofu
- name = "tofu-kebab"
- desc = "Vegan meat, on a stick."
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
- tastes = list("tofu" = 3, "metal" = 1)
- foodtype = VEGETABLES
-
-
-/obj/item/reagent_containers/food/snacks/kebab/tail
- name = "lizard-tail kebab"
- desc = "Severed lizard tail on a stick."
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
- tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
- foodtype = MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/kebab/rat
- name = "rat-kebab"
- desc = "Not so delicious rat meat, on a stick."
- icon_state = "ratkebab"
- w_class = WEIGHT_CLASS_NORMAL
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
- tastes = list("rat meat" = 1, "metal" = 1)
- foodtype = MEAT | GORE
-
-/obj/item/reagent_containers/food/snacks/kebab/rat/double
- name = "double rat-kebab"
- icon_state = "doubleratkebab"
- tastes = list("rat meat" = 2, "metal" = 1)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
-
-/obj/item/reagent_containers/food/snacks/meat/steak/ashflake
- name = "ashflaked steak"
- desc = "A common delicacy among miners."
- icon_state = "ashsteak"
- bonus_reagents = list(/datum/reagent/consumable/vitfro = 2)
- tastes = list("tough meat" = 2, "bubblegum" = 1)
- foodtype = MEAT
-/obj/item/reagent_containers/food/snacks/kebab/fiesta
- name = "fiesta skewer"
- icon_state = "fiestaskewer"
- tastes = list("tex-mex" = 3, "cumin" = 2)
- bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/capsaicin = 3)
-
-/obj/item/reagent_containers/food/snacks/dolphinmeat
- name = "dolphin fillet"
- desc = "A fillet of spess dolphin meat."
- icon_state = "fishfillet"
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
- bitesize = 6
- filling_color = "#FA8072"
- tastes = list("fish" = 1,"cruelty" = 2)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/snacks/dolphinmeat/Initialize(mapload)
- . = ..()
- eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
-
-
-/obj/item/reagent_containers/food/snacks/bbqribs
- name = "bbq ribs"
- desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
- icon_state = "ribs"
- w_class = WEIGHT_CLASS_NORMAL
- list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("meat" = 3, "smokey sauce" = 1)
- foodtype = MEAT
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 34c979f870f86..62a221e032ede 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -157,10 +157,10 @@
sourcejob = gibee.job
var/sourcenutriment = mob_occupant.nutrition / 15
var/gibtype = /obj/effect/decal/cleanable/blood/gibs
- var/typeofmeat = /obj/item/reagent_containers/food/snacks/meat/slab/human
+ var/typeofmeat = /obj/item/food/meat/slab/human
var/typeofskin
- var/obj/item/reagent_containers/food/snacks/meat/slab/allmeat[meat_produced]
+ var/obj/item/food/meat/slab/allmeat[meat_produced]
var/obj/item/stack/sheet/animalhide/skin
var/list/datum/disease/diseases = mob_occupant.get_static_viruses()
@@ -182,7 +182,7 @@
if(occupant?.reagents)
occupant_volume = occupant.reagents.total_volume
for (var/i=1 to meat_produced)
- var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat
+ var/obj/item/food/meat/slab/newmeat = new typeofmeat
newmeat.name = "[sourcename] [newmeat.name]"
if(istype(newmeat))
newmeat.subjectname = sourcename
@@ -204,7 +204,7 @@
qdel(mob_occupant)
addtimer(CALLBACK(src, PROC_REF(make_meat), skin, allmeat, meat_produced, gibtype, diseases), gibtime)
-/obj/machinery/gibber/proc/make_meat(obj/item/stack/sheet/animalhide/skin, list/obj/item/reagent_containers/food/snacks/meat/slab/allmeat, meat_produced, gibtype, list/datum/disease/diseases)
+/obj/machinery/gibber/proc/make_meat(obj/item/stack/sheet/animalhide/skin, list/obj/item/food/meat/slab/allmeat, meat_produced, gibtype, list/datum/disease/diseases)
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
operating = FALSE
var/turf/T = get_turf(src)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index be2474997aad8..79ef2e30f126c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
to_chat(user, "The machine hisses loudly as it condenses the ground monkey meat. After a moment, it dispenses a brand new monkey cube.")
playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1)
for(var/i in 1 to FLOOR(stored_matter, 1))
- new /obj/item/reagent_containers/food/snacks/monkeycube(src.loc)
+ new /obj/item/food/monkeycube(src.loc)
stored_matter--
to_chat(user, "The machine's display flashes that it has [stored_matter] monkeys worth of material left.")
else
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 66fc88b6930c1..6051a5ad980dc 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -18,7 +18,7 @@
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/tofu(location)
+ new /obj/item/food/tofu(location)
return
/datum/chemical_reaction/chocolate_bar
@@ -112,7 +112,7 @@
/datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/meat/slab/synthmeat(location)
+ new /obj/item/food/meat/slab/synthmeat(location)
/datum/chemical_reaction/hot_ramen
name = "Hot Ramen"
@@ -130,12 +130,12 @@
name = "Imitation Carpmeat"
id = "imitationcarpmeat"
required_reagents = list(/datum/reagent/toxin/carpotoxin = 5)
- required_container = /obj/item/reagent_containers/food/snacks/tofu
+ required_container = /obj/item/food/tofu
mix_message = "The mixture becomes similar to carp meat."
/datum/chemical_reaction/imitationcarpmeat/on_reaction(datum/reagents/holder)
var/location = get_turf(holder.my_atom)
- new /obj/item/reagent_containers/food/snacks/carpmeat/imitation(location)
+ new /obj/item/food/fishmeat/carp/imitation(location)
if(holder && holder.my_atom)
qdel(holder.my_atom)
diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm
index f07884fce2c69..8444cd2c649a9 100644
--- a/code/modules/food_and_drinks/recipes/processor_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm
@@ -5,12 +5,12 @@
var/required_machine = /obj/machinery/processor
/datum/food_processor_process/meat
- input = /obj/item/reagent_containers/food/snacks/meat/slab
- output = /obj/item/reagent_containers/food/snacks/meatball
+ input = /obj/item/food/meat/slab
+ output = /obj/item/food/meatball
/datum/food_processor_process/bacon
- input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
- output = /obj/item/reagent_containers/food/snacks/meat/rawbacon
+ input = /obj/item/food/meat/rawcutlet
+ output = /obj/item/food/meat/rawbacon
/datum/food_processor_process/potatowedges
input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
@@ -55,4 +55,4 @@
/datum/food_processor_process/fish
input = /obj/item/fish
- output = /obj/item/reagent_containers/food/snacks/carpmeat/icantbelieveitsnotcarp
+ output = /obj/item/food/fishmeat
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
index 814d7857d08bd..ff0aa438f49e5 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
@@ -7,7 +7,7 @@
name = "Meat bread"
reqs = list(
/obj/item/food/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3,
+ /obj/item/food/meat/cutlet/plain = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/food/bread/meat
@@ -17,7 +17,7 @@
name = "Xenomeat bread"
reqs = list(
/obj/item/food/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3,
+ /obj/item/food/meat/cutlet/xeno = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/food/bread/xenomeat
@@ -27,7 +27,7 @@
name = "Spidermeat bread"
reqs = list(
/obj/item/food/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3,
+ /obj/item/food/meat/cutlet/spider = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/food/bread/spidermeat
@@ -48,7 +48,7 @@
name = "Tofu bread"
reqs = list(
/obj/item/food/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 3,
+ /obj/item/food/tofu = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/food/bread/tofu
@@ -69,7 +69,7 @@
reqs = list(
/datum/reagent/consumable/soymilk = 5,
/obj/item/food/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 3,
+ /obj/item/food/tofu = 3,
/obj/item/reagent_containers/food/snacks/grown/banana/mime = 1
)
result = /obj/item/food/bread/mimana
@@ -159,7 +159,7 @@
/obj/item/food/bread/plain = 1,
/obj/item/organ/ears/cat = 1,
/obj/item/organ/tail/cat = 1,
- /obj/item/reagent_containers/food/snacks/meat/slab = 3,
+ /obj/item/food/meat/slab = 3,
/datum/reagent/blood = 50,
/datum/reagent/medicine/strange_reagent = 5
)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
index 43b77c2645418..c896945c32afa 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
@@ -8,10 +8,10 @@
name = "Human burger"
reqs = list(
/obj/item/food/bun = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1
+ /obj/item/food/meat/steak/plain/human = 1
)
parts = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1
+ /obj/item/food/meat/steak/plain/human = 1
)
result = /obj/item/food/burger/human
subcategory = CAT_BURGER
@@ -19,7 +19,7 @@
/datum/crafting_recipe/food/burger
name = "Burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/food/bun = 1
)
@@ -29,7 +29,7 @@
/datum/crafting_recipe/food/corgiburger
name = "Corgi burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1,
+ /obj/item/food/meat/slab/corgi = 1,
/obj/item/food/bun = 1
)
@@ -57,7 +57,7 @@
/datum/crafting_recipe/food/xenoburger
name = "Xeno burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1,
+ /obj/item/food/meat/steak/xeno = 1,
/obj/item/food/bun = 1
)
result = /obj/item/food/burger/xeno
@@ -66,7 +66,7 @@
/datum/crafting_recipe/food/bearger
name = "Bearger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/bear = 1,
+ /obj/item/food/meat/steak/bear = 1,
/obj/item/food/bun = 1
)
result = /obj/item/food/burger/bearger
@@ -75,7 +75,7 @@
/datum/crafting_recipe/food/fishburger
name = "Fish burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/carpmeat = 1,
+ /obj/item/food/fishmeat/carp = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/food/bun = 1
)
@@ -85,7 +85,7 @@
/datum/crafting_recipe/food/tofuburger
name = "Tofu burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/tofu = 1,
+ /obj/item/food/tofu = 1,
/obj/item/food/bun = 1
)
result = /obj/item/food/burger/tofu
@@ -122,7 +122,7 @@
/datum/crafting_recipe/food/redburger
name = "Red burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/red = 1,
/obj/item/food/bun = 1
)
@@ -132,7 +132,7 @@
/datum/crafting_recipe/food/orangeburger
name = "Orange burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/orange = 1,
/obj/item/food/bun = 1
)
@@ -142,7 +142,7 @@
/datum/crafting_recipe/food/yellowburger
name = "Yellow burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/yellow = 1,
/obj/item/food/bun = 1
)
@@ -152,7 +152,7 @@
/datum/crafting_recipe/food/greenburger
name = "Green burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/green = 1,
/obj/item/food/bun = 1
)
@@ -162,7 +162,7 @@
/datum/crafting_recipe/food/blueburger
name = "Blue burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/blue = 1,
/obj/item/food/bun = 1
)
@@ -172,7 +172,7 @@
/datum/crafting_recipe/food/purpleburger
name = "Purple burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/purple = 1,
/obj/item/food/bun = 1
)
@@ -182,7 +182,7 @@
/datum/crafting_recipe/food/blackburger
name = "Black burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/black = 1,
/obj/item/food/bun = 1
)
@@ -192,7 +192,7 @@
/datum/crafting_recipe/food/whiteburger
name = "White burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/toy/crayon/white = 1,
/obj/item/food/bun = 1
)
@@ -211,7 +211,7 @@
/datum/crafting_recipe/food/bigbiteburger
name = "Big bite burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 3,
+ /obj/item/food/meat/steak/plain = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 2,
/obj/item/food/bun = 1
)
@@ -223,11 +223,11 @@
reqs = list(
/datum/reagent/consumable/sodiumchloride = 5,
/datum/reagent/consumable/blackpepper = 5,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 5,
+ /obj/item/food/meat/steak/plain = 5,
/obj/item/reagent_containers/food/snacks/grown/tomato = 4,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3,
/obj/item/food/boiledegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/bacon = 1,
+ /obj/item/food/meat/bacon = 1,
/obj/item/food/bun = 1
)
@@ -255,7 +255,7 @@
/datum/crafting_recipe/food/fivealarmburger
name = "Five alarm burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
/obj/item/food/bun = 1
)
@@ -283,7 +283,7 @@
/datum/crafting_recipe/food/baconburger
name = "Bacon Burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/bacon = 3,
+ /obj/item/food/meat/bacon = 3,
/obj/item/food/bun = 1
)
@@ -303,7 +303,7 @@
/datum/crafting_recipe/food/crabburger
name = "Crab Burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/crab = 2,
+ /obj/item/food/meat/crab = 2,
/obj/item/food/bun = 1
)
@@ -313,7 +313,7 @@
/datum/crafting_recipe/food/cheeseburger
name = "Cheese Burger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/food/bun = 1
)
@@ -333,7 +333,7 @@
/datum/crafting_recipe/food/ribburger
name = "McRib"
reqs = list(
- /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs
+ /obj/item/food/bbqribs = 1, //The sauce is already included in the ribs
/obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome.
/obj/item/food/bun = 1
)
@@ -344,7 +344,7 @@
name = "McGuffin"
reqs = list(
/obj/item/food/friedegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/bacon = 2,
+ /obj/item/food/meat/bacon = 2,
/obj/item/food/bun = 1
)
result = /obj/item/food/burger/mcguffin
@@ -353,7 +353,7 @@
/datum/crafting_recipe/food/chickenburger
name = "Chicken Sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1,
+ /obj/item/food/meat/steak/chicken = 1,
/datum/reagent/consumable/mayonnaise = 5,
/obj/item/food/bun = 1
)
@@ -363,7 +363,7 @@
/datum/crafting_recipe/food/crazyhamburger
name = "Crazy Hamburger"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, // we have no horse meat sadly
+ /obj/item/food/meat/steak/plain = 1, // we have no horse meat sadly
/obj/item/reagent_containers/food/snacks/grown/chili = 2,
/datum/reagent/consumable/cooking_oil = 20,
/obj/item/reagent_containers/food/snacks/grown/nettle/death = 2, // closest thing to "grass of death"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
index 1a3f5cf7e6a81..d15f50e9ac2b5 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
@@ -199,7 +199,7 @@
/obj/item/organ/brain = 1,
/obj/item/organ/heart = 1,
/obj/item/food/cake/birthday = 1,
- /obj/item/reagent_containers/food/snacks/meat/slab = 3,
+ /obj/item/food/meat/slab = 3,
/datum/reagent/blood = 30,
/datum/reagent/consumable/sprinkles = 5,
/datum/reagent/teslium = 1 //To shock the whole thing into life
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
index 756a92639a24d..f412b156a5ad9 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
@@ -35,7 +35,7 @@
name = "Eggs benedict"
reqs = list(
/obj/item/food/friedegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak = 1,
+ /obj/item/food/meat/steak = 1,
/obj/item/food/breadslice/plain = 1,
)
result = /obj/item/food/benedict
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 11811bb6ba270..324d5bd976a82 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -6,27 +6,27 @@
name = "Human kebab"
reqs = list(
/obj/item/stack/rods = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 2
+ /obj/item/food/meat/steak/plain/human = 2
)
- result = /obj/item/reagent_containers/food/snacks/kebab/human
+ result = /obj/item/food/kebab/human
subcategory = CAT_MEAT
/datum/crafting_recipe/food/kebab
name = "Kebab"
reqs = list(
/obj/item/stack/rods = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak = 2
+ /obj/item/food/meat/steak = 2
)
- result = /obj/item/reagent_containers/food/snacks/kebab/monkey
+ result = /obj/item/food/kebab/monkey
subcategory = CAT_MEAT
/datum/crafting_recipe/food/tofukebab
name = "Tofu kebab"
reqs = list(
/obj/item/stack/rods = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 2
+ /obj/item/food/tofu = 2
)
- result = /obj/item/reagent_containers/food/snacks/kebab/tofu
+ result = /obj/item/food/kebab/tofu
subcategory = CAT_MEAT
/datum/crafting_recipe/food/tailkebab
@@ -35,7 +35,7 @@
/obj/item/stack/rods = 1,
/obj/item/organ/tail/lizard = 1
)
- result = /obj/item/reagent_containers/food/snacks/kebab/tail
+ result = /obj/item/food/kebab/tail
subcategory = CAT_MEAT
/datum/crafting_recipe/food/fiestaskewer
@@ -43,11 +43,11 @@
reqs = list(
/obj/item/stack/rods = 1,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/food/meat/cutlet = 1,
/obj/item/reagent_containers/food/snacks/grown/corn = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
- result = /obj/item/reagent_containers/food/snacks/kebab/fiesta
+ result = /obj/item/food/kebab/fiesta
subcategory = CAT_MEAT
////////////////////////////////////////////////FISH////////////////////////////////////////////////
@@ -57,18 +57,18 @@
reqs = list(
/datum/reagent/consumable/flour = 5,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
- /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ /obj/item/food/fishmeat/carp = 1
)
- result = /obj/item/reagent_containers/food/snacks/cubancarp
+ result = /obj/item/food/cubancarp
subcategory = CAT_MEAT
/datum/crafting_recipe/food/fishandchips
name = "Fish and chips"
reqs = list(
/obj/item/reagent_containers/food/snacks/fries = 1,
- /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ /obj/item/food/fishmeat/carp = 1
)
- result = /obj/item/reagent_containers/food/snacks/fishandchips
+ result = /obj/item/food/fishandchips
subcategory = CAT_MEAT
/datum/crafting_recipe/food/fishfingers
@@ -76,9 +76,9 @@
reqs = list(
/datum/reagent/consumable/flour = 5,
/obj/item/food/bun = 1,
- /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ /obj/item/food/fishmeat/carp = 1
)
- result = /obj/item/reagent_containers/food/snacks/fishfingers
+ result = /obj/item/food/fishfingers
subcategory = CAT_MEAT
/datum/crafting_recipe/food/sashimi
@@ -86,9 +86,9 @@
reqs = list(
/datum/reagent/consumable/soysauce = 5,
/obj/item/reagent_containers/food/snacks/spidereggs = 1,
- /obj/item/reagent_containers/food/snacks/carpmeat = 1
+ /obj/item/food/fishmeat/carp = 1
)
- result = /obj/item/reagent_containers/food/snacks/sashimi
+ result = /obj/item/food/sashimi
subcategory = CAT_MEAT
////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
@@ -98,9 +98,9 @@
reqs = list(
/datum/reagent/consumable/sodiumchloride = 1,
/obj/item/reagent_containers/food/snacks/spidereggs = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 2
+ /obj/item/food/meat/cutlet/spider = 2
)
- result = /obj/item/reagent_containers/food/snacks/spidereggsham
+ result = /obj/item/food/spidereggsham
subcategory = CAT_MEAT
////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
@@ -109,20 +109,20 @@
name = "Corned beef"
reqs = list(
/datum/reagent/consumable/sodiumchloride = 5,
- /obj/item/reagent_containers/food/snacks/meat/steak = 1,
+ /obj/item/food/meat/steak = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 2
)
- result = /obj/item/reagent_containers/food/snacks/cornedbeef
+ result = /obj/item/food/cornedbeef
subcategory = CAT_MEAT
/datum/crafting_recipe/food/bearsteak
name = "Filet migrawr"
reqs = list(
/datum/reagent/consumable/ethanol/manly_dorf = 5,
- /obj/item/reagent_containers/food/snacks/meat/steak/bear = 1,
+ /obj/item/food/meat/steak/bear = 1,
)
tools = list(/obj/item/lighter)
- result = /obj/item/reagent_containers/food/snacks/bearsteak
+ result = /obj/item/food/bearsteak
subcategory = CAT_MEAT
/datum/crafting_recipe/food/stewedsoymeat
@@ -132,24 +132,24 @@
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
- result = /obj/item/reagent_containers/food/snacks/stewedsoymeat
+ result = /obj/item/food/stewedsoymeat
subcategory = CAT_MEAT
/datum/crafting_recipe/food/sausage
name = "Sausage"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meatball = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2
+ /obj/item/food/meatball = 1,
+ /obj/item/food/meat/cutlet = 2
)
- result = /obj/item/reagent_containers/food/snacks/sausage
+ result = /obj/item/food/sausage
subcategory = CAT_MEAT
/datum/crafting_recipe/food/nugget
name = "Chicken nugget"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1
+ /obj/item/food/meat/cutlet = 1
)
- result = /obj/item/reagent_containers/food/snacks/nugget
+ result = /obj/item/food/nugget
subcategory = CAT_MEAT
/datum/crafting_recipe/food/rawkhinkali
@@ -157,9 +157,20 @@
reqs = list(
/obj/item/food/doughslice = 1,
/obj/item/reagent_containers/food/snacks/grown/garlic = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1
+ /obj/item/food/meatball = 1
)
- result = /obj/item/reagent_containers/food/snacks/rawkhinkali
+ result = /obj/item/food/rawkhinkali
+ subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/meatbun
+ name = "Meat bun"
+ reqs = list(
+ /datum/reagent/consumable/soysauce = 5,
+ /obj/item/food/bun = 1,
+ /obj/item/food/meatball = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1
+ )
+ result = /obj/item/food/meatbun
subcategory = CAT_MEAT
/datum/crafting_recipe/food/pigblanket
@@ -167,9 +178,9 @@
reqs = list(
/obj/item/food/bun = 1,
/obj/item/reagent_containers/food/snacks/butter = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1
+ /obj/item/food/meat/cutlet = 1
)
- result = /obj/item/reagent_containers/food/snacks/pigblanket
+ result = /obj/item/food/pigblanket
subcategory = CAT_MEAT
/datum/crafting_recipe/food/meatbun
@@ -177,10 +188,10 @@
reqs = list(
/datum/reagent/consumable/soysauce = 5,
/obj/item/food/bun = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1,
+ /obj/item/food/meatball = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
- result = /obj/item/reagent_containers/food/snacks/meatbun
+ result = /obj/item/food/meatbun
subcategory = CAT_MEAT
/datum/crafting_recipe/food/ratkebab
@@ -189,7 +200,7 @@
/obj/item/stack/rods = 1,
/obj/item/reagent_containers/food/snacks/deadmouse = 1
)
- result = /obj/item/reagent_containers/food/snacks/kebab/rat
+ result = /obj/item/food/kebab/rat
subcategory = CAT_MEAT
/datum/crafting_recipe/food/doubleratkebab
@@ -198,14 +209,14 @@
/obj/item/stack/rods = 1,
/obj/item/reagent_containers/food/snacks/deadmouse = 2
)
- result = /obj/item/reagent_containers/food/snacks/kebab/rat/double
+ result = /obj/item/food/kebab/rat/double
subcategory = CAT_MEAT
/datum/crafting_recipe/food/ricepork
name = "Rice and Pork"
reqs = list(
/obj/item/food/salad/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2
+ /obj/item/food/meat/cutlet = 2
)
result = /obj/item/food/salad/ricepork
subcategory = CAT_MEAT
@@ -214,11 +225,11 @@
/datum/crafting_recipe/food/ashsteak
name = "Ashflaked Steak"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/goliath = 1,
+ /obj/item/food/meat/steak/goliath = 1,
/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit = 1,
/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf = 1
)
- result = /obj/item/reagent_containers/food/snacks/meat/steak/ashflake
+ result = /obj/item/food/meat/steak/ashflake
subcategory = CAT_MEAT
@@ -226,17 +237,17 @@
name = "BBQ Ribs"
reqs = list(
/datum/reagent/consumable/bbqsauce = 5,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2,
+ /obj/item/food/meat/steak/plain = 2,
/obj/item/stack/rods = 2
)
- result = /obj/item/reagent_containers/food/snacks/bbqribs
+ result = /obj/item/food/bbqribs
subcategory = CAT_MEAT
/datum/crafting_recipe/food/meatclown
name = "Meat Clown"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/food/meat/steak/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/banana = 1
)
- result = /obj/item/reagent_containers/food/snacks/meatclown
+ result = /obj/item/food/meatclown
subcategory = CAT_MEAT
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
index f5ca4ea5a0115..53f59758006bf 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
@@ -25,7 +25,7 @@
name ="Carne de asada burrito"
reqs = list(
/obj/item/food/tortilla = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/food/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/soybeans = 1
)
result = /obj/item/food/carneburrito
@@ -75,7 +75,7 @@
reqs = list(
/obj/item/food/tortilla = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/food/meat/cutlet = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
)
result = /obj/item/food/taco
@@ -86,7 +86,7 @@
reqs = list(
/obj/item/food/tortilla = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/food/meat/cutlet = 1,
)
result = /obj/item/food/taco/plain
subcategory = CAT_MEXICAN
@@ -94,7 +94,7 @@
/datum/crafting_recipe/food/enchiladas
name = "Enchiladas"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/food/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/chili = 2,
/obj/item/food/tortilla = 2
)
@@ -105,7 +105,7 @@
name = "Stuffed legion"
time = 40
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/goliath = 1,
+ /obj/item/food/meat/steak/goliath = 1,
/obj/item/organ/regenerative_core/legion = 1,
/datum/reagent/consumable/ketchup = 2,
/datum/reagent/consumable/capsaicin = 2
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 84915e70f2166..953ba91b36519 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -157,7 +157,7 @@
/obj/item/organ/brain = 1,
/obj/item/organ/heart = 1,
/obj/item/reagent_containers/food/snacks/butter = 10,
- /obj/item/reagent_containers/food/snacks/meat/slab = 5,
+ /obj/item/food/meat/slab = 5,
/datum/reagent/blood = 50,
/datum/reagent/teslium = 1 //To shock the whole thing into life
)
@@ -170,7 +170,7 @@
/obj/item/food/doughslice = 1,
/datum/reagent/consumable/cream = 5,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/meat/rawcrab = 1
+ /obj/item/food/meat/rawcrab = 1
)
result = /obj/item/reagent_containers/food/snacks/crab_rangoon
subcategory = CAT_MISCFOOD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index 0de740063918c..a5a540b7e005c 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -27,7 +27,7 @@
time = 15
name = "Meat donut"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/rawcutlet = 1,
+ /obj/item/food/meat/rawcutlet = 1,
/obj/item/food/pastrybase = 1
)
result = /obj/item/food/donut/meat
@@ -273,7 +273,7 @@
name = "Soylent green"
reqs = list(
/obj/item/food/pastrybase = 2,
- /obj/item/reagent_containers/food/snacks/meat/slab/human = 2
+ /obj/item/food/meat/slab/human = 2
)
result = /obj/item/food/soylentgreen
subcategory = CAT_PASTRY
@@ -322,7 +322,7 @@
name = "Donk-pocket"
reqs = list(
/obj/item/food/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1
+ /obj/item/food/meatball = 1
)
result = /obj/item/food/donkpocket
subcategory = CAT_PASTRY
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
index b0978e4e76972..2ff2d4d61b729 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
@@ -19,7 +19,7 @@
/datum/reagent/consumable/blackpepper = 1,
/datum/reagent/consumable/sodiumchloride = 1,
/obj/item/food/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1
+ /obj/item/food/meat/steak/plain = 1
)
result = /obj/item/food/pie/meatpie
subcategory = CAT_PIE
@@ -28,7 +28,7 @@
name = "Tofu pie"
reqs = list(
/obj/item/food/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 1
+ /obj/item/food/tofu = 1
)
result = /obj/item/food/pie/tofupie
subcategory = CAT_PIE
@@ -37,7 +37,7 @@
name = "Xeno pie"
reqs = list(
/obj/item/food/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1
+ /obj/item/food/meat/cutlet/xeno = 1
)
result = /obj/item/food/pie/xemeatpie
subcategory = CAT_PIE
@@ -65,7 +65,7 @@
reqs = list(
/obj/item/food/pie/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/berries = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak/bear = 1
+ /obj/item/food/meat/steak/bear = 1
)
result = /obj/item/food/pie/bearypie
subcategory = CAT_PIE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
index 23d41976a4c06..13ae68c6f6d7d 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
@@ -17,7 +17,7 @@
name = "Meat pizza"
reqs = list(
/obj/item/food/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 4,
+ /obj/item/food/meat/cutlet = 4,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
@@ -28,7 +28,7 @@
name = "Arnold pizza"
reqs = list(
/obj/item/food/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
+ /obj/item/food/meat/cutlet = 3,
/obj/item/ammo_casing/c9mm = 8,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
@@ -83,7 +83,7 @@
name = "Sassysage pizza"
reqs = list(
/obj/item/food/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 3,
+ /obj/item/food/meatball = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
@@ -94,7 +94,7 @@
name = "Hawaiian pizza"
reqs = list(
/obj/item/food/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/food/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/pineappleslice = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
index aa306a0797fa2..d3424e6c9bb46 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
@@ -29,7 +29,7 @@
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
/obj/item/reagent_containers/food/snacks/grown/potato = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1
+ /obj/item/food/meatball = 1
)
result = /obj/item/food/salad/validsalad
subcategory = CAT_SALAD
@@ -41,7 +41,7 @@
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/monkeycube = 1,
+ /obj/item/food/monkeycube = 1,
/obj/item/reagent_containers/food/snacks/grown/banana = 1
)
result = /obj/item/food/soup/monkeysdelight
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index 30142c0c2a55e..63c61d261ba22 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -10,7 +10,7 @@
name = "Sandwich"
reqs = list(
/obj/item/food/breadslice/plain = 2,
- /obj/item/reagent_containers/food/snacks/meat/steak = 1,
+ /obj/item/food/meat/steak = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1
)
result = /obj/item/food/sandwich
@@ -57,7 +57,7 @@
reqs = list(
/datum/reagent/consumable/ketchup = 5,
/obj/item/food/bun = 1,
- /obj/item/reagent_containers/food/snacks/sausage = 1
+ /obj/item/food/sausage = 1
)
result = /obj/item/food/hotdog
subcategory = CAT_SANDWICH
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index 24ab7c9ba90bd..1f3e824e902cd 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -18,7 +18,7 @@
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1,
+ /obj/item/food/meatball = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/reagent_containers/food/snacks/grown/potato = 1
)
@@ -55,7 +55,7 @@
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
/datum/reagent/consumable/soysauce = 5,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2
+ /obj/item/food/meat/cutlet/xeno = 2
)
result = /obj/item/food/soup/wingfangchu
subcategory = CAT_SOUP
@@ -73,7 +73,7 @@
name = "Hot chili"
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/food/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
@@ -84,7 +84,7 @@
name = "Cold chili"
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/food/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/icepepper = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
@@ -119,7 +119,7 @@
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/soydope = 2,
- /obj/item/reagent_containers/food/snacks/tofu = 2
+ /obj/item/food/tofu = 2
)
result = /obj/item/food/soup/miso
subcategory = CAT_SOUP
@@ -161,7 +161,7 @@
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/badrecipe = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 1,
+ /obj/item/food/tofu = 1,
/obj/item/food/boiledegg = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
)
@@ -196,7 +196,7 @@
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
+ /obj/item/food/meat/cutlet = 3,
/obj/item/reagent_containers/food/snacks/grown/potato = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/reagent_containers/food/snacks/grown/eggplant = 1,
@@ -252,7 +252,7 @@
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/meat/crab = 1,
+ /obj/item/food/meat/crab = 1,
/obj/item/food/salad/boiledrice = 1
)
result = /obj/item/food/soup/bisque
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
index bd2186687d373..b65283dd37fba 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
@@ -24,7 +24,7 @@
name = "Spaghetti meatball"
reqs = list(
/obj/item/food/spaghetti/boiledspaghetti = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 2
+ /obj/item/food/meatball = 2
)
result = /obj/item/food/spaghetti/meatballspaghetti
subcategory = CAT_SPAGHETTI
@@ -33,7 +33,7 @@
name = "Spesslaw"
reqs = list(
/obj/item/food/spaghetti/boiledspaghetti = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 4
+ /obj/item/food/meatball = 4
)
result = /obj/item/food/spaghetti/spesslaw
subcategory = CAT_SPAGHETTI
@@ -43,7 +43,7 @@
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/food/spaghetti/boiledspaghetti = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/food/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/food/spaghetti/beefnoodle
@@ -53,7 +53,7 @@
name = "Chowmein"
reqs = list(
/obj/item/food/spaghetti/boiledspaghetti = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/food/meat/cutlet = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 2,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1
)
@@ -84,7 +84,7 @@
reqs = list(
/obj/item/food/spaghetti/boiledspaghetti = 1,
/datum/reagent/consumable/ketchup = 10,
- /obj/item/reagent_containers/food/snacks/sausage = 1,
+ /obj/item/food/sausage = 1,
/obj/item/reagent_containers/food/snacks/grown/chili = 1
)
result = /obj/item/food/spaghetti/spaghettinapolitan
@@ -94,7 +94,7 @@
name = "Lasagna"
reqs = list(
/obj/item/food/spaghetti = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1,
+ /obj/item/food/meatball = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1
)
@@ -106,7 +106,7 @@
reqs = list(
/obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 1,
+ /obj/item/food/tofu = 1,
/obj/item/stack/sheet/glass = 1
)
result = /obj/item/food/spaghetti/glassnoodles
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index a994734279385..075bc25717985 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -42,7 +42,7 @@
speak_language = /datum/language/metalanguage // everyone should understand happy easter
emote_hear = list("hops.")
emote_see = list("hops around","bounces up and down")
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
+ butcher_results = list(/obj/item/food/meat/slab = 1)
egg_type = /obj/item/food/egg/loaded
food_type = /obj/item/reagent_containers/food/snacks/grown/carrot
eggsleft = 10
@@ -183,7 +183,7 @@
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
/obj/item/food/boiledegg = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1
+ /obj/item/food/meatball = 1
)
result = /obj/item/reagent_containers/food/snacks/scotchegg
subcategory = CAT_MISCFOOD
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index 9d14cde481a1c..3108167d891ce 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -102,7 +102,7 @@
/obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)
user.visible_message("[user] crushes [src] into meat.", "You crush [src] into something that resembles meat.")
playsound(user, 'sound/effects/blobattack.ogg', 50, 1)
- var/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat/M = new
+ var/obj/item/food/meat/slab/meatwheat/M = new
qdel(src)
user.put_in_hands(M)
return 1
diff --git a/code/modules/jobs/job_mail.dm b/code/modules/jobs/job_mail.dm
index c843c9fed2919..e67486c20b700 100644
--- a/code/modules/jobs/job_mail.dm
+++ b/code/modules/jobs/job_mail.dm
@@ -232,7 +232,7 @@
mail_goodies = list(
/obj/item/reagent_containers/pill/mutadone = 15,
/obj/item/storage/pill_bottle/mannitol = 10,
- /obj/item/reagent_containers/food/snacks/monkeycube = 10,
+ /obj/item/food/monkeycube = 10,
/obj/effect/spawner/mail/genes = 5,
)
@@ -414,7 +414,7 @@
/obj/item/reagent_containers/syringe/used = 15,
//keep your workplace clean, please.
/obj/item/reagent_containers/spray/cleaner = 15,
- /obj/item/reagent_containers/food/snacks/monkeycube = 10,
+ /obj/item/food/monkeycube = 10,
/obj/item/reagent_containers/glass/bottle/formaldehyde = 10,
/obj/item/reagent_containers/glass/bottle/random_virus/minor = 10,
/obj/item/reagent_containers/glass/bottle/random_virus = 5,
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index f4621b043c840..e8741fe255036 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -278,7 +278,7 @@
prize_list += list(
new /datum/data/vendor_equipment("Extra Id", /obj/item/card/id/golem, 250),
new /datum/data/vendor_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250),
- new /datum/data/vendor_equipment("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 300),
+ new /datum/data/vendor_equipment("Monkey Cube", /obj/item/food/monkeycube, 300),
new /datum/data/vendor_equipment("Toolbelt", /obj/item/storage/belt/utility, 350),
new /datum/data/vendor_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500),
new /datum/data/vendor_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000),
diff --git a/code/modules/mob/living/basic/vermin/mothroach.dm b/code/modules/mob/living/basic/vermin/mothroach.dm
index 6250a3ac80a63..2f232fc6275fd 100644
--- a/code/modules/mob/living/basic/vermin/mothroach.dm
+++ b/code/modules/mob/living/basic/vermin/mothroach.dm
@@ -8,7 +8,7 @@
held_lh = 'icons/mob/pets_held_lh.dmi'
held_rh = 'icons/mob/pets_held_rh.dmi'
head_icon = 'icons/mob/pets_held.dmi'
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/mothroach = 3, /obj/item/stack/sheet/animalhide/mothroach = 1)
+ butcher_results = list(/obj/item/food/meat/slab/mothroach = 3, /obj/item/stack/sheet/animalhide/mothroach = 1)
density = TRUE
mob_biotypes = list(MOB_ORGANIC, MOB_BUG)
mob_size = MOB_SIZE_SMALL
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 48bddc751b707..4d216614734a0 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -10,7 +10,7 @@
verb_say = "hisses"
initial_language_holder = /datum/language_holder/alien
bubble_icon = "alien"
- type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+ type_of_meat = /obj/item/food/meat/slab/xeno
status_flags = CANUNCONSCIOUS|CANPUSH
gib_type = /obj/effect/decal/cleanable/xenoblood/xgibs
unique_name = 1
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index b8b1425de6d83..cbdf628536da6 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -2,7 +2,7 @@
name = "alien"
icon_state = "alien"
pass_flags = PASSTABLE
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
+ butcher_results = list(/obj/item/food/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
limb_destroyer = TRUE
hud_type = /datum/hud/alien
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 399295cf8a860..cbb36665fc112 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -10,7 +10,7 @@
mob_size = MOB_SIZE_LARGE
layer = LARGE_MOB_LAYER //above most mobs, but below speechbubbles
pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3)
+ butcher_results = list(/obj/item/food/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3)
var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
var/game_end_timer
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 6100cc482ecbb..6c0a149f894cc 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -36,7 +36,7 @@
var/co2overloadtime = null
var/temperature_resistance = T0C+75
- var/obj/item/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab
+ var/obj/item/food/meat/slab/type_of_meat = /obj/item/food/meat/slab
var/gib_type = /obj/effect/decal/cleanable/blood/gibs
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index bd12d019dd397..8a08bf82c6f06 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
///If your race bleeds something other than bog standard blood, change this to reagent id. For example, ethereals bleed liquid electricity.
var/datum/reagent/exotic_blood
var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc)
- var/meat = /obj/item/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
+ var/meat = /obj/item/food/meat/slab/human //What the species drops on gibbing
var/skinned_type
var/list/no_equip = list() // slots the race can't equip stuff to
var/nojumpsuit = 0 // this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids
diff --git a/code/modules/mob/living/carbon/human/species_types/apid.dm b/code/modules/mob/living/carbon/human/species_types/apid.dm
index b32c86fdb14ab..e98e65571eb43 100644
--- a/code/modules/mob/living/carbon/human/species_types/apid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/apid.dm
@@ -13,7 +13,7 @@
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/apid
+ meat = /obj/item/food/meat/slab/human/mutant/apid
mutanteyes = /obj/item/organ/eyes/apid
mutantlungs = /obj/item/organ/lungs/apid
mutantwings = /obj/item/organ/wings/bee
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index f6241c3a67386..3ab82a79610c2 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -5,7 +5,7 @@
attack_verb = "burn"
attack_sound = 'sound/weapons/etherealhit.ogg'
miss_sound = 'sound/weapons/etherealmiss.ogg'
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ethereal
+ meat = /obj/item/food/meat/slab/human/mutant/ethereal
mutantstomach = /obj/item/organ/stomach/battery/ethereal
mutanttongue = /obj/item/organ/tongue/ethereal
exotic_blood = /datum/reagent/consumable/liquidelectricity //Liquid Electricity. fuck you think of something better gamer
diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
index 03fe2d3e1420b..c824d2d50ba6a 100644
--- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
@@ -8,7 +8,7 @@
mutanttongue = /obj/item/organ/tongue/fly
mutantliver = /obj/item/organ/liver/fly
mutantstomach = /obj/item/organ/stomach/fly
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
+ meat = /obj/item/food/meat/slab/human/mutant/fly
mutant_bodyparts = list("insect_type")
default_features = list("insect_type" = "fly", "body_size" = "Normal")
burnmod = 1.4
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 700af57774fec..e1296a60cad1b 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -16,7 +16,7 @@
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC
sexes = FALSE
damage_overlay_type = ""
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
+ meat = /obj/item/food/meat/slab/human/mutant/golem
species_language_holder = /datum/language_holder/golem
// To prevent golem subtypes from overwhelming the odds when random species
// changes, only the Random Golem type can be chosen
@@ -86,7 +86,7 @@
/datum/species/golem/adamantine
name = "Adamantine Golem"
id = SPECIES_GOLEM_ADAMANTINE
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
+ meat = /obj/item/food/meat/slab/human/mutant/golem/adamantine
mutant_organs = list(/obj/item/organ/adamantine_resonator, /obj/item/organ/vocal_cords/adamantine)
fixed_mut_color = "4ed"
info_text = "As an Adamantine Golem, you possess special vocal cords allowing you to \"resonate\" messages to all golems. Your unique mineral makeup makes you immune to most types of magic."
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 633ae3a585eb2..1b250df301b49 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -17,7 +17,7 @@
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
+ meat = /obj/item/food/meat/slab/human/mutant/lizard
skinned_type = /obj/item/stack/sheet/animalhide/lizard
exotic_bloodtype = "L"
inert_mutation = FIREBREATH
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index c436da3e406ad..29f4f338b2a3d 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -19,7 +19,7 @@
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
var/datum/action/innate/cocoon/cocoon_action
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
+ meat = /obj/item/food/meat/slab/human/mutant/moth
mutanteyes = /obj/item/organ/eyes/moth
mutantwings = /obj/item/organ/wings/moth
mutanttongue = /obj/item/organ/tongue/moth
diff --git a/code/modules/mob/living/carbon/human/species_types/oozelings.dm b/code/modules/mob/living/carbon/human/species_types/oozelings.dm
index 53c16edcf9da5..a9b97156a964e 100644
--- a/code/modules/mob/living/carbon/human/species_types/oozelings.dm
+++ b/code/modules/mob/living/carbon/human/species_types/oozelings.dm
@@ -9,7 +9,7 @@
hair_alpha = 150
mutantlungs = /obj/item/organ/lungs/slime
mutanttongue = /obj/item/organ/tongue/slime
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
+ meat = /obj/item/food/meat/slab/human/mutant/slime
exotic_blood = /datum/reagent/toxin/slimejelly
damage_overlay_type = ""
var/datum/action/innate/regenerate_limbs/regenerate_limbs
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 7a701871cb2c7..c0d55d51c3204 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -13,7 +13,7 @@
miss_sound = 'sound/weapons/slashmiss.ogg'
burnmod = 1.25
heatmod = 1.5
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
+ meat = /obj/item/food/meat/slab/human/mutant/plant
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/plant
diff --git a/code/modules/mob/living/carbon/human/species_types/psyphoza.dm b/code/modules/mob/living/carbon/human/species_types/psyphoza.dm
index d724d39af5e9e..b3e8d25cc066d 100644
--- a/code/modules/mob/living/carbon/human/species_types/psyphoza.dm
+++ b/code/modules/mob/living/carbon/human/species_types/psyphoza.dm
@@ -3,7 +3,7 @@
plural_form = "Psyphoza"
id = SPECIES_PSYPHOZA
bodyflag = FLAG_PSYPHOZA
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/psyphoza
+ meat = /obj/item/food/meat/slab/human/mutant/psyphoza
species_traits = list(NOEYESPRITES, AGENDER, MUTCOLORS)
sexes = FALSE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
@@ -204,7 +204,7 @@
//Reveal larger area of sense
dim_overlay()
//Blind sense stuffs
- var/datum/component/blind_sense/BS = owner.GetComponent(/datum/component/blind_sense)
+ var/datum/component/blind_sense/BS = owner.GetComponent(/datum/component/blind_sense)
if(BS)
for(var/mob/living/L in urange(9, owner, 1))
BS.highlight_object(L, "mob", L.dir)
@@ -220,7 +220,7 @@
/datum/action/item_action/organ_action/psychic_highlight/proc/remove()
owner?.clear_fullscreen("psychic_highlight")
owner?.clear_fullscreen("psychic_highlight_mask")
- owner?.clear_fullscreen("psychic_highlight_click_mask")
+ owner?.clear_fullscreen("psychic_highlight_click_mask")
eyes = null
//This can get *tricky*
if(!QDELETED(overlay_change))
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 46a76f8f3733e..1cea3c8950bf2 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -7,7 +7,7 @@
plural_form = "Shadowpeople"
id = SPECIES_SHADOWPERSON
sexes = 0
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
+ meat = /obj/item/food/meat/slab/human/mutant/shadow
species_traits = list(NOBLOOD,NOEYESPRITES,NOFLASH)
inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH)
inherent_factions = list("faithless")
diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
index ad3a3284bc672..376a2fd11c94f 100644
--- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm
+++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
@@ -4,7 +4,7 @@
plural_form = "Skeletons"
id = SPECIES_SKELETON
sexes = 0
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
+ meat = /obj/item/food/meat/slab/human/mutant/skeleton
species_traits = list(NOBLOOD,NOHUSK)
inherent_traits = list(TRAIT_TOXIMMUNE,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,\
TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH,TRAIT_XENO_IMMUNE,TRAIT_NOCLONELOSS)
diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm
index e234aefab4e7c..d73ab3c612361 100644
--- a/code/modules/mob/living/carbon/human/species_types/zombies.dm
+++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -5,7 +5,7 @@
name = "\improper High-Functioning Zombie"
id = "zombie"
sexes = 0
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
+ meat = /obj/item/food/meat/slab/human/mutant/zombie
species_traits = list(NOBLOOD,NOZOMBIE,NOTRANSSTING)
inherent_traits = list(TRAIT_TOXIMMUNE,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_EASYDISMEMBER,\
TRAIT_LIMBATTACHMENT,TRAIT_NOBREATH,TRAIT_NODEATH,TRAIT_FAKEDEATH,TRAIT_NOCLONELOSS)
@@ -110,7 +110,7 @@
/datum/species/human/krokodil_addict
name = "\improper Human"
id = "goofzombies"
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
+ meat = /obj/item/food/meat/slab/human/mutant/zombie
mutanttongue = /obj/item/organ/tongue/zombie
changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 31c0172a2cc03..bd1c6a2cf34df 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -9,8 +9,8 @@
pass_flags = PASSTABLE
ventcrawler = VENTCRAWLER_NUDE
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
- type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/monkey
+ butcher_results = list(/obj/item/food/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
+ type_of_meat = /obj/item/food/meat/slab/monkey
gib_type = /obj/effect/decal/cleanable/blood/gibs
unique_name = TRUE
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 0608e822ed9c5..256da5093dceb 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -24,7 +24,7 @@
unsuitable_atmos_damage = 1
animal_species = /mob/living/simple_animal/pet/cat
childtype = list(/mob/living/simple_animal/pet/cat/kitten)
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1, /obj/item/organ/tongue/cat = 1)
+ butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1, /obj/item/organ/tongue/cat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -262,7 +262,7 @@
maxHealth = 50
gender = FEMALE
butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/food/cakeslice/birthday = 3, \
- /obj/item/reagent_containers/food/snacks/meat/slab = 2)
+ /obj/item/food/meat/slab = 2)
response_harm = "takes a bite out of"
attacked_sound = 'sound/items/eatfood.ogg'
deathmessage = "loses its false life and collapses!"
@@ -312,7 +312,7 @@
icon_dead = "breadcat_dead"
collar_type = null
held_state = "breadcat"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1, /obj/item/organ/tongue/cat = 1, /obj/item/food/breadslice/plain = 1)
+ butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1, /obj/item/organ/tongue/cat = 1, /obj/item/food/breadslice/plain = 1)
/mob/living/simple_animal/pet/cat/halal
name = "arabian cat"
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index c77f36b3b5673..59b22e4757f55 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -10,7 +10,7 @@
emote_see = list("clacks.")
speak_chance = 1
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/rawcrab = 2)
+ butcher_results = list(/obj/item/food/meat/rawcrab = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stomps"
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index d198c210daf20..58403563b26de 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -30,7 +30,7 @@
icon_state = "corgi"
icon_living = "corgi"
icon_dead = "corgi_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
+ butcher_results = list(/obj/item/food/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
gold_core_spawnable = FRIENDLY_SPAWN
@@ -67,7 +67,7 @@
icon_state = "pug"
icon_living = "pug"
icon_dead = "pug_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/pug = 3)
+ butcher_results = list(/obj/item/food/meat/slab/pug = 3)
gold_core_spawnable = FRIENDLY_SPAWN
worn_slot_flags = ITEM_SLOT_HEAD
collar_type = "pug"
@@ -82,7 +82,7 @@
icon_state = "bullterrier"
icon_living = "bullterrier"
icon_dead = "bullterrier_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/corgi = 3) // Would feel redundant to add more new dog meats.
+ butcher_results = list(/obj/item/food/meat/slab/corgi = 3) // Would feel redundant to add more new dog meats.
gold_core_spawnable = FRIENDLY_SPAWN
worn_slot_flags = ITEM_SLOT_HEAD //by popular demand
collar_type = "bullterrier"
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 05b976b0b2767..d415ba71d4457 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -13,7 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 4)
+ butcher_results = list(/obj/item/food/meat/slab = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -112,7 +112,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 6)
+ butcher_results = list(/obj/item/food/meat/slab = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -179,7 +179,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 2
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 1)
+ butcher_results = list(/obj/item/food/meat/slab/chicken = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -240,7 +240,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 2)
+ butcher_results = list(/obj/item/food/meat/slab/chicken = 2)
var/egg_type = /obj/item/food/egg
var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
response_help = "pets"
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 0bad204418809..83daf5e47f533 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -14,7 +14,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 3)
+ butcher_results = list(/obj/item/food/meat/slab = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm
index 2c6360f28a118..906ee5e0bb914 100644
--- a/code/modules/mob/living/simple_animal/friendly/gondola.dm
+++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm
@@ -17,7 +17,7 @@
icon = 'icons/mob/gondolas.dmi'
icon_state = "gondola"
icon_living = "gondola"
- loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1, /obj/item/reagent_containers/food/snacks/meat/slab/gondola = 1)
+ loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1, /obj/item/food/meat/slab/gondola = 1)
//Gondolas aren't affected by cold.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/hamster.dm b/code/modules/mob/living/simple_animal/friendly/hamster.dm
index dc4c18b8ae858..29c8aafcb4c40 100644
--- a/code/modules/mob/living/simple_animal/friendly/hamster.dm
+++ b/code/modules/mob/living/simple_animal/friendly/hamster.dm
@@ -26,7 +26,7 @@
icon_living = "hamster"
held_state = "hamster"
icon_dead = "hamster_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/hamster = 1)
+ butcher_results = list(/obj/item/food/meat/slab/hamster = 1)
childtype = /mob/living/simple_animal/pet/hamster
animal_species = /mob/living/simple_animal/pet/hamster
gold_core_spawnable = FRIENDLY_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index eae162757b81f..3c78b08a4547c 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -14,7 +14,7 @@
see_in_dark = 6
maxHealth = 5
health = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/mouse = 1)
+ butcher_results = list(/obj/item/food/meat/slab/mouse = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "splats"
@@ -138,7 +138,7 @@
/obj/item/reagent_containers/food/snacks/deadmouse/attackby(obj/item/I, mob/user, params)
if(I.is_sharp() && user.a_intent == INTENT_HARM)
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/meat/slab/mouse(loc)
+ new /obj/item/food/meat/slab/mouse(loc)
to_chat(user, "You butcher [src].")
qdel(src)
else
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index 77de408bcc5b3..41c04ecd9e5c0 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -15,7 +15,7 @@
speak_chance = 1
turns_per_move = 10
icon = 'icons/mob/penguins.dmi'
- butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3)
+ butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/food/meat/slab/penguin = 3)
chat_color = "#81D9FF"
do_footstep = TRUE
@@ -33,7 +33,7 @@
icon_dead = "penguin_dead"
butcher_results = list()
gold_core_spawnable = FRIENDLY_SPAWN
- butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3)
+ butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/food/meat/slab/penguin = 3)
/mob/living/simple_animal/pet/penguin/emperor/shamebrero
name = "Shamebrero penguin"
@@ -54,4 +54,4 @@
density = FALSE
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
- butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 1)
+ butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/food/meat/slab/penguin = 1)
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index 65c9672ae00dd..9be0f5961d2eb 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -10,7 +10,7 @@
emote_see = list("dozes off.", "looks around sleepily.")
speak_chance = 1
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 3)
+ butcher_results = list(/obj/item/food/meat/slab = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/turtle.dm b/code/modules/mob/living/simple_animal/friendly/turtle.dm
index 79ace932f85be..98661e70f5be7 100644
--- a/code/modules/mob/living/simple_animal/friendly/turtle.dm
+++ b/code/modules/mob/living/simple_animal/friendly/turtle.dm
@@ -11,7 +11,7 @@
emote_see = list("Stretches out their neck.", "looks around slowly.")
speak_chance = 1
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1, /obj/item/clothing/head/franks_hat = 1)
+ butcher_results = list(/obj/item/food/meat/slab = 1, /obj/item/clothing/head/franks_hat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index e70eaacdeeff5..edb8c37fe1ee7 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -11,7 +11,7 @@
response_disarm = "shoves"
response_harm = "hits"
speed = 0
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 4,
+ butcher_results = list(/obj/item/food/meat/slab/xeno = 4,
/obj/item/stack/sheet/animalhide/xeno = 1)
maxHealth = 125
health = 125
@@ -84,7 +84,7 @@
retreat_distance = 5
minimum_distance = 5
move_to_delay = 4
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 4,
+ butcher_results = list(/obj/item/food/meat/slab/xeno = 4,
/obj/item/stack/sheet/animalhide/xeno = 1)
projectiletype = /obj/projectile/neurotox
projectilesound = 'sound/weapons/pierce.ogg'
@@ -134,7 +134,7 @@
move_to_delay = 4
maxHealth = 400
health = 400
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 10,
+ butcher_results = list(/obj/item/food/meat/slab/xeno = 10,
/obj/item/stack/sheet/animalhide/xeno = 2)
mob_size = MOB_SIZE_LARGE
gold_core_spawnable = NO_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index a0734e3136cd9..c890e243419aa 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -16,7 +16,7 @@
taunt_chance = 25
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/bear = 5, /obj/item/clothing/head/bearpelt = 1)
+ butcher_results = list(/obj/item/food/meat/slab/bear = 5, /obj/item/clothing/head/bearpelt = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -63,7 +63,7 @@
icon_living = "combatbear"
icon_dead = "combatbear_dead"
faction = list("russian")
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/bear = 5, /obj/item/clothing/head/bearpelt = 1, /obj/item/bear_armor = 1)
+ butcher_results = list(/obj/item/food/meat/slab/bear = 5, /obj/item/clothing/head/bearpelt = 1, /obj/item/bear_armor = 1)
melee_damage = 30
armour_penetration = 20
health = 120
@@ -123,7 +123,7 @@
response_harm = "takes a bite out of"
attacked_sound = 'sound/items/eatfood.ogg'
deathmessage = "loses its false life and collapses!"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/butter = 6, /obj/item/reagent_containers/food/snacks/meat/slab = 3, /obj/item/organ/brain = 1, /obj/item/organ/heart = 1)
+ butcher_results = list(/obj/item/reagent_containers/food/snacks/butter = 6, /obj/item/food/meat/slab = 3, /obj/item/organ/brain = 1, /obj/item/organ/heart = 1)
attack_sound = 'sound/weapons/slap.ogg'
attacktext = "slaps"
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 5be2ecf216e0f..00e1f91b9bf64 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -12,7 +12,7 @@
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 2)
+ butcher_results = list(/obj/item/food/fishmeat/carp = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 8771d9ae17c1e..b67356fb84659 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -30,7 +30,7 @@
speed = 1
turns_per_move = 5
see_in_dark = 10
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/spider = 2, /obj/item/reagent_containers/food/snacks/spiderleg = 8)
+ butcher_results = list(/obj/item/food/meat/slab/spider = 2, /obj/item/food/spiderleg = 8)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -329,7 +329,11 @@
web_speed = 0.25
gender = FEMALE
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/spider = 2, /obj/item/reagent_containers/food/snacks/spiderleg = 8, /obj/item/reagent_containers/food/snacks/spidereggs = 4)
+ butcher_results = list(
+ /obj/item/food/meat/slab/spider = 2,
+ /obj/item/food/spiderleg = 8,
+ /obj/item/reagent_containers/food/snacks/spidereggs = 4
+ )
var/obj/effect/proc_holder/spider/wrap/wrap
var/datum/action/innate/spider/set_directive/set_directive
/// Allows the spider to use spider comms
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index ef8c173cdedf7..3c74c4bb66a33 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -9,7 +9,7 @@
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+ butcher_results = list(/obj/item/food/meat/slab = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index 658b8ff38391c..5b79753b6f89c 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -14,7 +14,7 @@
maxHealth = 220
health = 220
loot = list(/obj/effect/gibspawner/generic/animal)
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/gorilla = 4)
+ butcher_results = list(/obj/item/food/meat/slab/gorilla = 4)
response_help = "prods"
response_disarm = "challenges"
response_harm = "thumps"
@@ -120,7 +120,7 @@
maxHealth = 220
health = 220
loot = list(/obj/effect/gibspawner/generic/animal)
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/gorilla = 4)
+ butcher_results = list(/obj/item/food/meat/slab/gorilla = 4)
melee_damage = 20
damage_coeff = list(BRUTE = 0.8, BURN = 1, TOX = 1, CLONE = 0, STAMINA = 0, OXY = 1)
obj_damage = 50
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index d9a641e070348..7e72bb886a493 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -10,7 +10,7 @@
maxHealth = 30
health = 30
see_in_dark = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/killertomato = 2)
+ butcher_results = list(/obj/item/food/meat/slab/killertomato = 2)
response_help = "prods"
response_disarm = "pushes aside"
response_harm = "smacks"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 0f3efa611b6bb..a7cb565a2c6fa 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -92,7 +92,7 @@
throw_message = "does nothing to the tough hide of the"
pre_attack_icon = "goliath2"
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2)
+ butcher_results = list(/obj/item/food/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2)
guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/goliath_hide = 1)
loot = list()
stat_attack = UNCONSCIOUS
@@ -117,7 +117,7 @@
pre_attack_icon = "Goliath_preattack"
throw_message = "does nothing to the rocky hide of the"
loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2)
+ butcher_results = list(/obj/item/food/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2)
guaranteed_butcher_results = list()
crusher_drop_mod = 30
wander = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/redgrub.dm b/code/modules/mob/living/simple_animal/hostile/redgrub.dm
index 2a9b7fe48a84e..b13b2d42e6dc4 100644
--- a/code/modules/mob/living/simple_animal/hostile/redgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/redgrub.dm
@@ -172,7 +172,7 @@
/mob/living/simple_animal/hostile/redgrub/harvest(mob/living/user) //used for extra objects etc. in butchering
for(var/i in 1 to growthstage)
- var/obj/item/reagent_containers/food/snacks/meat/rawcutlet/grub/meat = new(src.loc)
+ var/obj/item/food/meat/rawcutlet/grub/meat = new(src.loc)
for(var/datum/disease/advance/A in grub_diseases)
if(A.spread_flags & DISEASE_SPREAD_FALTERED)
grub_diseases -= A
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index 7e316fcc7403c..20135c151f96b 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -17,7 +17,7 @@
see_in_dark = 10
melee_damage = 6
attacktext = "bites"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
+ butcher_results = list(/obj/item/food/meat/slab = 1)
pass_flags = PASSTABLE
faction = list("hostile")
attack_sound = 'sound/weapons/bite.ogg'
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm
index e1a45d219977c..695c09e52919e 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm
@@ -8,7 +8,7 @@
icon_gib = "dolphin_gib"
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/dolphinmeat = 2)
+ butcher_results = list(/obj/item/food/meat/slab/dolphinmeat = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index d47ccc307695d..27b9fc296a10a 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -201,8 +201,8 @@
O.extinguish()
O.acid_level = 0
// Monkey cube
- if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
- var/obj/item/reagent_containers/food/snacks/monkeycube/cube = O
+ if(istype(O, /obj/item/food/monkeycube))
+ var/obj/item/food/monkeycube/cube = O
cube.Expand()
// Dehydrated carp
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index ae26296462ed3..9decb9af4482f 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -127,7 +127,7 @@
/datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct(location)
+ new /obj/item/food/meat/slab/meatproduct(location)
return
/datum/chemical_reaction/carbondioxide
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 82f3c03e577ee..f20cdd409d81d 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -45,7 +45,7 @@
/datum/chemical_reaction/slime/slimemonkey/on_reaction(datum/reagents/holder)
for(var/i in 1 to 3)
- new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom))
+ new /obj/item/food/monkeycube(get_turf(holder.my_atom))
..()
//Green
diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm
index c7128dc6683d3..b03a9fecfeb40 100644
--- a/code/modules/religion/religion_sects.dm
+++ b/code/modules/religion/religion_sects.dm
@@ -263,7 +263,7 @@
tgui_icon = "fish"
alignment = ALIGNMENT_NEUT
max_favor = 10000
- desired_items = list(/obj/item/reagent_containers/food/snacks/meat/slab)
+ desired_items = list(/obj/item/food/meat/slab)
rites_list = list(/datum/religion_rites/summon_carp, /datum/religion_rites/flood_area, /datum/religion_rites/summon_carpsuit)
altar_icon_state = "convertaltar-blue"
@@ -277,7 +277,7 @@
return TRUE
/datum/religion_sect/carp_sect/on_sacrifice(obj/item/N, mob/living/L) //and this
- var/obj/item/reagent_containers/food/snacks/meat/meat = N
+ var/obj/item/food/meat/meat = N
if(!istype(meat)) //how...
return
adjust_favor(20, L)
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index 2edd18e086f13..d4a67a359d6c9 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -80,7 +80,7 @@
id = "mcube"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube
+ build_path = /obj/item/food/monkeycube
category = list("initial", "Food")
/datum/design/ez_nut
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index ebcda536a45da..594e364405847 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -610,9 +610,9 @@
O.extinguish() //All shamelessly copied from water's reaction_obj, since I didn't seem to be able to get it here for some reason.
O.acid_level = 0
// Monkey cube
- if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
+ if(istype(O, /obj/item/food/monkeycube))
to_chat(owner, "[linked_extract] kept your hands wet! It makes [O] expand!")
- var/obj/item/reagent_containers/food/snacks/monkeycube/cube = O
+ var/obj/item/food/monkeycube/cube = O
cube.Expand()
// Dehydrated carp
diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm
index c9e79d2c662b1..580397a5485fc 100644
--- a/code/modules/research/xenobiology/crossbreeding/_structures.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm
@@ -467,7 +467,7 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals)
return ..()
blood_amt -= 100
- var/type = pick(/obj/item/reagent_containers/food/snacks/meat/slab,/obj/item/organ/heart,/obj/item/organ/lungs,/obj/item/organ/liver,/obj/item/organ/eyes,/obj/item/organ/tongue,/obj/item/organ/stomach,/obj/item/organ/ears)
+ var/type = pick(/obj/item/food/meat/slab,/obj/item/organ/heart,/obj/item/organ/lungs,/obj/item/organ/liver,/obj/item/organ/eyes,/obj/item/organ/tongue,/obj/item/organ/stomach,/obj/item/organ/ears)
new type(get_turf(src))
/obj/structure/slime_crystal/red/attacked_by(obj/item/I, mob/living/user)
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
index 899deeba42356..7fbd00636eb63 100644
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm
@@ -54,7 +54,7 @@ Industrial extracts:
/obj/item/slimecross/industrial/grey
colour = "grey"
effect_desc = "Produces monkey cubes."
- itempath = /obj/item/reagent_containers/food/snacks/monkeycube
+ itempath = /obj/item/food/monkeycube
itemamount = 5
/obj/item/slimecross/industrial/orange
diff --git a/code/modules/research/xenobiology/crossbreeding/reproductive.dm b/code/modules/research/xenobiology/crossbreeding/reproductive.dm
index ade7cb12cfff3..95a259929984b 100644
--- a/code/modules/research/xenobiology/crossbreeding/reproductive.dm
+++ b/code/modules/research/xenobiology/crossbreeding/reproductive.dm
@@ -19,7 +19,7 @@ Reproductive extracts:
/obj/item/slimecross/reproductive/Initialize(mapload)
. = ..()
if(!typecache_to_take)
- typecache_to_take = typecacheof(/obj/item/reagent_containers/food/snacks/monkeycube)
+ typecache_to_take = typecacheof(/obj/item/food/monkeycube)
slime_storage = AddComponent(/datum/component/storage/concrete/extract_inventory)
slime_storage.can_hold = typecache_to_take
@@ -48,7 +48,7 @@ Reproductive extracts:
to_chat(user, "There are no monkey cubes in the bio bag!")
return
- else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
+ else if(istype(O, /obj/item/food/monkeycube))
slime_storage.locked = FALSE //This weird unlock-then-lock nonsense brought to you courtesy of storage jank
if(SEND_SIGNAL(src, COMSIG_TRY_STORAGE_INSERT, O, user, TRUE))
to_chat(user, "You feed a Monkey Cube to [src], and it pulses gently.")
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 1ae8ca15fb5d8..7ab05ae3f0c17 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -150,7 +150,7 @@
stored_slimes -= deleted
/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
+ if(istype(O, /obj/item/food/monkeycube))
monkeys++
to_chat(user, "You feed [O] to [src]. It now has [monkeys] monkey cubes stored.")
qdel(O)
@@ -159,7 +159,7 @@
var/obj/item/storage/P = O
var/loaded = FALSE
for(var/obj/G in P.contents)
- if(istype(G, /obj/item/reagent_containers/food/snacks/monkeycube))
+ if(istype(G, /obj/item/food/monkeycube))
loaded = TRUE
monkeys++
qdel(G)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 6c20fc585a3a7..ebae6c0d61630 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -88,7 +88,7 @@
/obj/item/slime_extract/grey/activate(mob/living/carbon/human/user, datum/species/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
- var/obj/item/reagent_containers/food/snacks/monkeycube/M = new(drop_location())
+ var/obj/item/food/monkeycube/M = new(drop_location())
user.put_in_active_hand(M)
playsound(user, 'sound/effects/splat.ogg', 50, 1)
to_chat(user, "You spit out a monkey cube.")
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index 027f6879baba3..16d77a2fa963a 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -151,15 +151,15 @@
/obj/item/reagent_containers/food/snacks/carrotfries,
/obj/item/reagent_containers/food/snacks/chocolatebunny,
/obj/item/food/benedict,
- /obj/item/reagent_containers/food/snacks/cornedbeef,
+ /obj/item/food/cornedbeef,
/obj/item/food/soup/meatball,
/obj/item/food/soup/monkeysdelight,
/obj/item/food/soup/stew,
/obj/item/food/soup/hotchili,
/obj/item/food/burrito,
/obj/item/food/burger/fish,
- /obj/item/reagent_containers/food/snacks/cubancarp,
- /obj/item/reagent_containers/food/snacks/fishandchips,
+ /obj/item/food/cubancarp,
+ /obj/item/food/fishandchips,
/obj/item/food/pie/meatpie,
/obj/item/pizzabox,
)
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index 1202e292de7ee..8c7812ba5cdb4 100644
--- a/code/modules/surgery/lipoplasty.dm
+++ b/code/modules/surgery/lipoplasty.dm
@@ -47,12 +47,12 @@
target.set_nutrition(NUTRITION_LEVEL_WELL_FED)
removednutriment -= 450 //whatever was removed goes into the meat
var/mob/living/carbon/human/H = target
- var/typeofmeat = /obj/item/reagent_containers/food/snacks/meat/slab/human
+ var/typeofmeat = /obj/item/food/meat/slab/human
if(H.dna?.species)
typeofmeat = H.dna.species.meat
- var/obj/item/reagent_containers/food/snacks/meat/slab/human/newmeat = new typeofmeat
+ var/obj/item/food/meat/slab/human/newmeat = new typeofmeat
newmeat.name = "fatty meat"
newmeat.desc = "Extremely fatty tissue taken from a patient."
newmeat.subjectname = H.real_name
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index dd90324aaa8b2..7352e57ff7245 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -5,7 +5,7 @@
product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Have some more candy corn!;Try our new ice cups!"
icon_state = "sustenance"
light_color = LIGHT_COLOR_BLUEGREEN
- products = list(/obj/item/reagent_containers/food/snacks/tofu/prison = 24,
+ products = list(/obj/item/food/tofu/prison = 24,
/obj/item/reagent_containers/food/drinks/ice/prison = 12,
/obj/item/food/candy_corn/prison = 6)
contraband = list(/obj/item/knife/kitchen = 6,
diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi
new file mode 100644
index 0000000000000..bb6ccb235f4c3
Binary files /dev/null and b/icons/obj/food/meat.dmi differ
diff --git a/tools/UpdatePaths/Scripts/9951_NEWFOODmeats b/tools/UpdatePaths/Scripts/9951_NEWFOODmeats
new file mode 100644
index 0000000000000..f7cadf38626bf
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/9951_NEWFOODmeats
@@ -0,0 +1,34 @@
+/obj/item/food/meat/slab/dolphinmeat : /obj/item/reagent_containers/food/snacks/dolphinmeat{@OLD}
+
+/obj/item/food/meat/slab : /obj/item/reagent_containers/food/snacks/meat/slab{@OLD}
+
+/obj/item/food/meat/steak : /obj/item/reagent_containers/food/snacks/meat/steak{@OLD}
+
+/obj/item/food/fishmeat : /obj/item/reagent_containers/food/snacks/carpmeat/icantbelieveitsnotcarp{@OLD}
+/obj/item/food/fishmeat/carp/imitation : /obj/item/reagent_containers/food/snacks/carpmeat/imitation{@OLD}
+/obj/item/food/fishmeat/carp : /obj/item/reagent_containers/food/snacks/carpmeat{@OLD}
+
+/obj/item/food/cubancarp : /obj/item/reagent_containers/food/snacks/cubancarp{@OLD}
+/obj/item/food/fishfingers : /obj/item/reagent_containers/food/snacks/fishfingers{@OLD}
+/obj/item/food/fishandchips : /obj/item/reagent_containers/food/snacks/fishandchips{@OLD}
+/obj/item/food/tofu : /obj/item/reagent_containers/food/snacks/tofu{@OLD}
+/obj/item/food/spiderleg : /obj/item/reagent_containers/food/snacks/spiderleg{@OLD}
+/obj/item/food/cornedbeef : /obj/item/reagent_containers/food/snacks/cornedbeef{@OLD}
+/obj/item/food/bearsteak : /obj/item/reagent_containers/food/snacks/bearsteak{@OLD}
+/obj/item/food/meatball : /obj/item/reagent_containers/food/snacks/meatball{@OLD}
+/obj/item/food/sausage : /obj/item/reagent_containers/food/snacks/sausage{@OLD}
+/obj/item/food/salami : /obj/item/reagent_containers/food/snacks/salami{@OLD}
+/obj/item/food/rawkhinkali : /obj/item/reagent_containers/food/snacks/rawkhinkali{@OLD}
+/obj/item/food/khinkali : /obj/item/reagent_containers/food/snacks/khinkali{@OLD}
+/obj/item/food/meatbun : /obj/item/reagent_containers/food/snacks/meatbun{@OLD}
+
+/obj/item/food/stewedsoymeat : /obj/item/reagent_containers/food/snacks/stewedsoymeat{@OLD}
+/obj/item/food/boiledspiderleg : /obj/item/reagent_containers/food/snacks/boiledspiderleg{@OLD}
+/obj/item/food/spidereggsham : /obj/item/reagent_containers/food/snacks/spidereggsham{@OLD}
+/obj/item/food/sashimi : /obj/item/reagent_containers/food/snacks/sashimi{@OLD}
+/obj/item/food/nugget : /obj/item/reagent_containers/food/snacks/nugget{@OLD}
+/obj/item/food/pigblanket : /obj/item/reagent_containers/food/snacks/pigblanket{@OLD}
+/obj/item/food/bbqribs : /obj/item/reagent_containers/food/snacks/bbqribs{@OLD}
+/obj/item/food/meatclown : /obj/item/reagent_containers/food/snacks/meatclown{@OLD}
+/obj/item/food/kebab : /obj/item/reagent_containers/food/snacks/kebab{@OLD}
+