From fee63293026e6b73ea773a44a0ca938e92d5785a Mon Sep 17 00:00:00 2001
From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Date: Tue, 3 Oct 2023 15:12:23 -0400
Subject: [PATCH 01/12] meat&monkeycube
---
.../10x10/sk_rdm060_snakefighter.dmm | 6 +-
.../10x5/sk_rdm045_deltacafeteria.dmm | 4 +-
.../3x3/sk_rdm110_lipidchamber.dmm | 2 +-
_maps/RandomRuins/SpaceRuins/Fast_Food.dmm | 16 +-
_maps/RandomRuins/SpaceRuins/bus.dmm | 18 +-
_maps/RandomRuins/SpaceRuins/crashedship.dmm | 20 +-
.../RandomRuins/SpaceRuins/gasthelizards.dmm | 40 +-
.../SpaceRuins/mrow_thats_right.dmm | 20 +-
_maps/RandomRuins/SpaceRuins/oldAIsat.dmm | 4 +-
_maps/RandomRuins/SpaceRuins/spacehotel.dmm | 58 +-
_maps/RandomZLevels/SnowCabin.dmm | 12 +-
_maps/RandomZLevels/TheBeach.dmm | 10 +-
_maps/RandomZLevels/moonoutpost19.dmm | 8 +-
_maps/RandomZLevels/spacebattle.dmm | 2 +-
_maps/RandomZLevels/undergroundoutpost45.dmm | 8 +-
_maps/arenas/beach.dmm | 2 +-
_maps/map_files/BoxStation/BoxStation.dmm | 4 +-
_maps/map_files/FlandStation/FlandStation.dmm | 4 +-
_maps/map_files/KiloStation/KiloStation.dmm | 4 +-
_maps/map_files/Mining/Lavaland.dmm | 2 +-
_maps/map_files/RadStation/RadStation.dmm | 6 +-
_maps/map_files/generic/CentCom.dmm | 92 +-
_maps/shuttles/emergency/emergency_corg.dmm | 10 +-
_maps/shuttles/emergency/emergency_luxury.dmm | 6 +-
_maps/shuttles/ferry/ferry_meat.dmm | 30 +-
_maps/shuttles/hunter/hunter_russian.dmm | 4 +-
_maps/shuttles/whiteship/whiteship_box.dmm | 2 +-
_maps/shuttles/whiteship/whiteship_delta.dmm | 2 +-
_maps/shuttles/whiteship/whiteship_meta.dmm | 6 +-
beestation.dme | 5 +-
code/__HELPERS/randoms.dm | 6 +-
code/controllers/subsystem/traumas.dm | 29 +-
code/game/gamemodes/meteor/meteors.dm | 6 +-
code/game/gamemodes/objective_items.dm | 2 +-
code/game/machinery/fat_sucker.dm | 2 +-
code/game/machinery/washing_machine.dm | 2 +-
.../game/objects/effects/spawners/lootdrop.dm | 4 +-
code/game/objects/items/food/burgers.dm | 2 +-
code/game/objects/items/food/meatdish.dm | 474 +++++++++++
code/game/objects/items/food/meatslab.dm | 798 ++++++++++++++++++
code/game/objects/items/food/monkeycube.dm | 42 +
code/game/objects/items/melee/misc.dm | 4 +-
code/game/objects/items/storage/bags.dm | 2 +-
code/game/objects/items/storage/boxes.dm | 28 +-
.../crates_lockers/closets/secure/freezer.dm | 2 +-
code/modules/antagonists/morph/morph.dm | 2 +-
code/modules/aquarium/aquarium_behaviour.dm | 2 +-
code/modules/cargo/bounties/assistant.dm | 4 +-
code/modules/cargo/bounties/chef.dm | 4 +-
code/modules/cargo/bounties/mining.dm | 2 +-
code/modules/cargo/gondolapod.dm | 2 +-
code/modules/cargo/packs.dm | 24 +-
.../clothing/spacesuits/miscellaneous.dm | 2 +-
.../food_and_drinks/food/customizables.dm | 4 +-
.../food_and_drinks/food/snacks/meat.dm | 543 ------------
.../food_and_drinks/food/snacks_meat.dm | 404 ---------
.../food_and_drinks/food/snacks_pastry.dm | 10 -
.../kitchen_machinery/gibber.dm | 8 +-
.../kitchen_machinery/monkeyrecycler.dm | 2 +-
.../food_and_drinks/recipes/food_mixtures.dm | 8 +-
.../recipes/processor_recipes.dm | 10 +-
.../recipes/tablecraft/recipes_bread.dm | 14 +-
.../recipes/tablecraft/recipes_burger.dm | 54 +-
.../recipes/tablecraft/recipes_cake.dm | 2 +-
.../recipes/tablecraft/recipes_egg.dm | 2 +-
.../recipes/tablecraft/recipes_meat.dm | 95 ++-
.../recipes/tablecraft/recipes_misc.dm | 12 +-
.../recipes/tablecraft/recipes_pastry.dm | 17 +-
.../recipes/tablecraft/recipes_pie.dm | 8 +-
.../recipes/tablecraft/recipes_pizza.dm | 8 +-
.../recipes/tablecraft/recipes_salad.dm | 4 +-
.../recipes/tablecraft/recipes_sandwich.dm | 2 +-
.../recipes/tablecraft/recipes_soup.dm | 16 +-
.../recipes/tablecraft/recipes_spaghetti.dm | 14 +-
code/modules/holiday/easter.dm | 4 +-
code/modules/hydroponics/grown/cereals.dm | 2 +-
code/modules/jobs/job_mail.dm | 4 +-
code/modules/mining/machine_vending.dm | 2 +-
.../mob/living/basic/vermin/mothroach.dm | 2 +-
code/modules/mob/living/carbon/alien/alien.dm | 2 +-
.../living/carbon/alien/humanoid/humanoid.dm | 2 +-
.../mob/living/carbon/alien/humanoid/queen.dm | 2 +-
.../mob/living/carbon/carbon_defines.dm | 2 +-
.../mob/living/carbon/human/species.dm | 2 +-
.../living/carbon/human/species_types/apid.dm | 2 +-
.../carbon/human/species_types/ethereal.dm | 2 +-
.../carbon/human/species_types/flypeople.dm | 2 +-
.../carbon/human/species_types/golems.dm | 4 +-
.../human/species_types/lizardpeople.dm | 2 +-
.../carbon/human/species_types/mothmen.dm | 2 +-
.../carbon/human/species_types/oozelings.dm | 2 +-
.../carbon/human/species_types/podpeople.dm | 2 +-
.../human/species_types/shadowpeople.dm | 2 +-
.../carbon/human/species_types/skeletons.dm | 2 +-
.../carbon/human/species_types/zombies.dm | 4 +-
.../mob/living/carbon/monkey/monkey.dm | 4 +-
.../mob/living/simple_animal/friendly/cat.dm | 6 +-
.../mob/living/simple_animal/friendly/crab.dm | 2 +-
.../mob/living/simple_animal/friendly/dog.dm | 6 +-
.../simple_animal/friendly/farm_animals.dm | 8 +-
.../mob/living/simple_animal/friendly/fox.dm | 2 +-
.../living/simple_animal/friendly/gondola.dm | 2 +-
.../living/simple_animal/friendly/hamster.dm | 2 +-
.../living/simple_animal/friendly/mouse.dm | 4 +-
.../living/simple_animal/friendly/penguin.dm | 6 +-
.../living/simple_animal/friendly/sloth.dm | 2 +-
.../living/simple_animal/friendly/turtle.dm | 2 +-
.../mob/living/simple_animal/hostile/alien.dm | 6 +-
.../mob/living/simple_animal/hostile/bear.dm | 6 +-
.../mob/living/simple_animal/hostile/carp.dm | 2 +-
.../simple_animal/hostile/giant_spider.dm | 8 +-
.../mob/living/simple_animal/hostile/goose.dm | 2 +-
.../simple_animal/hostile/gorilla/gorilla.dm | 4 +-
.../simple_animal/hostile/killertomato.dm | 2 +-
.../hostile/mining_mobs/goliath.dm | 4 +-
.../living/simple_animal/hostile/redgrub.dm | 2 +-
.../simple_animal/hostile/retaliate/bat.dm | 2 +-
.../hostile/retaliate/dolphin.dm | 2 +-
.../chemistry/reagents/other_reagents.dm | 4 +-
.../reagents/chemistry/recipes/others.dm | 2 +-
.../chemistry/recipes/slime_extracts.dm | 2 +-
code/modules/religion/religion_sects.dm | 4 +-
.../research/designs/biogenerator_designs.dm | 2 +-
.../crossbreeding/_status_effects.dm | 4 +-
.../xenobiology/crossbreeding/_structures.dm | 2 +-
.../xenobiology/crossbreeding/industrial.dm | 2 +-
.../xenobiology/crossbreeding/reproductive.dm | 4 +-
.../research/xenobiology/xenobio_camera.dm | 4 +-
.../research/xenobiology/xenobiology.dm | 2 +-
code/modules/station_goals/bluespace_tap.dm | 6 +-
code/modules/surgery/lipoplasty.dm | 4 +-
code/modules/vending/sustenance.dm | 2 +-
icons/obj/food/meat.dmi | Bin 0 -> 27982 bytes
133 files changed, 1824 insertions(+), 1445 deletions(-)
create mode 100644 code/game/objects/items/food/meatdish.dm
create mode 100644 code/game/objects/items/food/meatslab.dm
create mode 100644 code/game/objects/items/food/monkeycube.dm
delete mode 100644 code/modules/food_and_drinks/food/snacks/meat.dm
delete mode 100644 code/modules/food_and_drinks/food/snacks_meat.dm
create mode 100644 icons/obj/food/meat.dmi
diff --git a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
index d0049128aaa3d..cf702fd43106d 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 1a740205b9d1d..c77670399be27 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 6a7445bfbd34d..1d3a76353bd5e 100644
--- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
+++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -379,7 +379,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"by" = (
-/obj/item/reagent_containers/food/snacks/cubancarp,
+/obj/item/food/cubancarp,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
@@ -404,7 +404,7 @@
/area/ruin/space/has_grav/powered/macspace)
"bD" = (
/obj/structure/table/wood/fancy/red,
-/obj/item/reagent_containers/food/snacks/fishfingers,
+/obj/item/food/fishfingers,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"bE" = (
@@ -588,7 +588,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cn" = (
-/obj/item/reagent_containers/food/snacks/kebab/human,
+/obj/item/food/kebab/human,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
@@ -605,7 +605,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cq" = (
-/obj/item/reagent_containers/food/snacks/bearsteak,
+/obj/item/food/bearsteak,
/obj/structure/table/wood/fancy/blue,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/cafeteria,
@@ -653,7 +653,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
"cz" = (
-/obj/item/reagent_containers/food/snacks/kebab/tail,
+/obj/item/food/kebab/tail,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
@@ -700,7 +700,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cH" = (
-/obj/item/reagent_containers/food/snacks/kebab/rat/double,
+/obj/item/food/kebab/rat/double,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
@@ -725,7 +725,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cN" = (
-/obj/item/reagent_containers/food/snacks/fishfingers,
+/obj/item/food/fishfingers,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
@@ -736,7 +736,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cP" = (
-/obj/item/reagent_containers/food/snacks/fishandchips,
+/obj/item/food/fishandchips,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
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 08e839295f1f5..a4705ff6410cd 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/kitchen/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 f8bf5afe521c4..0918120df5ccf 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 1444171d3bd38..558a9feadaab2 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 ef2c8357ab554..650ab0c941b32 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 3192d54301605..2607106c8e7ca 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 113a9d318f29a..6c07ab4bff124 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 d587d63973674..10e5d795e9164 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 5ee00f4fd8c64..356f1e25541ea 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -1259,10 +1259,10 @@
},
/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/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";
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/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 791d742920628..d17d9d6a30435 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -2874,8 +2874,8 @@
/area/maintenance/port/fore)
"arO" = (
/obj/machinery/monkey_recycler,
-/obj/item/reagent_containers/food/snacks/monkeycube,
-/obj/item/reagent_containers/food/snacks/monkeycube,
+/obj/item/food/monkeycube,
+/obj/item/food/monkeycube,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"arP" = (
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 092dad1370f59..ca83a53cfd434 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -48778,7 +48778,7 @@
},
/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,
/turf/open/floor/plasteel/dark,
/area/vacant_room/commissary/commissaryFood)
"mJZ" = (
@@ -72919,7 +72919,7 @@
desc = "carlos.";
maxHealth = 2;
name = "carlos";
-
+
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 1ffe0cff98b0a..7f62eaa55359d 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -6253,7 +6253,7 @@
"ato" = (
/obj/structure/table,
/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/snacks/fishfingers,
+/obj/item/food/fishfingers,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar/atrium)
"atq" = (
@@ -58490,7 +58490,7 @@
"kyV" = (
/obj/structure/table,
/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/snacks/sausage,
+/obj/item/food/sausage,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index fb7570b30642b..ccae9460f90ec 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -918,7 +918,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/kitchen/knife,
/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 116d14209f4a7..b9d91f0bec84e 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -6543,7 +6543,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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/candy_corn/prison=6,/obj/item/storage/fancy/cigarettes=5,/obj/item/storage/box/matches=10)
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
@@ -56026,8 +56026,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 8dcd8301aac6e..c8f056f9237c3 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -3567,23 +3567,23 @@
/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/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/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
-/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
+/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)
@@ -6210,7 +6210,7 @@
/turf/open/floor/engine/cult,
/area/wizard_station)
"yH" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,
+/obj/item/food/meat/slab/human/mutant/lizard,
/turf/open/floor/grass,
/area/wizard_station)
"yI" = (
@@ -6412,7 +6412,7 @@
/turf/open/floor/grass,
/area/wizard_station)
"zr" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/corgi,
+/obj/item/food/meat/slab/corgi,
/turf/open/floor/grass,
/area/wizard_station)
"zt" = (
@@ -6521,11 +6521,11 @@
/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,
+/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)
"zX" = (
@@ -6656,7 +6656,7 @@
/turf/open/floor/grass,
/area/wizard_station)
"AA" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
+/obj/item/food/meat/slab/human/mutant/slime,
/turf/open/floor/grass,
/area/wizard_station)
"AB" = (
@@ -6795,7 +6795,7 @@
/turf/open/floor/engine/cult,
/area/wizard_station)
"Bi" = (
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
+/obj/item/food/meat/slab/xeno,
/turf/open/floor/grass,
/area/wizard_station)
"Bk" = (
@@ -7606,7 +7606,7 @@
/area/centcom/ferry)
"Fe" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/sashimi,
+/obj/item/food/sashimi,
/turf/open/floor/wood,
/area/centcom/holding)
"Fg" = (
@@ -10458,27 +10458,27 @@
/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/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)
diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm
index b10b6df792099..2a6c40a067116 100644
--- a/_maps/shuttles/emergency/emergency_corg.dmm
+++ b/_maps/shuttles/emergency/emergency_corg.dmm
@@ -746,11 +746,11 @@
/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,
+/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)
"yL" = (
diff --git a/_maps/shuttles/emergency/emergency_luxury.dmm b/_maps/shuttles/emergency/emergency_luxury.dmm
index fe8f8c48b3521..bc021124a2983 100644
--- a/_maps/shuttles/emergency/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency/emergency_luxury.dmm
@@ -144,7 +144,7 @@
/area/shuttle/escape/luxury)
"aA" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/kebab/tofu,
+/obj/item/food/kebab/tofu,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aB" = (
@@ -154,7 +154,7 @@
/area/shuttle/escape/luxury)
"aC" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/enchiladas,
+/obj/item/food/enchiladas,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aD" = (
@@ -245,7 +245,7 @@
/area/shuttle/escape/luxury)
"aU" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/bearsteak,
+/obj/item/food/bearsteak,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aV" = (
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 a2385b9a5ec9b..be7e87424bc94 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 407ccd5d289ec..1ecd2ff990909 100644
--- a/_maps/shuttles/whiteship/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship/whiteship_box.dmm
@@ -1904,7 +1904,7 @@
pixel_y = 4
},
/obj/item/reagent_containers/food/snacks/muffin/berry,
-/obj/item/reagent_containers/food/snacks/tofu,
+/obj/item/food/tofu,
/obj/item/reagent_containers/food/snacks/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 d08691d0a247c..3179d7217209f 100644
--- a/_maps/shuttles/whiteship/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_delta.dmm
@@ -2212,7 +2212,7 @@
locked = 0;
name = "fridge"
},
-/obj/item/reagent_containers/food/snacks/sausage,
+/obj/item/food/sausage,
/obj/item/reagent_containers/food/drinks/beer{
pixel_x = -3;
pixel_y = 3
diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm
index dd95d4e0dbe4d..de1d14dfa5d32 100644
--- a/_maps/shuttles/whiteship/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_meta.dmm
@@ -1007,12 +1007,12 @@
pixel_y = 3
},
/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{
+/obj/item/food/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{
+/obj/item/food/meat/slab/synthmeat,
+/obj/item/food/meat/slab/synthmeat{
pixel_x = 3;
pixel_y = -3
},
diff --git a/beestation.dme b/beestation.dme
index 540efb79906b9..83ffc1f5f0bad 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -1394,6 +1394,9 @@
#include "code\game\objects\items\food\bread.dm"
#include "code\game\objects\items\food\burgers.dm"
#include "code\game\objects\items\food\cake.dm"
+#include "code\game\objects\items\food\meatdish.dm"
+#include "code\game\objects\items\food\meatslab.dm"
+#include "code\game\objects\items\food\monkeycube.dm"
#include "code\game\objects\items\food\pizza.dm"
#include "code\game\objects\items\food\spaghetti.dm"
#include "code\game\objects\items\grenades\_grenade.dm"
@@ -2538,7 +2541,6 @@
#include "code\modules\food_and_drinks\food\snacks.dm"
#include "code\modules\food_and_drinks\food\snacks_egg.dm"
#include "code\modules\food_and_drinks\food\snacks_frozen.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_pastry.dm"
#include "code\modules\food_and_drinks\food\snacks_pie.dm"
@@ -2547,7 +2549,6 @@
#include "code\modules\food_and_drinks\food\snacks_soup.dm"
#include "code\modules\food_and_drinks\food\snacks_vend.dm"
#include "code\modules\food_and_drinks\food\snacks\dough.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 02b7c3c24fecf..c44ffe78a60e8 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/reagent_containers/food/snacks/pie,
- /obj/item/reagent_containers/food/snacks/kebab,
+ /obj/item/food/kebab,
/obj/item/food/pizza,
/obj/item/food/pizzaslice,
/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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 b2708f99042f3..de30dd1eb935b 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -69,11 +69,11 @@ SUBSYSTEM_DEF(traumas)
"greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod,
/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,
+ "lizards" = typecacheof(list(/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(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/security/head_of_security,
/obj/item/clothing/under/rank/engineering/chief_engineer, /obj/item/clothing/under/rank/medical/chief_medical_officer,
@@ -136,10 +136,27 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/costume/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
/obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)),
- "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
- /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
- /obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/vibro_weapon,
- /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/item/katana/weak/curator, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
+ "anime" = typecacheof(list(
+ /obj/item/clothing/under/costume/schoolgirl,
+ /obj/item/katana,
+ /obj/item/food/sashimi,
+ /obj/item/reagent_containers/food/snacks/chawanmushi,
+ /obj/item/reagent_containers/food/drinks/bottle/sake,
+ /obj/item/throwing_star,
+ /obj/item/clothing/head/kitty/genuine,
+ /obj/item/clothing/suit/space/space_ninja,
+ /obj/item/clothing/mask/gas/space_ninja,
+ /obj/item/clothing/shoes/space_ninja,
+ /obj/item/clothing/gloves/space_ninja,
+ /obj/item/vibro_weapon,
+ /obj/item/nullrod/scythe/vibro,
+ /obj/item/energy_katana,
+ /obj/item/toy/katana,
+ /obj/item/nullrod/claymore/katana,
+ /obj/item/katana/weak/curator,
+ /obj/structure/window/paperframe,
+ /obj/structure/mineral_door/paperframe
+ ))
)
phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)),
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 d3e490d60e983..13dbb5b5c6076 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 c85426593c0cf..7b8ad37e48d30 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 5c252eb8f402c..b8641c04cfa30 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -115,8 +115,8 @@
/obj/item/reagent_containers/food/snacks/salad/jungle,
/obj/item/reagent_containers/food/snacks/salad/aesirsalad)
var/mains = list(
- /obj/item/reagent_containers/food/snacks/bearsteak,
- /obj/item/reagent_containers/food/snacks/enchiladas,
+ /obj/item/food/bearsteak,
+ /obj/item/food/enchiladas,
/obj/item/reagent_containers/food/snacks/stewedsoymeat,
/obj/item/food/burger/bigbite,
/obj/item/food/burger/superbite,
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..76b9b03ef48a6
--- /dev/null
+++ b/code/game/objects/items/food/meatdish.dm
@@ -0,0 +1,474 @@
+//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
+
+//DELETE in dough&mexican
+/obj/item/food/enchiladas
+ name = "enchiladas"
+ desc = "Viva La Mexico!"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "enchiladas"
+ bite_consumption = 4
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/protein = 7,
+ /datum/reagent/consumable/capsaicin = 6,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
+ foodtypes = MEAT | GRAIN
+ 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/reagent_containers/food/snacks/stewedsoymeat/Initialize(mapload)
+ . = ..()
+ eatverb = pick("slurp","sip","inhale","drink")
+
+/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..f82cd636b5bbd
--- /dev/null
+++ b/code/game/objects/items/food/meatslab.dm
@@ -0,0 +1,798 @@
+/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
+
+////////////////////////////////////// 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/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 4cb503ea7afe9..eee82a6bb128e 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -753,7 +753,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
@@ -778,7 +778,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 129bb471d4a1c..4af3b471aaf4f 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -415,7 +415,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 ce233af042a19..b041f60288444 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -547,13 +547,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)
@@ -561,7 +561,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"
@@ -573,11 +573,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"
@@ -1064,7 +1064,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
@@ -1087,7 +1087,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"
@@ -1137,20 +1137,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 58bd901457ce7..813f56054958e 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 d15728034753e..5288eabf8145a 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 a4405e20943d2..4798001358940 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 49c09c356adb4..b74df3a5733c8 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 fbef700866543..44e57373d128d 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1797,7 +1797,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,
@@ -2313,16 +2313,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)
@@ -2369,7 +2369,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 59be5d0d416d9..817082a235766 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/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
deleted file mode 100644
index 996560eed24cd..0000000000000
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ /dev/null
@@ -1,543 +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
-
-////////////////////////////////////// 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 98accce5e82e0..0000000000000
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ /dev/null
@@ -1,404 +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/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/enchiladas
- name = "enchiladas"
- desc = "Viva La Mexico!"
- icon_state = "enchiladas"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
- bitesize = 4
- filling_color = "#FFA07A"
- list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/capsaicin = 6)
- tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
- foodtype = MEAT
-
-/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/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 949d0e52d551a..d5522b255ae34 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -690,16 +690,6 @@
tastes = list("bun" = 3, "meat" = 2)
foodtype = GRAIN | MEAT | VEGETABLES
-/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/khachapuri
name = "khachapuri"
desc = "Bread with egg and cheese?"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 4ac915e0d52c1..78c859883a5a9 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
@@ -203,7 +203,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 7694ec2ee5c12..083b46b9ded5c 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 a11bb1866e3fe..f2bf789857382 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 9ce9c46b90998..dd882831aa123 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
@@ -109,7 +109,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
)
@@ -121,7 +121,7 @@
reqs = list(
/datum/reagent/consumable/ketchup = 5,
/obj/item/reagent_containers/food/snacks/bun = 1,
- /obj/item/reagent_containers/food/snacks/sausage = 1
+ /obj/item/food/sausage = 1
)
result = /obj/item/reagent_containers/food/snacks/hotdog
subcategory = CAT_BREAD
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 be2360fe5ecc1..9fd754722227a 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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/bun = 1
)
@@ -220,7 +220,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/reagent_containers/food/snacks/bun = 1
)
@@ -232,11 +232,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/reagent_containers/food/snacks/boiledegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/bacon = 1,
+ /obj/item/food/meat/bacon = 1,
/obj/item/reagent_containers/food/snacks/bun = 1
)
@@ -264,7 +264,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/reagent_containers/food/snacks/bun = 1
)
@@ -292,7 +292,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/reagent_containers/food/snacks/bun = 1
)
@@ -312,7 +312,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/reagent_containers/food/snacks/bun = 1
)
@@ -322,7 +322,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/reagent_containers/food/snacks/bun = 1
)
@@ -342,7 +342,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/reagent_containers/food/snacks/bun = 1
)
@@ -353,7 +353,7 @@
name = "McGuffin"
reqs = list(
/obj/item/reagent_containers/food/snacks/friedegg = 1,
- /obj/item/reagent_containers/food/snacks/meat/bacon = 2,
+ /obj/item/food/meat/bacon = 2,
/obj/item/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/food/burger/mcguffin
@@ -362,7 +362,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/reagent_containers/food/snacks/bun = 1
)
@@ -372,7 +372,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 b3289edca7b6b..1be85c521374d 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 df68bfaf57936..f478437cbb74e 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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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 3844033a3fa29..470b595678b67 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/reagent_containers/food/snacks/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,30 +109,30 @@
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/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/reagent_containers/food/snacks/tortilla = 2
)
- result = /obj/item/reagent_containers/food/snacks/enchiladas
+ result = /obj/item/food/enchiladas
subcategory = CAT_MEAT
/datum/crafting_recipe/food/stewedsoymeat
@@ -148,16 +148,16 @@
/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
subcategory = CAT_MEAT
@@ -167,9 +167,20 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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
@@ -177,9 +188,9 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/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/ratkebab
@@ -188,7 +199,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
@@ -197,14 +208,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/reagent_containers/food/snacks/salad/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 2
+ /obj/item/food/meat/cutlet = 2
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepork
subcategory = CAT_MEAT
@@ -213,11 +224,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
@@ -225,17 +236,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_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index f10dc0f9a1d06..0e927c88e3af3 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -166,7 +166,7 @@
name ="Carne de asada burrito"
reqs = list(
/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/carneburrito
@@ -249,7 +249,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
@@ -275,7 +275,7 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/taco
@@ -286,7 +286,7 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/taco/plain
subcategory = CAT_MISCFOOD
@@ -316,7 +316,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
)
@@ -329,7 +329,7 @@
/obj/item/reagent_containers/food/snacks/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 e1f698a345f6c..ac153a02ead01 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/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/meat
@@ -273,7 +273,7 @@
name = "Soylent green"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 2,
- /obj/item/reagent_containers/food/snacks/meat/slab/human = 2
+ /obj/item/food/meat/slab/human = 2
)
result = /obj/item/reagent_containers/food/snacks/soylentgreen
subcategory = CAT_PASTRY
@@ -322,7 +322,7 @@
name = "Donk-pocket"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1
+ /obj/item/food/meatball = 1
)
result = /obj/item/reagent_containers/food/snacks/donkpocket
subcategory = CAT_PASTRY
@@ -454,17 +454,6 @@
////////////////////////////////////////////OTHER////////////////////////////////////////////
-/datum/crafting_recipe/food/meatbun
- name = "Meat bun"
- reqs = list(
- /datum/reagent/consumable/soysauce = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 1,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 1
- )
- result = /obj/item/reagent_containers/food/snacks/meatbun
- subcategory = CAT_PASTRY
-
/datum/crafting_recipe/food/khachapuri
name = "Khachapuri"
reqs = list(
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 af06b908d6012..8031cf504fb1e 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/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1
+ /obj/item/food/meat/steak/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/pie/meatpie
subcategory = CAT_PIE
@@ -28,7 +28,7 @@
name = "Tofu pie"
reqs = list(
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 1
+ /obj/item/food/tofu = 1
)
result = /obj/item/reagent_containers/food/snacks/pie/tofupie
subcategory = CAT_PIE
@@ -37,7 +37,7 @@
name = "Xeno pie"
reqs = list(
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1
+ /obj/item/food/meat/cutlet/xeno = 1
)
result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie
subcategory = CAT_PIE
@@ -65,7 +65,7 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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 89206e1ad7da8..65e4915e34938 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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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 920691bcb7554..035af4372ed3a 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/reagent_containers/food/snacks/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/reagent_containers/food/snacks/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 0734c8b413f95..154a01dd1ad10 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/reagent_containers/food/snacks/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 41a3756673803..17ff0ee4dde30 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -8,7 +8,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
)
@@ -45,7 +45,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/reagent_containers/food/snacks/soup/wingfangchu
subcategory = CAT_SOUP
@@ -63,7 +63,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
)
@@ -74,7 +74,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
)
@@ -109,7 +109,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/reagent_containers/food/snacks/soup/milo
subcategory = CAT_SOUP
@@ -151,7 +151,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/reagent_containers/food/snacks/boiledegg = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
)
@@ -186,7 +186,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,
@@ -242,7 +242,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/reagent_containers/food/snacks/salad/boiledrice = 1
)
result = /obj/item/reagent_containers/food/snacks/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 9fa4b29ef0285..7c3bcb65b1e17 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/reagent_containers/food/snacks/egg/loaded
food_type = /obj/item/reagent_containers/food/snacks/grown/carrot
eggsleft = 10
@@ -179,7 +179,7 @@
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
/obj/item/reagent_containers/food/snacks/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 f8aaefd96ba68..c754b6289f00e 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 3d3175aed70c7..4b3b5dfc5eaec 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 bdb4739c3b29f..15893827763d1 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 53a95b17b1244..3b06da1483513 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 8bb0349378919..f379c9ec502b5 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 b060573aecb6b..3ba903d5b574e 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 65bca74b4973b..b1daca967534b 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 3ea22e48eeab2..87debfb46a743 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 511378ab4e9c7..18362bbcaccf5 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 99eb6a57d49e0..256dcbb639e0a 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/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 06fe781f3ffca..14d3d361d5b1e 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 aaeca112ee2f9..0e5a39968ba87 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)
@@ -102,7 +102,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 bd209facf8e01..982672988817b 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 f22baa62f43f2..f98e17b5d89c9 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 e56c81f0661b9..fde3230211910 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 688ce1101dca8..1aea3fb122b87 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/reagent_containers/food/snacks/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 265add61ee594..4c9e9f6b84c47 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 da9b4466e37bf..98372d5f4c9ae 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"
@@ -328,7 +328,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 ac1ec44739b04..686f04a4afb64 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 d67f678e080d6..e7e4c48d15672 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 0eb9236cbe6e2..72e7aa8776e90 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 58e942d51838d..530cdb7c02b33 100644
--- a/code/modules/religion/religion_sects.dm
+++ b/code/modules/religion/religion_sects.dm
@@ -262,7 +262,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"
@@ -276,7 +276,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 a5e4131ecb5e2..49ac94c323878 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 4ef153e4255d8..d1114b76f8bf9 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 fd1cbddff2fab..5f5f21d6bfefe 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/reagent_containers/food/snacks/benedict,
- /obj/item/reagent_containers/food/snacks/cornedbeef,
+ /obj/item/food/cornedbeef,
/obj/item/reagent_containers/food/snacks/soup/meatball,
/obj/item/reagent_containers/food/snacks/soup/monkeysdelight,
/obj/item/reagent_containers/food/snacks/soup/stew,
/obj/item/reagent_containers/food/snacks/soup/hotchili,
/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/pie/meatpie,
/obj/item/pizzabox,
)
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index dc4b240a5f441..c013fd06635a2 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 da528e48be83b..f10fdfb4c738d 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/reagent_containers/food/snacks/candy_corn/prison = 6)
contraband = list(/obj/item/kitchen/knife = 6,
diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..606a55dde46898a18e24101a6df16a53750c2cc8
GIT binary patch
literal 27982
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
s&&XF~czCI(O#H0gW>kM|?iuxrue%hVE)9
Date: Tue, 3 Oct 2023 15:39:20 -0400
Subject: [PATCH 02/12] fix broken nuggets & stewed soy
---
code/modules/food_and_drinks/food/snacks.dm | 4 ++--
.../food_and_drinks/recipes/tablecraft/recipes_meat.dm | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 470b595678b67..4248992422ba6 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -142,7 +142,7 @@
/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
@@ -159,7 +159,7 @@
reqs = list(
/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
From e04874fa4e36868c6e52ee3ed62c52c50f2f805b Mon Sep 17 00:00:00 2001
From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Date: Thu, 26 Oct 2023 14:10:33 -0400
Subject: [PATCH 03/12] run dough UpdatePaths
---
_maps/RandomRuins/SpaceRuins/Fast_Food.dmm | 4 +-
_maps/RandomZLevels/undergroundoutpost45.dmm | 4 ++
_maps/holodeck/skatepark.dmm | 62 +++++++++----------
_maps/map_files/CorgStation/CorgStation.dmm | 2 +-
.../map_files/Deltastation/DeltaStation2.dmm | 2 +-
_maps/map_files/FlandStation/FlandStation.dmm | 2 +-
_maps/map_files/KiloStation/KiloStation.dmm | 4 +-
_maps/map_files/RadStation/RadStation.dmm | 6 +-
_maps/shuttles/emergency/emergency_corg.dmm | 2 +-
_maps/shuttles/emergency/emergency_luxury.dmm | 4 +-
_maps/shuttles/whiteship/whiteship_box.dmm | 2 +-
11 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
index 5041cdcdd7b2c..74899b19eff6e 100644
--- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
+++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -715,7 +715,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cK" = (
-/obj/item/food/burrito,
+/obj/item/reagent_containers/food/snacks/burrito,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
@@ -731,7 +731,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cO" = (
-/obj/item/food/carneburrito,
+/obj/item/reagent_containers/food/snacks/carneburrito,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 356f1e25541ea..defb751dc29d8 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
@@ -2659,6 +2660,7 @@
"hU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
+
},
/obj/structure/table,
/obj/item/book/manual/chef_recipes,
@@ -2671,6 +2673,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 +7033,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
+
},
/obj/machinery/door/airlock/maintenance{
name = "Research Maintenance";
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/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 56e6ad1257c2a..40be1f31562ed 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -36919,7 +36919,7 @@
/area/bridge)
"lVf" = (
/obj/structure/table/reinforced,
-/obj/item/food/dough,
+/obj/item/reagent_containers/food/snacks/dough,
/obj/item/kitchen/rollingpin,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 90d0f9e348b10..2d4d4043e258d 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -10998,7 +10998,7 @@
/area/crew_quarters/kitchen)
"bhQ" = (
/obj/structure/table/reinforced,
-/obj/item/food/dough,
+/obj/item/reagent_containers/food/snacks/dough,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 037884113f0a5..8661b4c8b82b7 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -93225,7 +93225,7 @@
/obj/effect/turf_decal/bot,
/obj/item/reagent_containers/glass/bowl,
/obj/item/reagent_containers/food/snacks/grown/tomato,
-/obj/item/food/dough,
+/obj/item/reagent_containers/food/snacks/dough,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 552904e06e197..eceb685245333 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -68104,8 +68104,8 @@
/area/security/main)
"oSL" = (
/obj/structure/table,
-/obj/item/food/dough,
-/obj/item/food/dough,
+/obj/item/reagent_containers/food/snacks/dough,
+/obj/item/reagent_containers/food/snacks/dough,
/obj/item/kitchen/rollingpin,
/obj/item/kitchen/rollingpin,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index ed96251740d6f..5dff38177ce6c 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -5709,10 +5709,10 @@
/area/hallway/primary/central)
"bOn" = (
/obj/structure/table,
-/obj/item/food/dough{
+/obj/item/reagent_containers/food/snacks/dough{
pixel_x = -4
},
-/obj/item/food/dough{
+/obj/item/reagent_containers/food/snacks/dough{
pixel_y = 1
},
/obj/item/kitchen/rollingpin{
@@ -29883,7 +29883,7 @@
pixel_y = 1
},
/obj/effect/turf_decal/stripes/corner,
-/obj/item/food/piedough,
+/obj/item/reagent_containers/food/snacks/piedough,
/obj/machinery/light_switch{
pixel_x = 21
},
diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm
index 09d8ab5263f3a..2a6c40a067116 100644
--- a/_maps/shuttles/emergency/emergency_corg.dmm
+++ b/_maps/shuttles/emergency/emergency_corg.dmm
@@ -183,7 +183,7 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/item/food/dough,
+/obj/item/reagent_containers/food/snacks/dough,
/obj/item/kitchen/rollingpin,
/turf/open/floor/plasteel,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_luxury.dmm b/_maps/shuttles/emergency/emergency_luxury.dmm
index b2ab620b93bec..c6ffd8e1db1cd 100644
--- a/_maps/shuttles/emergency/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency/emergency_luxury.dmm
@@ -154,7 +154,7 @@
/area/shuttle/escape/luxury)
"aC" = (
/obj/structure/table/wood/fancy,
-/obj/item/food/enchiladas,
+/obj/item/reagent_containers/food/snacks/enchiladas,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aD" = (
@@ -194,7 +194,7 @@
/area/shuttle/escape/luxury)
"aK" = (
/obj/structure/table/wood/fancy,
-/obj/item/food/carneburrito,
+/obj/item/reagent_containers/food/snacks/carneburrito,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aL" = (
diff --git a/_maps/shuttles/whiteship/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm
index 05b65545c731c..1ecd2ff990909 100644
--- a/_maps/shuttles/whiteship/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship/whiteship_box.dmm
@@ -1905,7 +1905,7 @@
},
/obj/item/reagent_containers/food/snacks/muffin/berry,
/obj/item/food/tofu,
-/obj/item/food/burrito,
+/obj/item/reagent_containers/food/snacks/burrito,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
From ff0688cd22be43757916127a96513506f458cad6 Mon Sep 17 00:00:00 2001
From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Date: Thu, 26 Oct 2023 14:40:52 -0400
Subject: [PATCH 04/12] updatepaths add
---
tools/UpdatePaths/Scripts/9951_NEWFOODmeats | 34 +++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 tools/UpdatePaths/Scripts/9951_NEWFOODmeats
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}
+
From 4a15b7e838d7300229311eac0b8c754c6acb7732 Mon Sep 17 00:00:00 2001
From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Date: Thu, 26 Oct 2023 14:49:33 -0400
Subject: [PATCH 05/12] fix conflicts
---
code/game/objects/items/food/meatdish.dm | 17 -----------------
.../recipes/tablecraft/recipes_meat.dm | 2 +-
.../recipes/tablecraft/recipes_mexican.dm | 10 +++++-----
3 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm
index 76b9b03ef48a6..9a80c2ec05f8c 100644
--- a/code/game/objects/items/food/meatdish.dm
+++ b/code/game/objects/items/food/meatdish.dm
@@ -248,23 +248,6 @@
foodtypes = GRAIN | MEAT | VEGETABLES
w_class = WEIGHT_CLASS_SMALL
-//DELETE in dough&mexican
-/obj/item/food/enchiladas
- name = "enchiladas"
- desc = "Viva La Mexico!"
- icon = 'icons/obj/food/meat.dmi'
- icon_state = "enchiladas"
- bite_consumption = 4
- food_reagents = list(
- /datum/reagent/consumable/nutriment = 4,
- /datum/reagent/consumable/nutriment/protein = 7,
- /datum/reagent/consumable/capsaicin = 6,
- /datum/reagent/consumable/nutriment/vitamin = 2
- )
- tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
- foodtypes = MEAT | GRAIN
- w_class = WEIGHT_CLASS_SMALL
-
/obj/item/food/stewedsoymeat
name = "stewed soy meat"
desc = "Even non-vegetarians will LOVE this!"
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 a7a588e361313..7dc61def0f6aa 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -166,7 +166,7 @@
name = "Meat bun"
reqs = list(
/datum/reagent/consumable/soysauce = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/food/bun = 1,
/obj/item/food/meatball = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
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
From 339ba21c2b0db28910da5ebab7b9c1b9bf1ad468 Mon Sep 17 00:00:00 2001
From: RKz
Date: Mon, 6 Nov 2023 19:40:27 -0500
Subject: [PATCH 06/12] fix conflict
---
.../food_and_drinks/recipes/tablecraft/recipes_meat.dm | 4 ++--
.../food_and_drinks/recipes/tablecraft/recipes_sandwich.dm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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 a9dbd2ea86da5..724910e1304ec 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -188,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
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 dbcaa296eb6f5..d67ff87c53dc2 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -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/reagent_containers/food/snacks/hotdog
subcategory = CAT_SANDWICH
From df6d253ec9e3ea8c293a8db899412d48cc8ca03f Mon Sep 17 00:00:00 2001
From: RKz
Date: Tue, 7 Nov 2023 02:02:06 -0500
Subject: [PATCH 07/12] fix conflict
---
_maps/RandomRuins/SpaceRuins/Fast_Food.dmm | 4 ++--
_maps/map_files/RadStation/RadStation.dmm | 6 +++---
_maps/shuttles/emergency/emergency_luxury.dmm | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
index 74899b19eff6e..5041cdcdd7b2c 100644
--- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
+++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -715,7 +715,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cK" = (
-/obj/item/reagent_containers/food/snacks/burrito,
+/obj/item/food/burrito,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
@@ -731,7 +731,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
"cO" = (
-/obj/item/reagent_containers/food/snacks/carneburrito,
+/obj/item/food/carneburrito,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 5dff38177ce6c..ed96251740d6f 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -5709,10 +5709,10 @@
/area/hallway/primary/central)
"bOn" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/snacks/dough{
+/obj/item/food/dough{
pixel_x = -4
},
-/obj/item/reagent_containers/food/snacks/dough{
+/obj/item/food/dough{
pixel_y = 1
},
/obj/item/kitchen/rollingpin{
@@ -29883,7 +29883,7 @@
pixel_y = 1
},
/obj/effect/turf_decal/stripes/corner,
-/obj/item/reagent_containers/food/snacks/piedough,
+/obj/item/food/piedough,
/obj/machinery/light_switch{
pixel_x = 21
},
diff --git a/_maps/shuttles/emergency/emergency_luxury.dmm b/_maps/shuttles/emergency/emergency_luxury.dmm
index cf6b3d4be6d5f..f56e293275253 100644
--- a/_maps/shuttles/emergency/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency/emergency_luxury.dmm
@@ -194,7 +194,7 @@
/area/shuttle/escape/luxury)
"aK" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/carneburrito,
+/obj/item/food/carneburrito,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aL" = (
From 4abfee5e1e8600722c4453baec8f55f15f0f7c2c Mon Sep 17 00:00:00 2001
From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Date: Tue, 7 Nov 2023 12:40:10 -0500
Subject: [PATCH 08/12] conflict
---
_maps/map_files/CorgStation/CorgStation.dmm | 2 +-
_maps/map_files/FlandStation/FlandStation.dmm | 2 +-
_maps/shuttles/emergency/emergency_corg.dmm | 2 +-
_maps/shuttles/emergency/emergency_luxury.dmm | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 40be1f31562ed..56e6ad1257c2a 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -36919,7 +36919,7 @@
/area/bridge)
"lVf" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/snacks/dough,
+/obj/item/food/dough,
/obj/item/kitchen/rollingpin,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index f9121739617c0..55a63f3026c4e 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -93225,7 +93225,7 @@
/obj/effect/turf_decal/bot,
/obj/item/reagent_containers/glass/bowl,
/obj/item/reagent_containers/food/snacks/grown/tomato,
-/obj/item/reagent_containers/food/snacks/dough,
+/obj/item/food/dough,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm
index cf18fa49a5301..e7ac2b627f085 100644
--- a/_maps/shuttles/emergency/emergency_corg.dmm
+++ b/_maps/shuttles/emergency/emergency_corg.dmm
@@ -183,7 +183,7 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/snacks/dough,
+/obj/item/food/dough,
/obj/item/kitchen/rollingpin,
/turf/open/floor/plasteel,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_luxury.dmm b/_maps/shuttles/emergency/emergency_luxury.dmm
index f56e293275253..1384087d04099 100644
--- a/_maps/shuttles/emergency/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency/emergency_luxury.dmm
@@ -154,7 +154,7 @@
/area/shuttle/escape/luxury)
"aC" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/enchiladas,
+/obj/item/food/enchiladas,
/turf/open/floor/carpet,
/area/shuttle/escape/luxury)
"aD" = (
From 6955727491be24dc06e8856338b4af0732258762 Mon Sep 17 00:00:00 2001
From: RKz
Date: Wed, 22 Nov 2023 03:04:55 -0500
Subject: [PATCH 09/12] bad typepath
---
code/game/objects/effects/spawners/lootdrop.dm | 2 +-
code/game/objects/items/food/meatdish.dm | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index b8641c04cfa30..643b3acd3131e 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -117,7 +117,7 @@
var/mains = list(
/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/meatdish.dm b/code/game/objects/items/food/meatdish.dm
index 9a80c2ec05f8c..a85613814cd8b 100644
--- a/code/game/objects/items/food/meatdish.dm
+++ b/code/game/objects/items/food/meatdish.dm
@@ -262,10 +262,6 @@
foodtypes = VEGETABLES
w_class = WEIGHT_CLASS_SMALL
-/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize(mapload)
- . = ..()
- eatverb = pick("slurp","sip","inhale","drink")
-
/obj/item/food/boiledspiderleg
name = "boiled spider leg"
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
From 900e8c6f240942edf72597944d2176a4c03a6b4f Mon Sep 17 00:00:00 2001
From: RKz
Date: Fri, 24 Nov 2023 03:27:40 -0500
Subject: [PATCH 10/12] that too
---
.../modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 19df85997da93..8a7fe5678dda2 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
@@ -59,7 +59,7 @@
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
)
result = /obj/item/reagent_containers/food/snacks/eggwrap
- category = CAT_EGG
+ subcategory = CAT_EGG
/datum/crafting_recipe/food/chawanmushi
name = "Chawanmushi"
@@ -70,4 +70,4 @@
/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
)
result = /obj/item/reagent_containers/food/snacks/chawanmushi
- category = CAT_EGG
+ subcategory = CAT_EGG
From a5bead5966e0783b70cfdc0ee910bca9df748f3d Mon Sep 17 00:00:00 2001
From: RKz
Date: Fri, 15 Dec 2023 11:38:03 -0500
Subject: [PATCH 11/12] psyphoza fixes
---
beestation.dme | 1 -
code/controllers/subsystem/traumas.dm | 6 +++---
code/game/objects/items/food/meatslab.dm | 14 ++++++++++++++
.../carbon/human/species_types/psyphoza.dm | 6 +++---
icons/obj/food/meat.dmi | Bin 27982 -> 30386 bytes
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/beestation.dme b/beestation.dme
index ae127d4b919e5..f03aa4a501ef3 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -2574,7 +2574,6 @@
#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\kitchen_machinery\deep_fryer.dm"
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/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index f82cd636b5bbd..f41c171d67c9c 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -140,6 +140,14 @@
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 ////////////////////////////////////////////////////////
@@ -535,6 +543,12 @@
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"
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/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi
index 606a55dde46898a18e24101a6df16a53750c2cc8..bb6ccb235f4c3e60066b005bc1c9c8de3d43b301 100644
GIT binary patch
literal 30386
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