diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index 7cbbaf16f80..1db3a2b78d4 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -26,7 +26,7 @@ /area/icemoon/underground/explored) "cj" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/fishandchips, +/obj/item/food/fishandchips, /turf/open/floor/plasteel/checker, /area/ruin/powered) "cB" = ( @@ -46,7 +46,7 @@ /area/ruin/powered) "gG" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/sashimi{ +/obj/item/food/sashimi{ pixel_y = 10 }, /obj/item/reagent_containers/food/drinks/mug/coco{ @@ -182,9 +182,9 @@ /area/ruin/powered) "rC" = ( /obj/structure/closet/secure_closet/freezer, -/obj/item/reagent_containers/food/snacks/carpmeat, -/obj/item/reagent_containers/food/snacks/carpmeat, -/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/food/carpmeat, +/obj/item/food/carpmeat, +/obj/item/food/carpmeat, /obj/item/reagent_containers/food/condiment/pack/ketchup, /obj/item/reagent_containers/food/condiment/pack/ketchup, /obj/item/reagent_containers/food/condiment/pack/ketchup, @@ -304,9 +304,9 @@ /obj/item/reagent_containers/glass/bottle/curare, /obj/item/kitchen/knife/combat/survival, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat/slab/human, -/obj/item/reagent_containers/food/snacks/meat/slab/human, -/obj/item/reagent_containers/food/snacks/meat/slab/human, +/obj/item/food/meat/slab/human, +/obj/item/food/meat/slab/human, +/obj/item/food/meat/slab/human, /turf/open/floor/wood, /area/ruin/powered) "Bq" = ( @@ -531,7 +531,7 @@ "UI" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/blood, -/obj/item/reagent_containers/food/snacks/meat/slab/corgi, +/obj/item/food/meat/slab/corgi, /turf/open/floor/wood, /area/ruin/powered) "Vn" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 53c53384048..455c521facb 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -286,12 +286,12 @@ /obj/structure/closet/secure_closet/freezer/meat{ req_access = null }, -/obj/item/reagent_containers/food/snacks/meat/rawbacon, -/obj/item/reagent_containers/food/snacks/meat/rawbacon, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet, -/obj/item/reagent_containers/food/snacks/meat/rawcrab, -/obj/item/reagent_containers/food/snacks/meat/rawcrab, +/obj/item/food/meat/rawbacon, +/obj/item/food/meat/rawbacon, +/obj/item/food/meat/rawcutlet, +/obj/item/food/meat/rawcutlet, +/obj/item/food/meat/rawcrab, +/obj/item/food/meat/rawcrab, /turf/open/floor/wood, /area/ruin/powered/beach) "de" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 1d94954d348..b4eb4db2e6f 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -62,7 +62,7 @@ /area/ruin/unpowered/no_grav) "an" = ( /obj/structure/fluff/bus/passable/seat, -/obj/item/reagent_containers/food/snacks/meatball, +/obj/item/food/meatball, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" }, @@ -83,7 +83,7 @@ /area/ruin/unpowered/no_grav) "aq" = ( /obj/structure/fluff/bus/passable/seat, -/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" @@ -146,9 +146,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" }, @@ -170,7 +170,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" }, @@ -242,7 +242,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" = ( @@ -266,7 +266,7 @@ "aU" = ( /obj/structure/fluff/bus/passable/seat, /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" }, @@ -297,7 +297,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 78d87a681ba..3eacfa8d243 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -117,8 +117,8 @@ "aC" = ( /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 }, @@ -127,8 +127,8 @@ "aD" = ( /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 }, @@ -393,8 +393,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, /turf/open/floor/plating, /area/awaymission/bmpship/aft) @@ -499,7 +499,7 @@ /obj/structure/table, /obj/item/kitchen/knife/butcher, /obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/snacks/meat/slab/human, +/obj/item/food/meat/slab/human, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -738,8 +738,8 @@ /area/awaymission/bmpship/aft) "cS" = ( /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) "cT" = ( @@ -1511,7 +1511,7 @@ /area/awaymission/bmpship/fore) "fO" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat/slab/human, +/obj/item/food/meat/slab/human, /turf/open/floor/plasteel/showroomfloor, /area/awaymission/bmpship/aft) "fP" = ( diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm index 15544987db4..c936d1da052 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) "p" = ( diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index 30faa5f25b8..9bbfb2b449b 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -317,7 +317,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" }, @@ -704,7 +704,7 @@ "bX" = ( /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" }, @@ -875,35 +875,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" }, diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index f8dab95aae7..7ba5fce9c8b 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -150,7 +150,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, @@ -262,7 +262,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 67cd6eb95d8..c38cfeeefc0 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -2247,39 +2247,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/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index e8bc0fa0bce..d53afb0f2b6 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -3235,7 +3235,7 @@ /turf/open/floor/plating/asteroid/snow, /area/awaymission/academy/academycellar) "mU" = ( -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/meat/slab, /turf/open/floor/plating/asteroid/snow, /area/awaymission/academy/academycellar) "mV" = ( diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 2ddf40d0296..0b791826670 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -845,10 +845,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" = ( @@ -1290,8 +1290,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/carpmeat, +/obj/item/food/carpmeat, /turf/open/floor/plating/ice/smooth, /area/awaymission/cabin/snowforest) "eb" = ( @@ -2538,7 +2538,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/item/reagent_containers/food/snacks/egg/rainbow{ +/obj/item/food/egg/rainbow{ anchored = 0; desc = "Was an egg really worth this much effort?"; name = "easter egg" diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 032492a31ec..c0e375d268f 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -781,11 +781,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" = ( @@ -880,7 +880,7 @@ /area/awaymission/beach) "cM" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/chips, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "cN" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 48658e4cfb3..f8a20dcdf45 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -5691,10 +5691,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; temperature = 273.15 diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index 8105a180f17..61c607cb177 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -536,7 +536,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, /area/awaymission/spacebattle/cruiser) "cD" = ( @@ -618,7 +618,7 @@ /area/awaymission/spacebattle/cruiser) "cV" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/soup/stew, +/obj/item/food/soup/stew, /turf/open/floor/plasteel/cafeteria, /area/awaymission/spacebattle/cruiser) "cW" = ( diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index f9ac85ee7ac..a861d5b1852 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -1752,10 +1752,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/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 1acf3e83afe..aad06d1a5ec 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -359,11 +359,11 @@ /area/awaymission/wildwest/mines) "bN" = ( /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/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, +/obj/item/food/meat/slab/synthmeat, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -730,7 +730,7 @@ /area/awaymission/wildwest/gov) "cV" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/soup/monkeysdelight, +/obj/item/food/soup/monkeysdelight, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -744,7 +744,7 @@ /area/awaymission/wildwest/gov) "cX" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/soup/stew, +/obj/item/food/soup/stew, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d9dbed4a56f..39d622c7981 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3386,11 +3386,11 @@ "ajN" = ( /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/maintenance/starboard/fore) @@ -6446,7 +6446,7 @@ /area/security/checkpoint/customs) "aqm" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/chips, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) "aqn" = ( @@ -20170,7 +20170,7 @@ /area/crew_quarters/bar/atrium) "aQt" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/food/cheesiehonkers, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -22968,7 +22968,7 @@ /area/crew_quarters/bar/atrium) "aVr" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/chips, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -112081,8 +112081,8 @@ /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/onion, /obj/item/reagent_containers/food/snacks/grown/onion, -/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, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, /obj/structure/sign/poster/ripped{ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7848e548ba1..30679135578 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1325,9 +1325,9 @@ /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/onion, /obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain, +/obj/item/food/meat/rawcutlet/plain, +/obj/item/food/meat/rawcutlet/plain, +/obj/item/food/meat/rawcutlet/plain, /turf/open/floor/plasteel/white, /area/security/prison) "acZ" = ( @@ -5128,7 +5128,7 @@ /area/security/brig) "akP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/energybar, +/obj/item/food/energybar, /turf/open/floor/plasteel, /area/security/prison) "akQ" = ( @@ -8077,8 +8077,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" = ( @@ -17220,7 +17220,7 @@ /area/hydroponics) "aMO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/chips, /obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/carpet, /area/hallway/secondary/entry) diff --git a/_maps/map_files/Mafia/mafia_spiderclan.dmm b/_maps/map_files/Mafia/mafia_spiderclan.dmm index 89771212b8e..4a7fdd1dfad 100644 --- a/_maps/map_files/Mafia/mafia_spiderclan.dmm +++ b/_maps/map_files/Mafia/mafia_spiderclan.dmm @@ -6,7 +6,7 @@ /obj/structure/closet/cabinet{ anchored = 1 }, -/obj/item/reagent_containers/food/snacks/sashimi, +/obj/item/food/sashimi, /turf/open/floor/carpet/black, /area/mafia) "c" = ( @@ -64,7 +64,7 @@ /obj/structure/closet/cabinet{ anchored = 1 }, -/obj/item/reagent_containers/food/snacks/sashimi, +/obj/item/food/sashimi, /turf/open/floor/wood, /area/mafia) "p" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 3e397372be6..cdb5968d757 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -8409,9 +8409,9 @@ /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/onion, /obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain, -/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain, +/obj/item/food/meat/rawcutlet/plain, +/obj/item/food/meat/rawcutlet/plain, +/obj/item/food/meat/rawcutlet/plain, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -27684,7 +27684,7 @@ /area/hallway/primary/starboard) "bnd" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/chips, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ dir = 1 }, @@ -65674,7 +65674,7 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "eMU" = ( -/obj/item/reagent_containers/food/snacks/snowcones/clown, +/obj/item/food/snowcones/clown, /turf/open/floor/grass/snow/safe, /area/maintenance/port/aft) "eNA" = ( @@ -75683,7 +75683,7 @@ dir = 4; network = list("ss13","prison") }, -/obj/item/reagent_containers/food/snacks/energybar, +/obj/item/food/energybar, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index b6e12653db1..89a77a3b625 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -14469,7 +14469,7 @@ /area/storage/art) "aLA" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/friedegg, +/obj/item/food/friedegg, /obj/item/kitchen/fork, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/cafeteria) @@ -20562,7 +20562,7 @@ name = "Hydroponics Desk"; req_access_txt = "35" }, -/obj/item/reagent_containers/food/snacks/monkeycube, +/obj/item/food/monkeycube, /turf/open/floor/plasteel/dark, /area/hydroponics) "bce" = ( @@ -45939,7 +45939,7 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "dWk" = ( -/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/food/meat/slab/monkey, /turf/open/floor/plating, /area/maintenance/department/engine) "dWp" = ( @@ -55963,7 +55963,7 @@ /area/medical/storage) "sij" = ( /obj/structure/closet, -/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/food/meat/slab/monkey, /turf/open/floor/plating, /area/maintenance/department/engine) "siF" = ( @@ -56149,7 +56149,7 @@ /area/hallway/primary/central) "sww" = ( /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/maintenance/department/engine) "swE" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2e7c4ce1e00..bda832577ed 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2010,7 +2010,7 @@ /turf/open/floor/plasteel, /area/tdome/arena_source) "fR" = ( -/obj/item/reagent_containers/food/snacks/egg/rainbow{ +/obj/item/food/egg/rainbow{ desc = "I bet you think you're pretty clever... well you are."; name = "easter egg" }, @@ -8452,7 +8452,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/syndicake{ pixel_y = 3 }, /turf/open/floor/plasteel, @@ -10886,7 +10886,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" = ( @@ -11185,7 +11185,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) "zs" = ( @@ -11415,11 +11415,11 @@ /area/holodeck/rec_center/basketball) "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/carpmeat, +/obj/item/food/carpmeat, +/obj/item/food/carpmeat, +/obj/item/food/carpmeat, +/obj/item/food/carpmeat, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "zW" = ( @@ -11696,7 +11696,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" = ( @@ -11914,7 +11914,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) "Bl" = ( @@ -13942,7 +13942,7 @@ /area/centcom/holding) "Fe" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/sashimi, +/obj/item/food/sashimi, /turf/open/floor/wood, /area/centcom/holding) "Ff" = ( @@ -14522,27 +14522,27 @@ /area/tdome/tdomeobserve) "GF" = ( /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/carpmeat, +/obj/item/food/carpmeat, +/obj/item/food/carpmeat, +/obj/item/food/carpmeat, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -14625,23 +14625,23 @@ /area/tdome/tdomeobserve) "GJ" = ( /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, /obj/item/food/spaghetti, -/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{ dir = 1 }, @@ -15139,7 +15139,7 @@ /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) "HG" = ( -/obj/item/reagent_containers/food/snacks/egg/rainbow{ +/obj/item/food/egg/rainbow{ desc = "I bet you think you're pretty clever... well you are."; name = "easter egg" }, diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm index af81ca87d29..f579287cffc 100644 --- a/_maps/shuttles/emergency_cruise.dmm +++ b/_maps/shuttles/emergency_cruise.dmm @@ -739,7 +739,7 @@ /area/shuttle/escape) "wf" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/salad/fruit{ +/obj/item/food/salad/fruit{ pixel_y = 4 }, /turf/open/floor/wood, @@ -897,7 +897,7 @@ /area/shuttle/escape) "Dq" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/salad/jungle{ +/obj/item/food/salad/jungle{ pixel_y = 4 }, /turf/open/floor/wood, diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index fc42a74d007..252a1e41e66 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -155,7 +155,7 @@ /turf/open/floor/carpet/cyan, /area/shuttle/escape/luxury) "aC" = ( -/obj/item/reagent_containers/food/snacks/enchiladas{ +/obj/item/food/enchiladas{ pixel_y = 3 }, /obj/structure/table/wood/fancy/black, @@ -169,7 +169,7 @@ /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aE" = ( -/obj/item/reagent_containers/food/snacks/benedict{ +/obj/item/food/benedict{ pixel_y = 1 }, /obj/structure/table/wood/fancy/black, @@ -183,7 +183,7 @@ /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aG" = ( -/obj/item/reagent_containers/food/snacks/eggplantparm{ +/obj/item/food/eggplantparm{ pixel_y = 3 }, /obj/structure/table/wood/fancy/black, @@ -218,7 +218,7 @@ /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aL" = ( -/obj/item/reagent_containers/food/snacks/notasandwich{ +/obj/item/food/notasandwich{ pixel_y = 11 }, /obj/structure/table/wood/fancy/black, @@ -253,7 +253,7 @@ /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aQ" = ( -/obj/item/reagent_containers/food/snacks/bearsteak{ +/obj/item/food/bearsteak{ pixel_y = 6 }, /obj/structure/table/wood/fancy/black, @@ -281,14 +281,14 @@ /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aU" = ( -/obj/item/reagent_containers/food/snacks/kebab/tofu{ +/obj/item/food/kebab/tofu{ pixel_y = 6 }, /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aV" = ( -/obj/item/reagent_containers/food/snacks/honkdae{ +/obj/item/food/honkdae{ pixel_y = 8 }, /obj/structure/table/wood/fancy/black, @@ -302,14 +302,14 @@ /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aX" = ( -/obj/item/reagent_containers/food/snacks/grilledcheese{ +/obj/item/food/grilledcheese{ pixel_y = 11 }, /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aY" = ( -/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry{ +/obj/item/food/jelliedtoast/cherry{ pixel_y = 6 }, /obj/structure/table/wood/fancy/black, diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm index 1b76b0d425f..cab899bc65b 100644 --- a/_maps/shuttles/emergency_nature.dmm +++ b/_maps/shuttles/emergency_nature.dmm @@ -409,7 +409,7 @@ dir = 5 }, /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/soup/monkeysdelight{ +/obj/item/food/soup/monkeysdelight{ pixel_y = 4 }, /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy{ @@ -885,7 +885,7 @@ pixel_y = 10; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/monkeycube{ +/obj/item/food/monkeycube{ pixel_x = 5 }, /obj/item/paicard{ diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index 6448621a4e8..a5ed4f46135 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/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/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index d2579d1eec0..f3091fd41fe 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -350,7 +350,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/machinery/power/apc{ dir = 1; diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index f5499266c45..8893603e158 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -227,12 +227,12 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/turf_decal/bot_white, /obj/structure/closet/crate, -/obj/item/reagent_containers/food/snacks/candy{ +/obj/item/food/candy{ pixel_x = -3; pixel_y = 1 }, -/obj/item/reagent_containers/food/snacks/candy, -/obj/item/reagent_containers/food/snacks/candy{ +/obj/item/food/candy, +/obj/item/food/candy{ pixel_x = 3; pixel_y = -1 }, @@ -914,13 +914,13 @@ 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 }, /obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/food/sandwich, /obj/structure/spider/stickyweb, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 42460eb49cc..5dc3224d595 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -1817,13 +1817,13 @@ 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 }, /obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/food/sandwich, /obj/effect/turf_decal/trimline/white/filled/line{ dir = 1; icon_state = "trimline_fill" diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index c0dddc1aacf..357b6eae9f7 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -2146,12 +2146,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/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index f86b546af94..1aa647e95a9 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1386,13 +1386,13 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /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/reagent_containers/food/snacks/pizza, /obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/soup, + /obj/item/food/salad, + /obj/item/food/meat, + /obj/item/food/meat/slab, + /obj/item/food/soup, /obj/item/reagent_containers/food/snacks/grown, /obj/item/reagent_containers/food/snacks/grown/mushroom, /obj/item/food/deepfryholder, diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index fdcf4c68f8c..5a4ae9fa928 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -231,7 +231,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/storage/box/donkpockets/donkpocketberry = 1, /obj/item/storage/box/donkpockets/donkpockethonk = 1, ) = 1, - /obj/item/reagent_containers/food/snacks/monkeycube = 1, + /obj/item/food/monkeycube = 1, ) = 8, list(//fakeout items, keep this list at low relative weight diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 9ecec42a562..4f0ad511edd 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -67,17 +67,17 @@ SUBSYSTEM_DEF(traumas) "clowns" = typecacheof(list(/obj/item/clothing/under/rank/civilian/clown, /obj/item/clothing/shoes/clown_shoes, /obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn, - /obj/item/pda/clown, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/cheesiehonkers, + /obj/item/pda/clown, /obj/item/grown/bananapeel, /obj/item/food/cheesiehonkers, /obj/item/trash/cheesie)), "greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod, /obj/item/spear, /obj/item/clothing/mask/gas)), - "lizards" = typecacheof(list(/obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail, /obj/item/organ/tail/lizard, + "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, /obj/item/clothing/head/lizard, /obj/item/clothing/shoes/cowboy/lizard)), "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, @@ -139,7 +139,7 @@ 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, + "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/structure/window/paperframe, /obj/structure/mineral_door/paperframe)), diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index b65655c1da3..38e2f977a01 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -53,6 +53,7 @@ Behavior that's still missing from this component that original food items had t list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, microwaved_type, + junkiness, datum/callback/after_eat, datum/callback/on_consume) @@ -340,7 +341,7 @@ Behavior that's still missing from this component that original food items had t //Invoke our after eat callback if it is valid if(after_eat) - after_eat.Invoke(eater, feeder) + after_eat.Invoke(eater, feeder, bitecount) return TRUE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1d29e89dafb..b304a4a5972 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1223,10 +1223,14 @@ for(var/i = 1 to chosen_option[TOOL_PROCESSING_AMOUNT]) var/atom/created_atom = new atom_to_create(loc) SEND_SIGNAL(created_atom, COMSIG_ATOM_CREATEDBY_PROCESSING, src, chosen_option) + created_atom.OnCreatedFromProcessing(user, I, chosen_option, src) to_chat(user, "You manage to create [chosen_option[TOOL_PROCESSING_AMOUNT]] [initial(atom_to_create.name)] from [src]") qdel(src) return +/atom/proc/OnCreatedFromProcessing(mob/living/user, obj/item/I, list/chosen_option, atom/original_atom) + return + //! Tool-specific behavior procs. /// @@ -1561,7 +1565,7 @@ /** * Recursive getter method to return a list of all ghosts orbitting this atom - * + * * This will work fine without manually passing arguments. */ /atom/proc/get_all_orbiters(list/processed, source = TRUE) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 30f38889ccb..882c3a8507d 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -290,13 +290,13 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event hits = 2 heavy = TRUE 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() 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)) @@ -322,7 +322,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() diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index b1a6cf48c8b..d14f822d3bc 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -217,7 +217,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 4bf686faeb2..668506d5eeb 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -182,7 +182,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/sheetifier.dm b/code/game/machinery/sheetifier.dm index 3d7299e8321..00c24a9a065 100644 --- a/code/game/machinery/sheetifier.dm +++ b/code/game/machinery/sheetifier.dm @@ -13,7 +13,7 @@ /obj/machinery/sheetifier/Initialize() . = ..() - AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials)) + AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/food/meat/slab, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials)) /obj/machinery/sheetifier/update_overlays() . = ..() diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 92d07427b4d..da476874229 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -234,7 +234,7 @@ GLOBAL_LIST_INIT(dye_registry, list( qdel(src) /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) /mob/living/simple_animal/pet/machine_wash(obj/machinery/washing_machine/WM) diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index 70213a24435..fd74583b250 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -18,7 +18,7 @@ items = list( /obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken, - /obj/item/reagent_containers/food/snacks/egg) + /obj/item/food/egg) /obj/effect/spawner/bundle/costume/gladiator name = "gladiator costume spawner" diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index feb5e70eca3..51b5b220e0a 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -215,22 +215,22 @@ lootcount = 3 lootdoubles = FALSE var/soups = list( - /obj/item/reagent_containers/food/snacks/soup/beet, - /obj/item/reagent_containers/food/snacks/soup/sweetpotato, - /obj/item/reagent_containers/food/snacks/soup/stew, - /obj/item/reagent_containers/food/snacks/soup/hotchili, - /obj/item/reagent_containers/food/snacks/soup/nettle, - /obj/item/reagent_containers/food/snacks/soup/meatball) + /obj/item/food/soup/beet, + /obj/item/food/soup/sweetpotato, + /obj/item/food/soup/stew, + /obj/item/food/soup/hotchili, + /obj/item/food/soup/nettle, + /obj/item/food/soup/meatball) var/salads = list( - /obj/item/reagent_containers/food/snacks/salad/herbsalad, - /obj/item/reagent_containers/food/snacks/salad/validsalad, - /obj/item/reagent_containers/food/snacks/salad/fruit, - /obj/item/reagent_containers/food/snacks/salad/jungle, - /obj/item/reagent_containers/food/snacks/salad/aesirsalad) + /obj/item/food/salad/herbsalad, + /obj/item/food/salad/validsalad, + /obj/item/food/salad/fruit, + /obj/item/food/salad/jungle, + /obj/item/food/salad/aesirsalad) var/mains = list( - /obj/item/reagent_containers/food/snacks/bearsteak, - /obj/item/reagent_containers/food/snacks/enchiladas, - /obj/item/reagent_containers/food/snacks/stewedsoymeat, + /obj/item/food/bearsteak, + /obj/item/food/enchiladas, + /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/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 99f95c0d2b3..57bb55e13c6 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -438,12 +438,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_off = "candyoff" //make sure to add positional sprites in icons/obj/cigarettes.dmi if you add more. inhand_icon_state = "candyoff" icon_state = "candyoff" - type_butt = /obj/item/reagent_containers/food/snacks/candy_trash + type_butt = /obj/item/food/candy_trash list_reagents = list(/datum/reagent/consumable/sugar = 10, /datum/reagent/consumable/caramel = 10) /obj/item/clothing/mask/cigarette/candy/nicotine desc = "For all ages*! Doesn't contain any* amount of nicotine. Health and safety risks can be read on the tip of the cigarette." - type_butt = /obj/item/reagent_containers/food/snacks/candy_trash/nicotine + type_butt = /obj/item/food/candy_trash/nicotine list_reagents = list(/datum/reagent/consumable/sugar = 10, /datum/reagent/consumable/caramel = 10, /datum/reagent/drug/nicotine = 20) //oh no! smoke_all = TRUE //timmy's not getting out of this one diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm index 3f92e4aab1b..c16361eb7ac 100644 --- a/code/game/objects/items/food/_food.dm +++ b/code/game/objects/items/food/_food.dm @@ -4,6 +4,12 @@ desc = "you eat this" resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_NORMAL + icon = 'icons/obj/food/food.dmi' + icon_state = null + lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + obj_flags = UNIQUE_RENAME + grind_results = list() ///List of reagents this food gets on creation var/list/food_reagents ///Extra flags for things such as if the food is in a container or not @@ -24,6 +30,8 @@ var/microwaved_type ///Type of atom thats spawned after eating this item var/trash_type + ///How much junkiness this food has? God I should remove junkiness soon + var/junkiness /obj/item/food/Initialize() . = ..() @@ -48,7 +56,8 @@ tastes = tastes,\ eatverbs = eatverbs,\ bite_consumption = bite_consumption,\ - microwaved_type = microwaved_type) + microwaved_type = microwaved_type,\ + junkiness = junkiness) ///This proc handles processable elements, overwrite this if you want to add behavior such as slicing, forking, spooning, whatever, to turn the item into something else diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index 3de0a2e64d4..f7ddeb99b69 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -36,7 +36,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/modules/food_and_drinks/food/snacks_egg.dm b/code/game/objects/items/food/egg.dm similarity index 56% rename from code/modules/food_and_drinks/food/snacks_egg.dm rename to code/game/objects/items/food/egg.dm index d7d25f90603..897fdb9588f 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/game/objects/items/food/egg.dm @@ -1,40 +1,34 @@ ////////////////////////////////////////////EGGS//////////////////////////////////////////// -/obj/item/reagent_containers/food/snacks/chocolateegg +/obj/item/food/chocolateegg name = "chocolate egg" desc = "Such, sweet, fattening food." icon_state = "chocolateegg" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) - filling_color = "#A0522D" + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("chocolate" = 4, "sweetness" = 1) - foodtype = JUNKFOOD | SUGAR - value = FOOD_JUNK + foodtypes = JUNKFOOD | SUGAR -/obj/item/reagent_containers/food/snacks/egg +/obj/item/food/egg name = "egg" desc = "An egg!" icon_state = "egg" - list_reagents = list(/datum/reagent/consumable/eggyolk = 5) - cooked_type = /obj/item/reagent_containers/food/snacks/boiledegg - filling_color = "#F0E68C" - foodtype = MEAT - grind_results = list() + food_reagents = list(/datum/reagent/consumable/eggyolk = 5) + microwaved_type = /obj/item/food/boiledegg + foodtypes = MEAT var/static/chick_count = 0 //I copied this from the chicken_count (note the "en" in there) variable from chicken code. - value = FOOD_JUNK -/obj/item/reagent_containers/food/snacks/egg/gland +/obj/item/food/egg/gland desc = "An egg! It looks weird..." -/obj/item/reagent_containers/food/snacks/egg/gland/Initialize() +/obj/item/food/egg/gland/Initialize() . = ..() reagents.add_reagent(get_random_reagent_id(), 15) var/color = mix_color_from_reagents(reagents.reagent_list) add_atom_colour(color, FIXED_COLOUR_PRIORITY) -/obj/item/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) +/obj/item/food/egg/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(!..()) //was it caught by a mob? var/turf/T = get_turf(hit_atom) new /obj/effect/decal/cleanable/food/egg_smudge(T) @@ -45,7 +39,7 @@ reagents.expose(hit_atom, TOUCH) qdel(src) -/obj/item/reagent_containers/food/snacks/egg/attackby(obj/item/W, mob/user, params) +/obj/item/food/egg/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/toy/crayon)) var/obj/item/toy/crayon/C = W var/clr = C.crayon_color @@ -64,68 +58,59 @@ else ..() -/obj/item/reagent_containers/food/snacks/egg/blue +/obj/item/food/egg/blue icon_state = "egg-blue" -/obj/item/reagent_containers/food/snacks/egg/green +/obj/item/food/egg/green icon_state = "egg-green" -/obj/item/reagent_containers/food/snacks/egg/mime +/obj/item/food/egg/mime icon_state = "egg-mime" -/obj/item/reagent_containers/food/snacks/egg/orange +/obj/item/food/egg/orange icon_state = "egg-orange" -/obj/item/reagent_containers/food/snacks/egg/purple +/obj/item/food/egg/purple icon_state = "egg-purple" -/obj/item/reagent_containers/food/snacks/egg/rainbow +/obj/item/food/egg/rainbow icon_state = "egg-rainbow" -/obj/item/reagent_containers/food/snacks/egg/red +/obj/item/food/egg/red icon_state = "egg-red" -/obj/item/reagent_containers/food/snacks/egg/yellow +/obj/item/food/egg/yellow icon_state = "egg-yellow" -/obj/item/reagent_containers/food/snacks/friedegg +/obj/item/food/friedegg name = "fried egg" desc = "A fried egg, with a touch of salt and pepper." icon_state = "friedegg" - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1) - bitesize = 1 - filling_color = "#FFFFF0" - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 4) + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 1) + bite_consumption = 1 tastes = list("egg" = 4, "salt" = 1, "pepper" = 1) - foodtype = MEAT | FRIED | BREAKFAST - value = FOOD_FAST + foodtypes = MEAT | FRIED | BREAKFAST -/obj/item/reagent_containers/food/snacks/boiledegg +/obj/item/food/boiledegg name = "boiled egg" desc = "A hard boiled egg." icon_state = "egg" - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - filling_color = "#FFFFF0" - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("egg" = 1) - foodtype = MEAT | BREAKFAST - value = FOOD_JUNK + foodtypes = MEAT | BREAKFAST -/obj/item/reagent_containers/food/snacks/omelette //FUCK THIS +/obj/item/food/omelette //FUCK THIS name = "omelette du fromage" desc = "That's all you can say!" icon_state = "omelette" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 1) - - bitesize = 1 + trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 3) + bite_consumption = 1 w_class = WEIGHT_CLASS_NORMAL tastes = list("egg" = 1, "cheese" = 1) - foodtype = MEAT | BREAKFAST | DAIRY - value = FOOD_RARE + foodtypes = MEAT | BREAKFAST | DAIRY -/obj/item/reagent_containers/food/snacks/omelette/attackby(obj/item/W, mob/user, params) +/obj/item/food/omelette/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/kitchen/fork)) var/obj/item/kitchen/fork/F = W if(F.forkload) @@ -143,14 +128,12 @@ return ..() -/obj/item/reagent_containers/food/snacks/benedict +/obj/item/food/benedict name = "eggs benedict" desc = "There is only one egg on this, how rude." icon_state = "benedict" - bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nutriment/protein = 2) - trash = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment = 3) + trash_type = /obj/item/trash/plate w_class = WEIGHT_CLASS_NORMAL - list_reagents = list(/datum/reagent/consumable/nutriment = 3,/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) - foodtype = MEAT | BREAKFAST | GRAIN - value = FOOD_EXOTIC + foodtypes = MEAT | BREAKFAST | GRAIN diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm new file mode 100644 index 00000000000..dff59b3458b --- /dev/null +++ b/code/game/objects/items/food/frozen.dm @@ -0,0 +1,278 @@ +/obj/item/food/icecreamsandwich + name = "icecream sandwich" + desc = "Portable Ice-cream in its own packaging." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "icecreamsandwich" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/ice = 4) + tastes = list("ice cream" = 1) + foodtypes = GRAIN | DAIRY | SUGAR + +/obj/item/food/strawberryicecreamsandwich + name = "strawberry ice cream sandwich" + desc = "Portable ice-cream in its own packaging of the strawberry variety." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "strawberryicecreamsandwich" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/ice = 4) + tastes = list("ice cream" = 2, "berry" = 2) + foodtypes = FRUIT | DAIRY | SUGAR + + +/obj/item/food/spacefreezy + name = "space freezy" + desc = "The best icecream in space." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "spacefreezy" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("blue cherries" = 2, "ice cream" = 2) + foodtypes = FRUIT | DAIRY | SUGAR + +/obj/item/food/sundae + name = "sundae" + desc = "A classic dessert." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "sundae" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("ice cream" = 1, "banana" = 1) + foodtypes = FRUIT | DAIRY | SUGAR + +/obj/item/food/honkdae + name = "honkdae" + desc = "The clown's favorite dessert." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "honkdae" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 10, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) + foodtypes = FRUIT | DAIRY | SUGAR + +///////////// +//SNOWCONES// +///////////// + +/obj/item/food/snowcones //We use this as a base for all other snowcones + name = "flavorless snowcone" + desc = "It's just shaved ice. Still fun to chew on." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "flavorless_sc" + trash_type = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups + food_reagents = list(/datum/reagent/water = 11) // We dont get food for water/juices + tastes = list("ice" = 1, "water" = 1) + foodtypes = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit + +/obj/item/food/snowcones/lime + name = "lime snowcone" + desc = "Lime syrup drizzled over a snowball in a paper cup." + icon_state = "lime_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/limejuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "limes" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/lemon + name = "lemon snowcone" + desc = "Lemon syrup drizzled over a snowball in a paper cup." + icon_state = "lemon_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "lemons" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/apple + name = "apple snowcone" + desc = "Apple syrup drizzled over a snowball in a paper cup." + icon_state = "amber_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/applejuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "apples" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/grape + name = "grape snowcone" + desc = "Grape syrup drizzled over a snowball in a paper cup." + icon_state = "grape_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/grapejuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "grape" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/orange + name = "orange snowcone" + desc = "Orange syrup drizzled over a snowball in a paper cup." + icon_state = "orange_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/orangejuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "orange" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/blue + name = "bluecherry snowcone" + desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!" + icon_state = "blue_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "blue" = 5, "cherries" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/red + name = "cherry snowcone" + desc = "Cherry syrup drizzled over a snowball in a paper cup." + icon_state = "red_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "red" = 5, "cherries" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/berry + name = "berry snowcone" + desc = "Berry syrup drizzled over a snowball in a paper cup." + icon_state = "berry_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/berryjuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "berries" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/fruitsalad + name = "fruit salad snowcone" + desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup." + icon_state = "fruitsalad_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/orangejuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5) + foodtypes = FRUIT + +/obj/item/food/snowcones/pineapple + name = "pineapple snowcone" + desc = "Pineapple syrup drizzled over a snowball in a paper cup." + icon_state = "pineapple_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pineapplejuice = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "pineapples" = 5) + foodtypes = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy + +/obj/item/food/snowcones/mime + name = "mime snowcone" + desc = "..." + icon_state = "mime_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nothing = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "nothing" = 5) + +/obj/item/food/snowcones/clown + name = "clown snowcone" + desc = "Laughter drizzled over a snowball in a paper cup." + icon_state = "clown_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/laughter = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "jokes" = 5, "brainfreeze" = 5, "joy" = 5) + +/obj/item/food/snowcones/soda + name = "space cola snowcone" + desc = "Space Cola drizzled over a snowball in a paper cup." + icon_state = "soda_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/space_cola = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "cola" = 5) + +/obj/item/food/snowcones/spacemountainwind + name = "Space Mountain Wind snowcone" + desc = "Space Mountain Wind drizzled over a snowball in a paper cup." + icon_state = "mountainwind_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5) + + +/obj/item/food/snowcones/pwrgame + name = "pwrgame snowcone" + desc = "Pwrgame soda drizzled over a snowball in a paper cup." + icon_state = "pwrgame_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pwr_game = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5) + +/obj/item/food/snowcones/honey + name = "honey snowcone" + desc = "Honey drizzled over a snowball in a paper cup." + icon_state = "amber_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/honey = 5, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "flowers" = 5, "sweetness" = 5, "wax" = 1) + +/obj/item/food/snowcones/rainbow + name = "rainbow snowcone" + desc = "A very colorful snowball in a paper cup." + icon_state = "rainbow_sc" + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/laughter = 25, /datum/reagent/water = 11) + tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3) + +/obj/item/food/popsicle + name = "bug popsicle" + desc = "Mmmm, this should not exist." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "popsicle_stick_s" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) + tastes = list("beetlejuice") + trash_type = /obj/item/popsicle_stick + w_class = WEIGHT_CLASS_SMALL + var/overlay_state = "creamsicle_o" //This is the edible part of the popsicle. + var/bite_states = 4 //This value value is used for correctly setting the bite_consumption to ensure every bite changes the sprite. Do not set to zero. + var/bitecount = 0 + foodtypes = DAIRY | SUGAR + +/obj/item/food/popsicle/Initialize() + . = ..() + bite_consumption = reagents.total_volume / bite_states + +/obj/item/food/popsicle/MakeEdible() + AddComponent(/datum/component/edible,\ + initial_reagents = food_reagents,\ + food_flags = food_flags,\ + foodtypes = foodtypes,\ + volume = max_volume,\ + eat_time = eat_time,\ + tastes = tastes,\ + eatverbs = eatverbs,\ + bite_consumption = bite_consumption,\ + microwaved_type = microwaved_type,\ + junkiness = junkiness,\ + after_eat = CALLBACK(src, .proc/after_bite)) + + +/obj/item/food/popsicle/update_overlays() + . = ..() + if(bitecount) + . += "[initial(overlay_state)]_[min(bitecount, 3)]" + else + . += initial(overlay_state) + +/obj/item/food/popsicle/proc/after_bite(mob/living/eater, mob/living/feeder, bitecount) + src.bitecount = bitecount + update_icon() + +/obj/item/popsicle_stick + name = "popsicle stick" + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "popsicle_stick" + desc = "This humble little stick usually carries a frozen treat, at the moment it seems freed from this atlassian burden." + custom_materials = list(/datum/material/wood=20) + w_class = WEIGHT_CLASS_TINY + force = 0 + +/obj/item/food/popsicle/creamsicle_orange + name = "orange creamsicle" + desc = "A classic orange creamsicle. A sunny frozen treat." + food_reagents = list(/datum/reagent/consumable/orangejuice = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) + foodtypes = FRUIT | DAIRY | SUGAR + +/obj/item/food/popsicle/creamsicle_berry + name = "berry creamsicle" + desc = "A vibrant berry creamsicle. A berry good frozen treat." + food_reagents = list(/datum/reagent/consumable/berryjuice = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) + overlay_state = "creamsicle_m" + foodtypes = FRUIT | DAIRY | SUGAR + +/obj/item/food/popsicle/jumbo + name = "jumbo icecream" + desc = "A luxurius icecream covered in rich chocolate. It seems smaller than you remember it being." + food_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2) + overlay_state = "jumbo" + +/obj/item/food/popsicle/nogga_black + name = "nogga black" + desc = "A salty licorice icecream recently reintroduced due to all the records of the controversy being lost to time. Those who cannot remember the past are doomed to repeat it." + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4) + tastes = list("salty liquorice") + overlay_state = "nogga_black" + +/obj/item/food/cornuto + name = "cornuto" + w_class = WEIGHT_CLASS_SMALL + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "cornuto" + desc = "A neapolitan vanilla and chocolate icecream cone. It menaces with a sprinkling of caramelized nuts." + tastes = list("chopped hazelnuts", "waffle") + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 2) + foodtypes = DAIRY | SUGAR diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm new file mode 100644 index 00000000000..0467e616530 --- /dev/null +++ b/code/game/objects/items/food/meat.dm @@ -0,0 +1,918 @@ +//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_state = "cubancarp" + trash_type = /obj/item/trash/plate + 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 + +/obj/item/food/carpmeat + name = "carp fillet" + desc = "A fillet of spess carp meat." + icon_state = "fishfillet" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/toxin/carpotoxin = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + bite_consumption = 6 + tastes = list("fish" = 1) + foodtypes = MEAT + eatverbs = list("bite","chew","gnaw","swallow","chomp") + +/obj/item/food/carpmeat/Initialize() + . = ..() + if(!istype(src, /obj/item/food/carpmeat/imitation)) + AddElement(/datum/element/swabable, CELL_LINE_TABLE_CARP, CELL_VIRUS_TABLE_GENERIC_MOB) + +/obj/item/food/carpmeat/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_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 + +/obj/item/food/fishandchips + name = "fish and chips" + desc = "I do say so myself chap." + 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 + +////////////////////////////////////////////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 + +/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_state = "spiderleg" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/toxin = 2) + microwaved_type = /obj/item/food/boiledspiderleg + tastes = list("cobwebs" = 1) + foodtypes = MEAT | TOXIC + +/obj/item/food/cornedbeef + name = "corned beef and cabbage" + desc = "Now you can feel like a real tourist vacationing in Ireland." + icon_state = "cornedbeef" + trash_type = /obj/item/trash/plate + 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 + +/obj/item/food/bearsteak + name = "Filet migrawr" + desc = "Because eating bear wasn't manly enough." + icon_state = "bearsteak" + trash_type = /obj/item/trash/plate + 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 + +/obj/item/food/meatball + name = "meatball" + desc = "A great meal all round. Not a cord of wood." + icon_state = "meatball" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 1) + tastes = list("meat" = 1) + foodtypes = MEAT + +/obj/item/food/sausage + name = "sausage" + desc = "A piece of mixed, long meat." + icon_state = "sausage" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("meat" = 1) + foodtypes = MEAT | BREAKFAST + eatverbs = list("bite","chew","nibble","deep throat","gobble","chomp") + var/roasted = FALSE + +/obj/item/food/sausage/MakeProcessable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 30) + +/obj/item/food/salami + name = "salami" + desc = "A slice of cured salami." + icon_state = "salami" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 1) + tastes = list("meat" = 1, "smoke" = 1) + foodtypes = MEAT + +/obj/item/food/rawkhinkali + name = "raw khinkali" + desc = "One hundred khinkalis? Do I look like a pig?" + 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) + microwaved_type = /obj/item/food/khinkali + tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) + foodtypes = MEAT + +/obj/item/food/khinkali + name = "khinkali" + desc = "One hundred khinkalis? Do I look like a pig?" + 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 + +/obj/item/food/monkeycube + name = "monkey cube" + desc = "Just add water!" + icon_state = "monkeycube" + bite_consumption = 12 + food_reagents = list(/datum/reagent/monkey_powder = 30) + tastes = list("the jungle" = 1, "bananas" = 1) + foodtypes = MEAT | SUGAR + var/faction + var/spawned_mob = /mob/living/carbon/monkey + +/obj/item/food/monkeycube/proc/Expand() + var/mob/spammer = get_mob_by_key(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/suicide_act(mob/living/M) + M.visible_message("[M] is putting [src] in [M.p_their()] mouth! It looks like [M.p_theyre()] trying to commit suicide!") + var/eating_success = do_after(M, 10, TRUE, src, TRUE) + if(QDELETED(M)) //qdeletion: the nuclear option of self-harm + return SHAME + if(!eating_success || QDELETED(src)) //checks if src is gone or if they failed to wait for a second + M.visible_message("[M] chickens out!") + return SHAME + if(HAS_TRAIT(M, TRAIT_NOHUNGER)) //plasmamen don't have saliva/stomach acid + M.visible_message("[M] realizes [M.p_their()] body won't activate [src]!" + ,"Your body won't activate [src]...") + return SHAME + playsound(M, 'sound/items/eatfood.ogg', rand(10,50), TRUE) + M.temporarilyRemoveItemFromInventory(src) //removes from hands, keeps in M + addtimer(CALLBACK(src, .proc/finish_suicide, M), 15) //you've eaten it, you can run now + return MANUAL_SUICIDE + +/obj/item/food/monkeycube/proc/finish_suicide(mob/living/M) ///internal proc called by a monkeycube's suicide_act using a timer and callback. takes as argument the mob/living who activated the suicide + if(QDELETED(M) || QDELETED(src)) + return + if((src.loc != M)) //how the hell did you manage this + to_chat(M, "Something happened to [src]...") + return + Expand() + M.visible_message("[M]'s torso bursts open as a primate emerges!") + M.gib(null, TRUE, null, TRUE) + +/obj/item/food/monkeycube/syndicate + faction = list("neutral", ROLE_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/monkey_powder = 30, /datum/reagent/medicine/strange_reagent = 5) + tastes = list("the jungle" = 1, "bananas" = 1, "jimmies" = 1) + spawned_mob = /mob/living/simple_animal/hostile/gorilla + +/obj/item/food/enchiladas + name = "enchiladas" + desc = "Viva La Mexico!" + 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 + +/obj/item/food/stewedsoymeat + name = "stewed soy meat" + desc = "Even non-vegetarians will LOVE this!" + icon_state = "stewedsoymeat" + trash_type = /obj/item/trash/plate + 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 + +/obj/item/food/stewedsoymeat/Initialize() + . = ..() + + +/obj/item/food/boiledspiderleg + name = "boiled spider leg" + desc = "A giant spider's leg that's still twitching after being cooked. Gross!" + icon_state = "spiderlegcooked" + trash_type = /obj/item/trash/plate + 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 + +/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_state = "spidereggsham" + trash_type = /obj/item/trash/plate + 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 + +/obj/item/food/sashimi + name = "carp sashimi" + desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself." + 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 | TOXIC + +/obj/item/food/sashimi/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_CARP, CELL_VIRUS_TABLE_GENERIC_MOB) + +/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) + tastes = list("\"chicken\"" = 1) + foodtypes = MEAT + +/obj/item/food/nugget/Initialize() + . = ..() + 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_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 + +/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_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 + +/obj/item/food/meatclown + name = "meat clown" + desc = "A delicious, round piece of meat clown. How horrifying." + 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) + +/obj/item/food/meatclown/ComponentInitialize() + . = ..() + AddComponent(/datum/component/slippery, 30) + +//////////////////////////////////////////// KEBABS AND OTHER SKEWERS //////////////////////////////////////////// + +/obj/item/food/kebab + trash_type = /obj/item/stack/rods + icon_state = "kebab" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 14) + tastes = list("meat" = 3, "metal" = 1) + +/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 | GROSS + +/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 + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("rat meat" = 1, "metal" = 1) + foodtypes = MEAT | GROSS + +/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 = 16, /datum/reagent/consumable/nutriment/vitamin = 6) + +/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) + +/obj/item/food/meat + custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 4) + material_flags = MATERIAL_NO_EFFECTS + 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 Re-add this when I figure out how to make drying an element + 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 + microwaved_type = /obj/item/food/meat/steak/plain + 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/MakeProcessable() + 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 | GROSS + +/obj/item/food/meat/slab/human/MakeProcessable() + 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 + +/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 + +/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 + +/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 + +/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 + +/obj/item/food/meat/slab/human/mutant/skeleton/MakeProcessable() + return //skeletons dont have cutlets + +/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 + +/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 + +////////////////////////////////////// OTHER MEATS //////////////////////////////////////////////////////// + + +/obj/item/food/meat/slab/synthmeat + name = "synthmeat" + icon_state = "meat_old" + microwaved_type = /obj/item/food/meat/steak/synth + desc = "A synthetic slab of meat." + foodtypes = RAW | MEAT //hurr durr chemicals we're harmed in the production of this meat thus its non-vegan. + +/obj/item/food/meat/slab/meatproduct + name = "meat product" + icon_state = "meatproduct" + desc = "A slab of station reclaimed and chemically processed meat product." + microwaved_type = /obj/item/food/meat/steak/meatproduct + tastes = list("meat flavoring" = 2, "modified starches" = 2, "natural & artificial dyes" = 1, "butyric acid" = 1) + foodtypes = RAW | MEAT + +/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 | GROSS + +/obj/item/food/meat/slab/mouse/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOUSE, CELL_VIRUS_TABLE_GENERIC_MOB) + +/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 | GROSS + +/obj/item/food/meat/slab/corgi/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_CORGI, CELL_VIRUS_TABLE_GENERIC_MOB) + +/obj/item/food/meat/slab/pug + name = "pug meat" + desc = "Tastes like... well you know..." + foodtypes = RAW | MEAT | GROSS + +/obj/item/food/meat/slab/pug/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_PUG, CELL_VIRUS_TABLE_GENERIC_MOB) + +/obj/item/food/meat/slab/killertomato + name = "killer tomato meat" + desc = "A slice from a huge tomato." + icon_state = "tomatomeat" + food_reagents = list(/datum/reagent/consumable/nutriment = 2) + microwaved_type = /obj/item/food/meat/steak/killertomato + tastes = list("tomato" = 1) + foodtypes = FRUIT + +/obj/item/food/meat/slab/killertomato/MakeProcessable() + 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" + 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) + microwaved_type = /obj/item/food/meat/steak/bear + tastes = list("meat" = 1, "salmon" = 1) + foodtypes = RAW | MEAT + +/obj/item/food/meat/slab/bear/MakeProcessable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/bear, 3, 30) + +/obj/item/food/meat/slab/bear/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_BEAR, CELL_VIRUS_TABLE_GENERIC_MOB) + +/obj/item/food/meat/slab/xeno + name = "xeno meat" + desc = "A slab of meat." + icon_state = "xenomeat" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 3) + bite_consumption = 4 + microwaved_type = /obj/item/food/meat/steak/xeno + tastes = list("meat" = 1, "acid" = 1) + foodtypes = RAW | MEAT + +/obj/item/food/meat/slab/xeno/MakeProcessable() + 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" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + microwaved_type = /obj/item/food/meat/steak/spider + tastes = list("cobwebs" = 1) + foodtypes = RAW | MEAT | TOXIC + +/obj/item/food/meat/slab/spider/MakeProcessable() + 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 + +/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." + 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) + microwaved_type = /obj/item/food/meat/steak/gondola + foodtypes = RAW | MEAT + +/obj/item/food/meat/slab/gondola/MakeProcessable() + 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" + desc = "A slab of penguin meat." + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/cooking_oil = 3) + microwaved_type = /obj/item/food/meat/steak/penguin + tastes = list("beef" = 1, "cod fish" = 1) + +/obj/item/food/meat/slab/gondola/MakeProcessable() + . = ..() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/gondola, 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/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" + desc = "A slab of raw chicken. Remember to wash your hands!" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 6) //low fat + microwaved_type = /obj/item/food/meat/steak/chicken + tastes = list("chicken" = 1) + +/obj/item/food/meat/slab/chicken/MakeProcessable() + . = ..() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/chicken, 3, 30) + +/obj/item/food/meat/slab/chicken/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB) +////////////////////////////////////// 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) + trash_type = /obj/item/trash/plate + foodtypes = MEAT + tastes = list("meat" = 1) + +/obj/item/food/meat/steak/Initialize() + . = ..() + RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, .proc/OnMicrowaveCooked) + + +/obj/item/food/meat/steak/proc/OnMicrowaveCooked(datum/source, obj/item/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 | GROSS + +///Make sure the steak has the correct name +/obj/item/food/meat/steak/plain/human/OnMicrowaveCooked(datum/source, obj/item/source_item, cooking_efficiency = 1) + . = ..() + if(istype(source_item, /obj/item/food/meat)) + 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 + +/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. + 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_old" + tastes = list("meat" = 4, "cryoxandone" = 1) + +//////////////////////////////// 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/OnCreatedFromProcessing(mob/living/user, obj/item/I, 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 + +/obj/item/food/meat/rawcutlet/plain/human + microwaved_type = /obj/item/food/meat/cutlet/plain/human + tastes = list("tender meat" = 1) + foodtypes = MEAT | RAW | GROSS + +/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" + microwaved_type = /obj/item/food/meat/cutlet/killertomato + tastes = list("tomato" = 1) + foodtypes = FRUIT + +/obj/item/food/meat/rawcutlet/bear + name = "raw bear cutlet" + microwaved_type = /obj/item/food/meat/cutlet/bear + tastes = list("meat" = 1, "salmon" = 1) + +/obj/item/food/meat/rawcutlet/bear/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_BEAR, CELL_VIRUS_TABLE_GENERIC_MOB) + +/obj/item/food/meat/rawcutlet/xeno + name = "raw xeno cutlet" + microwaved_type = /obj/item/food/meat/cutlet/xeno + tastes = list("meat" = 1, "acid" = 1) + +/obj/item/food/meat/rawcutlet/spider + name = "raw spider cutlet" + microwaved_type = /obj/item/food/meat/cutlet/spider + tastes = list("cobwebs" = 1) + +/obj/item/food/meat/rawcutlet/gondola + name = "raw gondola cutlet" + microwaved_type = /obj/item/food/meat/cutlet/gondola + tastes = list("meat" = 1, "tranquility" = 1) + +/obj/item/food/meat/rawcutlet/penguin + name = "raw penguin cutlet" + microwaved_type = /obj/item/food/meat/cutlet/penguin + tastes = list("beef" = 1, "cod fish" = 1) + +/obj/item/food/meat/rawcutlet/chicken + name = "raw chicken cutlet" + microwaved_type = /obj/item/food/meat/cutlet/chicken + tastes = list("chicken" = 1) + +/obj/item/food/meat/rawcutlet/chicken/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB) + +//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() + . = ..() + RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, .proc/OnMicrowaveCooked) + +///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/OnMicrowaveCooked(datum/source, atom/source_item, cooking_efficiency) + SIGNAL_HANDLER + if(istype(source_item, /obj/item/food/meat/rawcutlet)) + 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 | GROSS + +/obj/item/food/meat/cutlet/plain/human/OnMicrowaveCooked(datum/source, atom/source_item, cooking_efficiency) + . = ..() + if(istype(source_item, /obj/item/food/meat)) + 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) diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm new file mode 100644 index 00000000000..d6e8f643b73 --- /dev/null +++ b/code/game/objects/items/food/salad.dm @@ -0,0 +1,118 @@ +//this category is very little but I think that it has great potential to grow +////////////////////////////////////////////SALAD//////////////////////////////////////////// +/obj/item/food/salad + icon = 'icons/obj/food/soupsalad.dmi' + trash_type = /obj/item/reagent_containers/glass/bowl + bite_consumption = 3 + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("leaves" = 1) + foodtypes = VEGETABLES + eatverbs = list("devour","nibble","gnaw","gobble","chomp") //who the fuck gnaws and devours on a salad + +/obj/item/food/salad/aesirsalad + name = "\improper Aesir salad" + desc = "Probably too incredible for mortal men to fully enjoy." + icon_state = "aesirsalad" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 12) + tastes = list("leaves" = 1) + foodtypes = VEGETABLES | FRUIT + +/obj/item/food/salad/herbsalad + name = "herb salad" + desc = "A tasty salad with apples on top." + icon_state = "herbsalad" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("leaves" = 1, "apple" = 1) + foodtypes = VEGETABLES | FRUIT + +/obj/item/food/salad/validsalad + name = "valid salad" + desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." + icon_state = "validsalad" + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/doctor_delight = 8, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1) + foodtypes = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT + +/obj/item/food/salad/oatmeal + name = "oatmeal" + desc = "A nice bowl of oatmeal." + icon_state = "oatmeal" + food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("oats" = 1, "milk" = 1) + foodtypes = DAIRY | GRAIN | BREAKFAST + +/obj/item/food/salad/fruit + name = "fruit salad" + desc = "Your standard fruit salad." + icon_state = "fruitsalad" + food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("fruit" = 1) + foodtypes = FRUIT + +/obj/item/food/salad/jungle + name = "jungle salad" + desc = "Exotic fruits in a bowl." + icon_state = "junglesalad" + food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 7) + tastes = list("fruit" = 1, "the jungle" = 1) + foodtypes = FRUIT + +/obj/item/food/salad/citrusdelight + name = "citrus delight" + desc = "Citrus overload!" + icon_state = "citrusdelight" + food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/nutriment/vitamin = 7) + tastes = list("sourness" = 1, "leaves" = 1) + foodtypes = FRUIT + +/obj/item/food/salad/ricebowl + name = "ricebowl" + desc = "A bowl of raw rice." + icon_state = "ricebowl" + microwaved_type = /obj/item/food/salad/boiledrice + food_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("rice" = 1) + foodtypes = GRAIN | RAW + +/obj/item/food/salad/boiledrice + name = "boiled rice" + desc = "A warm bowl of rice." + icon_state = "boiledrice" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("rice" = 1) + foodtypes = GRAIN + +/obj/item/food/salad/ricepudding + name = "rice pudding" + desc = "Everybody loves rice pudding!" + icon_state = "ricepudding" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("rice" = 1, "sweetness" = 1) + foodtypes = GRAIN | DAIRY + +/obj/item/food/salad/ricepork + name = "rice and pork" + desc = "Well, it looks like pork..." + icon_state = "riceporkbowl" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("rice" = 1, "meat" = 1) + foodtypes = GRAIN | MEAT + +/obj/item/food/salad/eggbowl + name = "egg bowl" + desc = "A bowl of rice with a fried egg." + icon_state = "eggbowl" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("rice" = 1, "egg" = 1) + foodtypes = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017 + + +/obj/item/reagent_containers/glass/bowl + name = "bowl" + desc = "A simple bowl, used for soups and salads." + icon = 'icons/obj/food/soupsalad.dmi' + icon_state = "bowl" + reagent_flags = OPENCONTAINER + custom_materials = list(/datum/material/glass = 500) + w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm new file mode 100644 index 00000000000..0fbf57eab7c --- /dev/null +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -0,0 +1,95 @@ +/obj/item/food/sandwich + name = "sandwich" + desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "sandwich" + trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 1) + microwaved_type = /obj/item/food/toastedsandwich + tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) + foodtypes = GRAIN | VEGETABLES + +/obj/item/food/toastedsandwich + name = "toasted sandwich" + desc = "Now if you only had a pepper bar." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "toastedsandwich" + trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/carbon = 4) + tastes = list("toast" = 1) + foodtypes = GRAIN + +/obj/item/food/grilledcheese + name = "cheese sandwich" + desc = "Goes great with Tomato soup!" + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "toastedsandwich" + trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + tastes = list("toast" = 1, "cheese" = 1) + foodtypes = GRAIN | DAIRY + +/obj/item/food/jellysandwich + name = "jelly sandwich" + desc = "You wish you had some peanut butter to go with this..." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "jellysandwich" + trash_type = /obj/item/trash/plate + bite_consumption = 3 + tastes = list("bread" = 1, "jelly" = 1) + foodtypes = GRAIN + +/obj/item/food/jellysandwich/slime + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 10, /datum/reagent/consumable/nutriment/vitamin = 4) + foodtypes = GRAIN | TOXIC + +/obj/item/food/jellysandwich/cherry + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 8, /datum/reagent/consumable/nutriment/vitamin = 4) + foodtypes = GRAIN | FRUIT | SUGAR + +/obj/item/food/notasandwich + name = "not-a-sandwich" + desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "notasandwich" + trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 10) + tastes = list("nothing suspicious" = 1) + foodtypes = GRAIN | GROSS + +/obj/item/food/jelliedtoast + name = "jellied toast" + desc = "A slice of toast covered with delicious jam." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "jellytoast" + trash_type = /obj/item/trash/plate + bite_consumption = 3 + tastes = list("toast" = 1, "jelly" = 1) + foodtypes = GRAIN | BREAKFAST + +/obj/item/food/jelliedtoast/cherry + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 8, /datum/reagent/consumable/nutriment/vitamin = 4) + foodtypes = GRAIN | FRUIT | SUGAR | BREAKFAST + +/obj/item/food/jelliedtoast/slime + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin/slimejelly = 8, /datum/reagent/consumable/nutriment/vitamin = 4) + foodtypes = GRAIN | TOXIC | SUGAR | BREAKFAST + +/obj/item/food/butteredtoast + name = "buttered toast" + desc = "Butter lightly spread over a piece of toast." + icon = 'icons/obj/food/food.dmi' + icon_state = "butteredtoast" + bite_consumption = 3 + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1) + tastes = list("butter" = 1, "toast" = 1) + foodtypes = GRAIN | BREAKFAST + +/obj/item/food/twobread + name = "two bread" + desc = "This seems awfully bitter." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "twobread" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("bread" = 2) + foodtypes = GRAIN diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/game/objects/items/food/snacks.dm similarity index 50% rename from code/modules/food_and_drinks/food/snacks_vend.dm rename to code/game/objects/items/food/snacks.dm index ab16d77d641..db20639fb52 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/game/objects/items/food/snacks.dm @@ -2,173 +2,150 @@ //in other words: junk food //don't even bother looking for recipes for these -/obj/item/reagent_containers/food/snacks/candy +/obj/item/food/candy name = "candy" desc = "Nougat love it or hate it." icon_state = "candy" - trash = /obj/item/trash/candy - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3) + trash_type = /obj/item/trash/candy + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3) junkiness = 25 - filling_color = "#D2691E" tastes = list("candy" = 1) - foodtype = JUNKFOOD | SUGAR - value = FOOD_JUNK + foodtypes = JUNKFOOD | SUGAR -/obj/item/reagent_containers/food/snacks/candy/bronx +/obj/item/food/candy/bronx name = "South Bronx Paradise bar" desc = "Lose weight, guaranteed! Caramel Mocha Flavor. Something about product consumption..." icon_state = "bronx" inhand_icon_state = "candy" - trash = /obj/item/trash/candy - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/yuck = 1) + trash_type = /obj/item/trash/candy + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/yuck = 1) junkiness = 10 - bitesize = 10 - filling_color = "#e4d4b7" + bite_consumption = 10 tastes = list("candy" = 5, "weight loss" = 4, "insect larva" = 1) - foodtype = JUNKFOOD | RAW | GROSS + foodtypes = JUNKFOOD | RAW | GROSS custom_price = 800 var/revelation = FALSE - value = FOOD_FAST -/obj/item/reagent_containers/food/snacks/candy/bronx/On_Consume(mob/living/eater) - . = ..() +/obj/item/food/candy/bronx/MakeEdible() + AddComponent(/datum/component/edible,\ + initial_reagents = food_reagents,\ + food_flags = food_flags,\ + foodtypes = foodtypes,\ + volume = max_volume,\ + eat_time = eat_time,\ + tastes = tastes,\ + eatverbs = eatverbs,\ + bite_consumption = bite_consumption,\ + microwaved_type = microwaved_type,\ + junkiness = junkiness,\ + after_eat = CALLBACK(src, .proc/after_eat)) + +/obj/item/food/candy/bronx/proc/after_eat(mob/living/eater) if(ishuman(eater)) var/mob/living/carbon/human/carl = eater var/datum/disease/P = new /datum/disease/parasite() carl.ForceContractDisease(P, FALSE, TRUE) -/obj/item/reagent_containers/food/snacks/candy/bronx/examine(mob/user) +/obj/item/food/candy/bronx/examine(mob/user) . = ..() - if(revelation == FALSE) + if(!revelation) to_chat(user, "Geeze, you need to get to get your eyes checked. You should look again...") desc = "Lose weight, guaranteed! Caramel Mocha Flavor! WARNING: PRODUCT NOT FIT FOR HUMAN CONSUMPTION. CONTAINS LIVE DIAMPHIDIA SPECIMENS." name = "South Bronx Parasite bar" revelation = TRUE -/obj/item/reagent_containers/food/snacks/sosjerky +/obj/item/food/sosjerky name = "\improper Scaredy's Private Reserve Beef Jerky" icon_state = "sosjerky" desc = "Beef jerky made from the finest space cows." - trash = /obj/item/trash/sosjerky - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/sodiumchloride = 2) + trash_type = /obj/item/trash/sosjerky + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/sodiumchloride = 2) junkiness = 25 - filling_color = "#8B0000" tastes = list("dried meat" = 1) - foodtype = JUNKFOOD | MEAT | SUGAR - value = FOOD_JUNK + foodtypes = JUNKFOOD | MEAT | SUGAR -/obj/item/reagent_containers/food/snacks/sosjerky/healthy +/obj/item/food/sosjerky/healthy name = "homemade beef jerky" desc = "Homemade beef jerky made from the finest space cows." - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 1) + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 1) junkiness = 0 - value = FOOD_FAST -/obj/item/reagent_containers/food/snacks/chips +/obj/item/food/chips name = "chips" desc = "Commander Riker's What-The-Crisps." icon_state = "chips" - trash = /obj/item/trash/chips - bitesize = 1 - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 1) + trash_type = /obj/item/trash/chips + bite_consumption = 1 + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 1) junkiness = 20 - filling_color = "#FFD700" tastes = list("salt" = 1, "crisps" = 1) - foodtype = JUNKFOOD | FRIED - value = FOOD_JUNK + foodtypes = JUNKFOOD | FRIED -/obj/item/reagent_containers/food/snacks/chips/Crossed(atom/movable/AM, oldloc) - . = ..() - if(!isliving(AM) || bitecount) // can't pop opened chips - return - - var/mob/living/popper = AM - if(popper.mob_size < MOB_SIZE_HUMAN) - return - - playsound(src, 'sound/effects/chipbagpop.ogg', 100) - popper.visible_message("[popper] steps on \the [src], popping the bag!", "You step on \the [src], popping the bag!", "You hear a sharp crack!", COMBAT_MESSAGE_RANGE) - generate_trash(loc) - qdel(src) - -/obj/item/reagent_containers/food/snacks/no_raisin +/obj/item/food/no_raisin name = "4no raisins" icon_state = "4no_raisins" desc = "Best raisins in the universe. Not sure why." - trash = /obj/item/trash/raisins - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 4) + trash_type = /obj/item/trash/raisins + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 4) junkiness = 25 - filling_color = "#8B0000" tastes = list("dried raisins" = 1) - foodtype = JUNKFOOD | FRUIT | SUGAR + foodtypes = JUNKFOOD | FRUIT | SUGAR custom_price = 90 - value = FOOD_JUNK -/obj/item/reagent_containers/food/snacks/no_raisin/healthy +/obj/item/food/no_raisin/healthy name = "homemade raisins" desc = "Homemade raisins, the best in all of spess." - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) junkiness = 0 - foodtype = FRUIT - value = FOOD_RARE + foodtypes = FRUIT -/obj/item/reagent_containers/food/snacks/spacetwinkie +/obj/item/food/spacetwinkie name = "space twinkie" icon_state = "space_twinkie" desc = "Guaranteed to survive longer than you will." - list_reagents = list(/datum/reagent/consumable/sugar = 4) + food_reagents = list(/datum/reagent/consumable/sugar = 4) junkiness = 25 - filling_color = "#FFD700" - foodtype = JUNKFOOD | GRAIN | SUGAR + foodtypes = JUNKFOOD | GRAIN | SUGAR custom_price = 30 - value = FOOD_JUNK -/obj/item/reagent_containers/food/snacks/candy_trash +/obj/item/food/candy_trash name = "candy cigarette butt" icon = 'icons/obj/clothing/masks.dmi' icon_state = "candybum" desc = "The leftover from a smoked-out candy cigarette. Can be eaten!" - list_reagents = list(/datum/reagent/consumable/sugar = 4, /datum/reagent/ash = 3) + food_reagents = list(/datum/reagent/consumable/sugar = 4, /datum/reagent/ash = 3) junkiness = 10 //powergame trash food by buying candy cigs in bulk and eating them when they extinguish - filling_color = "#FFFFFF" - foodtype = JUNKFOOD | SUGAR - value = FOOD_WORTHLESS + foodtypes = JUNKFOOD | SUGAR -/obj/item/reagent_containers/food/snacks/candy_trash/nicotine +/obj/item/food/candy_trash/nicotine desc = "The leftover from a smoked-out candy cigarette. Smells like nicotine..?" - list_reagents = list(/datum/reagent/consumable/sugar = 4, /datum/reagent/ash = 3, /datum/reagent/drug/nicotine = 1) + food_reagents = list(/datum/reagent/consumable/sugar = 4, /datum/reagent/ash = 3, /datum/reagent/drug/nicotine = 1) -/obj/item/reagent_containers/food/snacks/cheesiehonkers +/obj/item/food/cheesiehonkers name = "cheesie honkers" desc = "Bite sized cheesie snacks that will honk all over your mouth." icon_state = "cheesie_honkers" - trash = /obj/item/trash/cheesie - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3) + trash_type = /obj/item/trash/cheesie + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3) junkiness = 25 - filling_color = "#FFD700" tastes = list("cheese" = 5, "crisps" = 2) - foodtype = JUNKFOOD | DAIRY | SUGAR + foodtypes = JUNKFOOD | DAIRY | SUGAR custom_price = 45 - value = FOOD_JUNK -/obj/item/reagent_containers/food/snacks/syndicake +/obj/item/food/syndicake name = "syndi-cakes" icon_state = "syndi_cakes" desc = "An extremely moist snack cake that tastes just as good after being nuked." - trash = /obj/item/trash/syndi_cakes - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5) - filling_color = "#F5F5DC" + trash_type = /obj/item/trash/syndi_cakes + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5) tastes = list("sweetness" = 3, "cake" = 1) - foodtype = GRAIN | FRUIT | VEGETABLES - value = FOOD_FAST + foodtypes = GRAIN | FRUIT | VEGETABLES -/obj/item/reagent_containers/food/snacks/energybar +/obj/item/food/energybar name = "High-power energy bars" icon_state = "energybar" desc = "An energy bar with a lot of punch, you probably shouldn't eat this if you're not an Ethereal." - trash = /obj/item/trash/energybar - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 3) - filling_color = "#97ee63" + trash_type = /obj/item/trash/energybar + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 3) tastes = list("pure electricity" = 3, "fitness" = 2) - foodtype = TOXIC - value = FOOD_JUNK + foodtypes = TOXIC diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm new file mode 100644 index 00000000000..3436a4b42aa --- /dev/null +++ b/code/game/objects/items/food/soup.dm @@ -0,0 +1,255 @@ +/obj/item/food/soup + w_class = WEIGHT_CLASS_NORMAL + icon = 'icons/obj/food/soupsalad.dmi' + trash_type = /obj/item/reagent_containers/glass/bowl + bite_consumption = 5 + max_volume = 80 + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("tasteless soup" = 1) + foodtypes = VEGETABLES + eatverbs = list("slurp","sip","inhale","drink") + +/obj/item/food/soup/wish + name = "wish soup" + desc = "I wish this was soup." + icon_state = "wishsoup" + food_reagents = list(/datum/reagent/water = 10) + tastes = list("wishes" = 1) + +/obj/item/food/soup/wish/Initialize() + . = ..() + var/wish_true = prob(25) + if(wish_true) + desc = "A wish come true!" + reagents.add_reagent(/datum/reagent/consumable/nutriment, 9) + reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 1) + +/obj/item/food/soup/meatball + name = "meatball soup" + desc = "You've got balls kid, BALLS!" + icon_state = "meatballsoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/water = 5) + tastes = list("meat" = 1) + foodtypes = MEAT + +/obj/item/food/soup/slime + name = "slime soup" + desc = "If no water is available, you may substitute tears." + icon_state = "slimesoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin/slimejelly = 10, /datum/reagent/consumable/nutriment/vitamin = 9, /datum/reagent/water = 5) + tastes = list("slime" = 1) + foodtypes = TOXIC | SUGAR + +/obj/item/food/soup/blood + name = "tomato soup" + desc = "Smells like copper." + icon_state = "tomatosoup" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/blood = 10, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 10) + tastes = list("iron" = 1) + foodtypes = GROSS + +/obj/item/food/soup/wingfangchu + name = "wing fang chu" + desc = "A savory dish of alien wing wang in soy." + icon_state = "wingfangchu" + trash_type = /obj/item/reagent_containers/glass/bowl + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/soysauce = 10, /datum/reagent/consumable/nutriment/vitamin = 7) + tastes = list("soy" = 1) + foodtypes = MEAT + +/obj/item/food/soup/clownstears + name = "clown's tears" + desc = "Not very funny." + icon_state = "clownstears" + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/banana = 10, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 16, /datum/reagent/consumable/clownstears = 10) + tastes = list("a bad joke" = 1) + foodtypes = FRUIT | SUGAR + +/obj/item/food/soup/vegetable + name = "vegetable soup" + desc = "A true vegan meal." + icon_state = "vegetablesoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 8) + tastes = list("vegetables" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/nettle + name = "nettle soup" + desc = "To think, the botanist would've beat you to death with one of these." + icon_state = "nettlesoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 9, /datum/reagent/medicine/omnizine = 5) + tastes = list("nettles" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/mystery + name = "mystery soup" + desc = "The mystery is, why aren't you eating it?" + icon_state = "mysterysoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5) + tastes = list("chaos" = 1) + +/obj/item/food/soup/mystery/Initialize() + . = ..() + var/extra_reagent = null + extra_reagent = pick(/datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil, /datum/reagent/medicine/omnizine, /datum/reagent/consumable/banana, /datum/reagent/blood, /datum/reagent/toxin/slimejelly, /datum/reagent/toxin, /datum/reagent/consumable/banana, /datum/reagent/carbon, /datum/reagent/medicine/oculine) + reagents.add_reagent(extra_reagent, 5) + reagents.add_reagent(/datum/reagent/consumable/nutriment, 6) + +/obj/item/food/soup/hotchili + name = "hot chili" + desc = "A five alarm Texan Chili!" + icon_state = "hotchili" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/capsaicin = 3, /datum/reagent/consumable/tomatojuice = 4, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("hot peppers" = 1) + foodtypes = VEGETABLES | MEAT + +/obj/item/food/soup/coldchili + name = "cold chili" + desc = "This slush is barely a liquid!" + icon_state = "coldchili" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/frostoil = 3, /datum/reagent/consumable/tomatojuice = 4, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("tomato" = 1, "mint" = 1) + foodtypes = VEGETABLES | MEAT + +/obj/item/food/soup/clownchili + name = "chili con carnival" + desc = "A delicious stew of meat, chiles, and salty, salty clown tears." + icon_state = "clownchili" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/tomatojuice = 4, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/banana = 1, /datum/reagent/consumable/laughter = 1) + tastes = list("tomato" = 1, "hot peppers" = 2, "clown feet" = 2, "kind of funny" = 2, "someone's parents" = 2) + foodtypes = VEGETABLES | MEAT + +/obj/item/food/soup/monkeysdelight + name = "monkey's delight" + desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas." + icon_state = "monkeysdelight" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 10) + tastes = list("the jungle" = 1, "banana" = 1) + foodtypes = FRUIT + +/obj/item/food/soup/tomato + name = "tomato soup" + desc = "Drinking this feels like being a vampire! A tomato vampire..." + icon_state = "tomatosoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("tomato" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/tomato/eyeball + name = "eyeball soup" + desc = "It looks back at you..." + icon_state = "eyeballsoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/liquidgibs = 3) + tastes = list("tomato" = 1, "squirming" = 1) + foodtypes = MEAT | GROSS + +/obj/item/food/soup/milo + name = "milosoup" + desc = "The universes best soup! Yum!!!" + icon_state = "milosoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("milo" = 1) // wtf is milo + foodtypes = VEGETABLES + +/obj/item/food/soup/mushroom + name = "chantrelle soup" + desc = "A delicious and hearty mushroom soup." + icon_state = "mushroomsoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("mushroom" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/beet + name = "beet soup" + desc = "Wait, how do you spell it again..?" + icon_state = "beetsoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 6) + foodtypes = VEGETABLES + +/obj/item/food/soup/beet/Initialize() + . = ..() + name = pick("borsch","bortsch","borstch","borsh","borshch","borscht") + tastes = list(name = 1) + + +/obj/item/food/soup/spacylibertyduff + name = "spacy liberty duff" + desc = "Jello gelatin, from Alfred Hubbard's cookbook." + icon_state = "spacylibertyduff" + bite_consumption = 3 + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/drug/mushroomhallucinogen = 6, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("jelly" = 1, "mushroom" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/amanitajelly + name = "amanita jelly" + desc = "Looks curiously toxic." + icon_state = "amanitajelly" + bite_consumption = 3 + food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/drug/mushroomhallucinogen = 3, /datum/reagent/toxin/amatoxin = 6, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("jelly" = 1, "mushroom" = 1) + foodtypes = VEGETABLES | TOXIC + +/obj/item/food/soup/stew + name = "stew" + desc = "A nice and warm stew. Healthy and strong." + icon_state = "stew" + food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 6) + bite_consumption = 7 + max_volume = 100 + tastes = list("tomato" = 1, "carrot" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/sweetpotato + name = "sweet potato soup" + desc = "Delicious sweet potato in soup form." + icon_state = "sweetpotatosoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("sweet potato" = 1) + foodtypes = VEGETABLES | SUGAR + +/obj/item/food/soup/beet/red + name = "red beet soup" + desc = "Quite a delicacy." + icon_state = "redbeetsoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("beet" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/onion + name = "french onion soup" + desc = "Good enough to make a grown mime cry." + icon_state = "onionsoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/tomatojuice = 8, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("caramelized onions" = 1) + foodtypes = VEGETABLES + +/obj/item/food/soup/bisque + name = "bisque" + desc = "A classic entree from Space-France." + icon_state = "bisque" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("creamy texture" = 1, "crab" = 4) + foodtypes = MEAT + +/obj/item/food/soup/electron + name = "electron soup" + desc = "A gastronomic curiosity of ethereal origin. It is famed for the minature weather system formed over a properly prepared soup." + icon_state = "electronsoup" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 5) + tastes = list("mushroom" = 1, "electrons" = 4) + foodtypes = VEGETABLES | TOXIC + +/obj/item/food/soup/bungocurry + name = "bungo curry" + desc = "A spicy vegetable curry made with the humble bungo fruit, Exotic!" + icon_state = "bungocurry" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/bungojuice = 9, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1) + foodtypes = VEGETABLES | FRUIT | DAIRY + +/obj/item/food/soup/mammi + name = "Mammi" + desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement." + icon_state = "mammi" + food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/nutriment/vitamin = 2) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 41ac583d1f1..1dc5d7fa1ff 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -563,7 +563,7 @@ force = 0 attack_verb_continuous = list("hits", "pokes") attack_verb_simple = list("hit", "poke") - 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 @@ -588,7 +588,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/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index cb5c6874786..b88a8be22df 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -128,7 +128,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 @@ -151,7 +151,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" @@ -201,20 +201,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/carpmeat(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/carpmeat(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/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 365289345ec..dbc19cf3e5c 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -63,16 +63,6 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ R.use(2) if (!R && replace) user.put_in_hands(new_item) - - else if(istype(W, /obj/item/reagent_containers/food/snacks)) - var/obj/item/reagent_containers/food/snacks/S = W - if(amount != 1) - to_chat(user, "You must use a single rod!") - else if(S.w_class > WEIGHT_CLASS_SMALL) - to_chat(user, "The ingredient is too big for [src]!") - else - var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/kebab(get_turf(src)) - A.initialize_custom_food(src, S, user) else return ..() diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 6681a4ea617..d43312209f4 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -422,7 +422,7 @@ /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/food/monkeycube, /obj/item/organ, /obj/item/bodypart )) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 444990fcaea..9e531c804bb 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -413,17 +413,17 @@ var/rig_snacks while(contents.len <= amount) rig_snacks = pick(list( - /obj/item/reagent_containers/food/snacks/candy, + /obj/item/food/candy, /obj/item/reagent_containers/food/drinks/dry_ramen, - /obj/item/reagent_containers/food/snacks/chips, - /obj/item/reagent_containers/food/snacks/sosjerky, - /obj/item/reagent_containers/food/snacks/syndicake, - /obj/item/reagent_containers/food/snacks/spacetwinkie, - /obj/item/reagent_containers/food/snacks/cheesiehonkers, + /obj/item/food/chips, + /obj/item/food/sosjerky, + /obj/item/food/syndicake, + /obj/item/food/spacetwinkie, + /obj/item/food/cheesiehonkers, /obj/item/reagent_containers/food/snacks/nachos, /obj/item/reagent_containers/food/snacks/cheesynachos, /obj/item/reagent_containers/food/snacks/cubannachos, - /obj/item/reagent_containers/food/snacks/nugget, + /obj/item/food/nugget, /obj/item/food/spaghetti/pastatomato, /obj/item/reagent_containers/food/snacks/rofflewaffles, /obj/item/reagent_containers/food/snacks/donkpocket, diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 3991c077c86..35bd91ff97b 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -485,13 +485,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.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube)) + STR.set_holdable(list(/obj/item/food/monkeycube)) /obj/item/storage/box/monkeycubes/PopulateContents() for(var/i in 1 to 5) @@ -499,7 +499,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" @@ -511,11 +511,11 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 3 - STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube)) + STR.set_holdable(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" @@ -961,7 +961,7 @@ /obj/item/storage/box/papersack/meat/PopulateContents() for(var/i in 1 to 7) - new /obj/item/reagent_containers/food/snacks/meat/slab(src) + new /obj/item/food/meat/slab(src) /obj/item/storage/box/emptysandbags name = "box of empty sandbags" diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index dbcbe8f4356..1a555147634 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -127,13 +127,13 @@ righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' name = "egg box" desc = "A carton for containing eggs." - spawn_type = /obj/item/reagent_containers/food/snacks/egg + spawn_type = /obj/item/food/egg /obj/item/storage/fancy/egg_box/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 12 - STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/egg)) + STR.set_holdable(list(/obj/item/food/egg)) /* * Candle Box @@ -453,10 +453,10 @@ icon = 'icons/obj/food/containers.dmi' icon_state = "nuggetbox" icon_type = "nugget" - spawn_type = /obj/item/reagent_containers/food/snacks/nugget + spawn_type = /obj/item/food/nugget /obj/item/storage/fancy/nugget_box/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 - STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/nugget)) + STR.set_holdable(list(/obj/item/food/nugget)) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 2489563b236..e61a5b8a59f 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -127,4 +127,4 @@ if(prob(40)) new /obj/item/reagent_containers/food/snacks/pizzaslice/moldy(src) else if(prob(30)) - new /obj/item/reagent_containers/food/snacks/syndicake(src) + new /obj/item/food/syndicake(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 1cb8b878c6b..0508df467ce 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -61,7 +61,7 @@ /obj/structure/closet/secure_closet/freezer/meat/PopulateContents() ..() for(var/i = 0, i < 4, i++) - 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/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm index 9ad6a866e16..51d1941e1fb 100644 --- a/code/game/objects/structures/maintenance.dm +++ b/code/game/objects/structures/maintenance.dm @@ -12,8 +12,8 @@ at the cost of risking a vicious bite.**/ ///This var determines if there is a chance to recieve a bite when sticking your hand into the water. var/critter_infested = TRUE var/list/loot = list( - /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton = 35, - /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie = 15, + /obj/item/food/meat/slab/human/mutant/skeleton = 35, + /obj/item/food/meat/slab/human/mutant/zombie = 15, /obj/item/trash/can = 15, /obj/item/clothing/head/helmet/skull = 10, /obj/item/restraints/handcuffs = 4, @@ -82,8 +82,8 @@ at the cost of risking a vicious bite.**/ return ..() add_fingerprint(user) if(istype(I, /obj/item/reagent_containers)) - if(istype(I, /obj/item/reagent_containers/food/snacks/monkeycube)) - var/obj/item/reagent_containers/food/snacks/monkeycube/cube = I + if(istype(I, /obj/item/food/monkeycube)) + var/obj/item/food/monkeycube/cube = I cube.Expand() return var/obj/item/reagent_containers/reagent_container = I diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 915ba4f9320..066f12e3bb6 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -116,8 +116,8 @@ else if(istype(I, /obj/item/reagent_containers)) if (!open) return - if(istype(I, /obj/item/reagent_containers/food/snacks/monkeycube)) - var/obj/item/reagent_containers/food/snacks/monkeycube/cube = I + if(istype(I, /obj/item/food/monkeycube)) + var/obj/item/food/monkeycube/cube = I cube.Expand() return var/obj/item/reagent_containers/RG = I diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 6cd274cf5cc..3e35b84f380 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1407,9 +1407,9 @@ else if(isplasmaman(H)) cookiealt = /obj/item/reagent_containers/food/condiment/milk else if(isethereal(H)) - cookiealt = /obj/item/reagent_containers/food/snacks/energybar + cookiealt = /obj/item/food/energybar else if(islizard(H)) - cookiealt = /obj/item/reagent_containers/food/snacks/meat/slab + cookiealt = /obj/item/food/meat/slab var/obj/item/new_item = new cookiealt(H) if(H.put_in_hands(new_item)) H.update_inv_hands() diff --git a/code/modules/antagonists/abductor/equipment/glands/egg.dm b/code/modules/antagonists/abductor/equipment/glands/egg.dm index e3b0c835f27..d027f9cd9ab 100644 --- a/code/modules/antagonists/abductor/equipment/glands/egg.dm +++ b/code/modules/antagonists/abductor/equipment/glands/egg.dm @@ -12,4 +12,4 @@ /obj/item/organ/heart/gland/egg/activate() owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]") var/turf/T = owner.drop_location() - new /obj/item/reagent_containers/food/snacks/egg/gland(T) + new /obj/item/food/egg/gland(T) diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index f4c9d408c6f..606dd1e7202 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -29,7 +29,7 @@ attack_verb_continuous = "glomps" attack_verb_simple = "glomp" 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 = 0 diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm index 00cfd456ea1..59b2b27335e 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm @@ -4,7 +4,7 @@ /datum/blackmarket_item/consumable/clown_tears name = "Bowl of Clown's Tears" desc = "Guaranteed fresh from Weepy Boggins Tragic Kitchen" - item = /obj/item/reagent_containers/food/snacks/soup/clownstears + item = /obj/item/food/soup/clownstears stock = 1 price_min = 520 diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 560729bf0e5..5129d969539 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -61,7 +61,7 @@ description = "Apparently the company that makes Cheesie Honkers is going out of business soon. CentCom wants to stock up before it happens!" reward = 1200 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/cheesiehonkers) + wanted_types = list(/obj/item/food/cheesiehonkers) /datum/bounty/item/assistant/baseball_bat name = "Baseball Bat" @@ -158,7 +158,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/ied name = "IED" @@ -171,7 +171,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/action_figures name = "Action Figures" diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 6bbee6133e9..3f9c7c344bb 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -9,7 +9,7 @@ description = "To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup." reward = 3000 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/soup) + wanted_types = list(/obj/item/food/soup) /datum/bounty/item/chef/popcorn name = "Popcorn Bags" @@ -30,14 +30,14 @@ description = "Upper management has been screaming non-stop for ice cream. Please send some." reward = 4000 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich) + wanted_types = list(/obj/item/food/icecreamsandwich) /datum/bounty/item/chef/strawberryicecreamsandwich name = " Strawberry Ice Cream Sandwiches" description = "Upper management has been screaming non-stop for more flavourful ice cream. Please send some." reward = 5000 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/strawberryicecreamsandwich) + wanted_types = list(/obj/item/food/strawberryicecreamsandwich) /datum/bounty/item/chef/bread name = "Bread" @@ -56,7 +56,7 @@ description = "CentCom management is going on a health binge. Your order is to ship salad or rice bowls." reward = 3000 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/salad) + wanted_types = list(/obj/item/food/salad) /datum/bounty/item/chef/carrotfries name = "Carrot Fries" @@ -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" @@ -94,7 +94,7 @@ description = "A famous singer will be arriving at CentCom, and their contract demands that they only be served Eggplant Parmigiana. Ship some, please!" reward = 3500 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/eggplantparm) + wanted_types = list(/obj/item/food/eggplantparm) /datum/bounty/item/chef/muffin name = "Muffins" @@ -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" @@ -134,7 +134,7 @@ description = "The vice president's son won't shut up about chicken nuggies. Would you mind shipping some?" reward = 4000 required_count = 6 - wanted_types = list(/obj/item/reagent_containers/food/snacks/nugget) + wanted_types = list(/obj/item/food/nugget) /datum/bounty/item/chef/corgifarming //Butchering is a chef's job. name = "Corgi Hides" diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm index b2df34d8f96..4fb5c86ee96 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 2f8028021c5..d8fa2f80a47 100644 --- a/code/modules/cargo/gondolapod.dm +++ b/code/modules/cargo/gondolapod.dm @@ -16,7 +16,7 @@ pixel_x = -16//2x2 sprite pixel_y = -5 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/goodies.dm b/code/modules/cargo/goodies.dm index 086de036429..892ed7292aa 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -116,7 +116,7 @@ name = "Valentine Card" desc = "Make an impression on that special someone! Comes with one valentine card and a free candy heart!" cost = 150 - contains = list(/obj/item/valentine, /obj/item/reagent_containers/food/snacks/candyheart) + contains = list(/obj/item/valentine, /obj/item/food/candyheart) /datum/supply_pack/goody/beeplush name = "Bee Plushie" diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 0555e2e9754..c93efd7670e 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1714,16 +1714,16 @@ name = "Excellent Meat Crate" desc = "The best cuts in the whole galaxy." cost = 2000 - 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/carpmeat, + /obj/item/food/meat/slab/human) crate_name = "food crate" /datum/supply_pack/organic/randomized/chef/fill(obj/structure/closet/crate/C) @@ -1763,7 +1763,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/head/jobs.dm b/code/modules/clothing/head/jobs.dm index b04fd4cbc2d..f5dbfeabe0f 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -103,7 +103,7 @@ ..() if(loc == user) if(candy_cooldown < world.time) - var/obj/item/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/reagent_containers/food/snacks/candy_corn(src) + var/obj/item/food/candy_corn/CC = new /obj/item/food/candy_corn(src) user.put_in_hands(CC) to_chat(user, "You slip a candy corn from your hat.") candy_cooldown = world.time+1200 diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index eee85851d30..4ec2b169c06 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -49,8 +49,8 @@ for(var/distrobuteinbag in 0 to 5) var/type = pick(/obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull, /obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin, - /obj/item/reagent_containers/food/snacks/candy_corn, - /obj/item/reagent_containers/food/snacks/candy, + /obj/item/food/candy_corn, + /obj/item/food/candy, /obj/item/reagent_containers/food/snacks/candiedapple, /obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/organ/brain ) // OH GOD THIS ISN'T CANDY! diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 2cf0b796454..a35b4acc60e 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -18,7 +18,7 @@ for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) H.put_in_hands(new /obj/item/valentine) var/obj/item/storage/backpack/b = locate() in H.contents - new /obj/item/reagent_containers/food/snacks/candyheart(b) + new /obj/item/food/candyheart(b) new /obj/item/storage/fancy/heart_box(b) var/list/valentines = list() @@ -92,15 +92,15 @@ /obj/item/valentine/attack_self(mob/user) user.examinate(src) -/obj/item/reagent_containers/food/snacks/candyheart +/obj/item/food/candyheart name = "candy heart" icon = 'icons/obj/holiday_misc.dmi' icon_state = "candyheart" desc = "A heart-shaped candy that reads: " - list_reagents = list(/datum/reagent/consumable/sugar = 2) + food_reagents = list(/datum/reagent/consumable/sugar = 2) junkiness = 5 -/obj/item/reagent_containers/food/snacks/candyheart/Initialize() +/obj/item/food/candyheart/Initialize() . = ..() desc = pick(strings(VALENTINE_FILE, "candyhearts")) icon_state = pick("candyheart", "candyheart2", "candyheart3", "candyheart4") diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 046c7249a17..43631efb7c1 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -93,8 +93,8 @@ list_reagents = list(/datum/reagent/consumable/nuka_cola = 50) /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs - var/obj/item/reagent_containers/food/snacks/egg/E = I + if(istype(I, /obj/item/food/egg)) //breaking eggs + var/obj/item/food/egg/E = I if(reagents) if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "[src] is full.") diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 399e32c12e7..d158d177198 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -66,8 +66,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) @@ -161,25 +161,6 @@ icon_state = "custburg" foodtype = GRAIN -/obj/item/reagent_containers/food/snacks/customizable/kebab - name = "kebab" - desc = "Delicious food on a stick." - ingredients_placement = INGREDIENTS_LINE - trash = /obj/item/stack/rods - list_reagents = list(/datum/reagent/consumable/nutriment = 1) - ingMax = 6 - icon_state = "rod" - -/obj/item/reagent_containers/food/snacks/customizable/pasta - name = "spaghetti" - desc = "Noodles. With stuff. Delicious." - ingredients_placement = INGREDIENTS_SCATTER - ingMax = 6 - icon = 'icons/obj/food/pizzaspaghetti.dmi' - icon_state = "spaghettiboiled" - foodtype = GRAIN - - /obj/item/reagent_containers/food/snacks/customizable/pie name = "pie" ingMax = 6 @@ -187,7 +168,6 @@ icon_state = "pie" foodtype = GRAIN | DAIRY - /obj/item/reagent_containers/food/snacks/customizable/pizza name = "pizza" desc = "A personalized pan pizza meant for only one person." @@ -199,28 +179,6 @@ icon_state = "pizzamargherita" foodtype = GRAIN | DAIRY - -/obj/item/reagent_containers/food/snacks/customizable/salad - name = "salad" - desc = "Very tasty." - trash = /obj/item/reagent_containers/glass/bowl - ingMax = 6 - icon = 'icons/obj/food/soupsalad.dmi' - icon_state = "bowl" - - -/obj/item/reagent_containers/food/snacks/customizable/soup - name = "soup" - desc = "A bowl with liquid and... stuff in it." - trash = /obj/item/reagent_containers/glass/bowl - ingMax = 8 - icon = 'icons/obj/food/soupsalad.dmi' - icon_state = "wishsoup" - -/obj/item/reagent_containers/food/snacks/customizable/soup/Initialize() - . = ..() - eatverb = pick("slurp","sip","inhale","drink") - /obj/item/reagent_containers/food/snacks/customizable/poutine name = "poutine" desc = "Fries covered in cheese curds and gravy." @@ -233,53 +191,6 @@ tastes = list("potato" = 3, "gravy" = 1, "squeaky cheese" = 1) foodtype = VEGETABLES | GRAIN | FRIED - - - -// Bowl //////////////////////////////////////////////// - -/obj/item/reagent_containers/glass/bowl - name = "bowl" - desc = "A simple bowl, used for soups and salads." - icon = 'icons/obj/food/soupsalad.dmi' - icon_state = "bowl" - reagent_flags = OPENCONTAINER - custom_materials = list(/datum/material/glass = 500) - w_class = WEIGHT_CLASS_NORMAL - -/obj/item/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params) - if(istype(I, /obj/item/reagent_containers/food/snacks)) - var/obj/item/reagent_containers/food/snacks/S = I - if(I.w_class > WEIGHT_CLASS_SMALL) - to_chat(user, "The ingredient is too big for [src]!") - else if(contents.len >= 20) - to_chat(user, "You can't add more ingredients to [src]!") - else - if(reagents.has_reagent(/datum/reagent/water, 10)) //are we starting a soup or a salad? - var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/soup(get_turf(src)) - A.initialize_custom_food(src, S, user) - else - var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/salad(get_turf(src)) - A.initialize_custom_food(src, S, user) - else - . = ..() - return - -/obj/item/reagent_containers/glass/bowl/on_reagent_change(changetype) - ..() - update_icon() - -/obj/item/reagent_containers/glass/bowl/update_icon_state() - if(!reagents || !reagents.total_volume) - icon_state = "bowl" - -/obj/item/reagent_containers/glass/bowl/update_overlays() - . = ..() - if(reagents && reagents.total_volume) - var/mutable_appearance/filling = mutable_appearance('icons/obj/food/soupsalad.dmi', "fullbowl") - filling.color = mix_color_from_reagents(reagents.reagent_list) - . += filling - #undef INGREDIENTS_FILL #undef INGREDIENTS_SCATTER #undef INGREDIENTS_STACK 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 1b75c56eea4..00000000000 --- a/code/modules/food_and_drinks/food/snacks/meat.dm +++ /dev/null @@ -1,562 +0,0 @@ -/obj/item/reagent_containers/food/snacks/meat - var/subjectname = "" - var/subjectjob = null - custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 4) - material_flags = MATERIAL_NO_EFFECTS //Remove this once we refactor food, prevents meat literaly being eaten twice - -/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/protein = 6, /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 | GROSS - value = FOOD_MEAT_HUMAN - -/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/protein = 4, /datum/reagent/toxin/slimejelly = 3) - filling_color = "#00FFFF" - tastes = list("slime" = 1, "jelly" = 1) - foodtype = MEAT | RAW | TOXIC - value = FOOD_MEAT_MUTANT_RARE - -/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 - value = FOOD_MEAT_MUTANT_RARE - -/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." - cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human/lizard - filling_color = "#6B8E23" - tastes = list("meat" = 4, "scales" = 1) - foodtype = MEAT | RAW - value = FOOD_MEAT_MUTANT - -/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 - value = FOOD_MEAT_MUTANT_RARE - -/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 - value = FOOD_MEAT_MUTANT_RARE - -/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/protein = 4, /datum/reagent/uranium = 3) - tastes = list("maggots" = 1, "the inside of a reactor" = 1) - foodtype = MEAT | RAW | GROSS - value = FOOD_MEAT_MUTANT - -/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 - value = FOOD_MEAT_MUTANT - -/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 - value = FOOD_MEAT_MUTANT_RARE - -/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 - -/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 = 3) - tastes = list("pure electricity" = 2, "meat" = 1) - foodtype = RAW | MEAT | TOXIC - value = FOOD_MEAT_MUTANT - -////////////////////////////////////// OTHER MEATS //////////////////////////////////////////////////////// - - -/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat - name = "synthmeat" - icon_state = "meat_old" - cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/synth - 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" - icon_state = "meatproduct" - desc = "A slab of station reclaimed and chemically processed meat product." - cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/meatproduct - tastes = list("meat flavoring" = 2, "modified starches" = 2, "natural & artificial dyes" = 1, "butyric acid" = 1) - 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 | GROSS - -/obj/item/reagent_containers/food/snacks/meat/slab/mouse/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOUSE, CELL_VIRUS_TABLE_GENERIC_MOB) - -/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 | GROSS - -/obj/item/reagent_containers/food/snacks/meat/slab/corgi/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_CORGI, CELL_VIRUS_TABLE_GENERIC_MOB) - -/obj/item/reagent_containers/food/snacks/meat/slab/pug - name = "pug meat" - desc = "Tastes like... well you know..." - foodtype = RAW | MEAT | GROSS - -/obj/item/reagent_containers/food/snacks/meat/slab/pug/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_PUG, CELL_VIRUS_TABLE_GENERIC_MOB) - -/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/protein = 16, /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/bear/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_BEAR, CELL_VIRUS_TABLE_GENERIC_MOB) - -/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/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 3) - 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. That is so Kafkaesque." - icon_state = "spidermeat" - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /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/protein = 5, /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/protein = 4, /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/protein = 7, /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/protein = 2, /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/protein = 2) - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 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/protein = 4, /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" - icon_state = "birdmeat" - desc = "A slab of penguin meat." - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /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/protein = 3, /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(/datum/reagent/consumable/nutriment = 2) - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /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" - icon_state = "birdmeat" - desc = "A slab of raw chicken. Remember to wash your hands!" - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 6) //low fat - 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/chicken/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB) -////////////////////////////////////// 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/protein = 6) - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 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 | GROSS - -/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" - icon_state = "birdsteak" - 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. - icon_state = "birdsteak" - tastes = list("chicken" = 1) - -/obj/item/reagent_containers/food/snacks/meat/steak/plain/human/lizard - name = "lizard steak" - icon_state = "birdsteak" - tastes = list("juicy chicken" = 3, "scales" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/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/reagent_containers/food/snacks/meat/steak/synth - name = "synthsteak" - desc = "A synthetic meat steak. It doesn't look quite right, now does it?" - icon_state = "meatsteak_old" - tastes = list("meat" = 4, "cryoxandone" = 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/protein = 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 | GROSS - -/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/bear/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_BEAR, CELL_VIRUS_TABLE_GENERIC_MOB) - -/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/chicken/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB) - -//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/protein = 2) - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 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 | GROSS - -/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) diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm deleted file mode 100644 index b8e6865e1b4..00000000000 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ /dev/null @@ -1,287 +0,0 @@ - -///////////////// -//Misc. Frozen.// -///////////////// - -/obj/item/reagent_containers/food/snacks/icecreamsandwich - name = "icecream sandwich" - desc = "Portable Ice-cream in its own packaging." - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "icecreamsandwich" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/ice = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2) - tastes = list("ice cream" = 1) - foodtype = GRAIN | DAIRY | SUGAR - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/strawberryicecreamsandwich - name = "strawberry ice cream sandwich" - desc = "Portable ice-cream in its own packaging of the strawberry variety." - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "strawberryicecreamsandwich" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2) - tastes = list("ice cream" = 2, "berry" = 2) - foodtype = FRUIT | DAIRY | SUGAR - - -/obj/item/reagent_containers/food/snacks/spacefreezy - name = "space freezy" - desc = "The best icecream in space." - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "spacefreezy" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - filling_color = "#87CEFA" - tastes = list("blue cherries" = 2, "ice cream" = 2) - foodtype = FRUIT | DAIRY | SUGAR - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/sundae - name = "sundae" - desc = "A classic dessert." - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "sundae" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - filling_color = "#FFFACD" - tastes = list("ice cream" = 1, "banana" = 1) - foodtype = FRUIT | DAIRY | SUGAR - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/honkdae - name = "honkdae" - desc = "The clown's favorite dessert." - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "honkdae" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 10, /datum/reagent/consumable/nutriment/vitamin = 4) - filling_color = "#FFFACD" - tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) - foodtype = FRUIT | DAIRY | SUGAR - value = FOOD_EXOTIC - -///////////// -//SNOWCONES// -///////////// - -/obj/item/reagent_containers/food/snacks/snowcones //We use this as a base for all other snowcones - name = "flavorless snowcone" - desc = "It's just shaved ice. Still fun to chew on." - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "flavorless_sc" - trash = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups - bonus_reagents = list(/datum/reagent/water = 10) //Base line will allways give water - list_reagents = list(/datum/reagent/water = 1) // We dont get food for water/juices - filling_color = "#FFFFFF" //Ice is white - tastes = list("ice" = 1, "water" = 1) - foodtype = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/snowcones/lime - name = "lime snowcone" - desc = "Lime syrup drizzled over a snowball in a paper cup." - icon_state = "lime_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/limejuice = 5) - tastes = list("ice" = 1, "water" = 1, "limes" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/lemon - name = "lemon snowcone" - desc = "Lemon syrup drizzled over a snowball in a paper cup." - icon_state = "lemon_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5) - tastes = list("ice" = 1, "water" = 1, "lemons" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/apple - name = "apple snowcone" - desc = "Apple syrup drizzled over a snowball in a paper cup." - icon_state = "amber_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/applejuice = 5) - tastes = list("ice" = 1, "water" = 1, "apples" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/grape - name = "grape snowcone" - desc = "Grape syrup drizzled over a snowball in a paper cup." - icon_state = "grape_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/grapejuice = 5) - tastes = list("ice" = 1, "water" = 1, "grape" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/orange - name = "orange snowcone" - desc = "Orange syrup drizzled over a snowball in a paper cup." - icon_state = "orange_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/orangejuice = 5) - tastes = list("ice" = 1, "water" = 1, "orange" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/blue - name = "bluecherry snowcone" - desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!" - icon_state = "blue_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/bluecherryjelly = 5) - tastes = list("ice" = 1, "water" = 1, "blue" = 5, "cherries" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/red - name = "cherry snowcone" - desc = "Cherry syrup drizzled over a snowball in a paper cup." - icon_state = "red_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 5) - tastes = list("ice" = 1, "water" = 1, "red" = 5, "cherries" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/berry - name = "berry snowcone" - desc = "Berry syrup drizzled over a snowball in a paper cup." - icon_state = "berry_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/berryjuice = 5) - tastes = list("ice" = 1, "water" = 1, "berries" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/fruitsalad - name = "fruit salad snowcone" - desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup." - icon_state = "fruitsalad_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/orangejuice = 5) - tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5) - foodtype = FRUIT - -/obj/item/reagent_containers/food/snacks/snowcones/pineapple - name = "pineapple snowcone" - desc = "Pineapple syrup drizzled over a snowball in a paper cup." - icon_state = "pineapple_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pineapplejuice = 5) - tastes = list("ice" = 1, "water" = 1, "pineapples" = 5) - foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy - -/obj/item/reagent_containers/food/snacks/snowcones/mime - name = "mime snowcone" - desc = "..." - icon_state = "mime_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nothing = 5) - tastes = list("ice" = 1, "water" = 1, "nothing" = 5) - -/obj/item/reagent_containers/food/snacks/snowcones/clown - name = "clown snowcone" - desc = "Laughter drizzled over a snowball in a paper cup." - icon_state = "clown_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/laughter = 5) - tastes = list("ice" = 1, "water" = 1, "jokes" = 5, "brainfreeze" = 5, "joy" = 5) - -/obj/item/reagent_containers/food/snacks/snowcones/soda - name = "space cola snowcone" - desc = "Space Cola drizzled over a snowball in a paper cup." - icon_state = "soda_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/space_cola = 5) - tastes = list("ice" = 1, "water" = 1, "cola" = 5) - -/obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind - name = "Space Mountain Wind snowcone" - desc = "Space Mountain Wind drizzled over a snowball in a paper cup." - icon_state = "mountainwind_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5) - tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5) - - -/obj/item/reagent_containers/food/snacks/snowcones/pwrgame - name = "pwrgame snowcone" - desc = "Pwrgame soda drizzled over a snowball in a paper cup." - icon_state = "pwrgame_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pwr_game = 5) - tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5) - -/obj/item/reagent_containers/food/snacks/snowcones/honey - name = "honey snowcone" - desc = "Honey drizzled over a snowball in a paper cup." - icon_state = "amber_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/honey = 5) - tastes = list("ice" = 1, "water" = 1, "flowers" = 5, "sweetness" = 5, "wax" = 1) - -/obj/item/reagent_containers/food/snacks/snowcones/rainbow - name = "rainbow snowcone" - desc = "A very colorful snowball in a paper cup." - icon_state = "rainbow_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/laughter = 25) - tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3) - -/obj/item/reagent_containers/food/snacks/popsicle - name = "bug popsicle" - desc = "Mmmm, this should not exist." - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "popsicle_stick_s" - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) - tastes = list("beetlejuice") - trash = /obj/item/popsicle_stick - w_class = WEIGHT_CLASS_SMALL - var/overlay_state = "creamsicle_o" //This is the edible part of the popsicle. - var/bite_states = 4 //This value value is used for correctly setting the bitesize to ensure every bite changes the sprite. Do not set to zero. - foodtype = DAIRY | SUGAR - -/obj/item/reagent_containers/food/snacks/popsicle/Initialize() - . = ..() - bitesize = reagents.total_volume / bite_states - -/obj/item/reagent_containers/food/snacks/popsicle/update_overlays() - . = ..() - if(bitecount) - . += "[initial(overlay_state)]_[min(bitecount, 3)]" - else - . += initial(overlay_state) - -/obj/item/reagent_containers/food/snacks/popsicle/On_Consume(mob/living/eater) - . = ..() - update_icon() - -/obj/item/popsicle_stick - name = "popsicle stick" - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "popsicle_stick" - desc = "This humble little stick usually carries a frozen treat, at the moment it seems freed from this atlassian burden." - custom_materials = list(/datum/material/wood=20) - w_class = WEIGHT_CLASS_TINY - force = 0 - -/obj/item/reagent_containers/food/snacks/popsicle/creamsicle_orange - name = "orange creamsicle" - desc = "A classic orange creamsicle. A sunny frozen treat." - list_reagents = list(/datum/reagent/consumable/orangejuice = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) - bonus_reagents = list(/datum/reagent/consumable/orangejuice = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) - foodtype = FRUIT | DAIRY | SUGAR - -/obj/item/reagent_containers/food/snacks/popsicle/creamsicle_berry - name = "berry creamsicle" - desc = "A vibrant berry creamsicle. A berry good frozen treat." - list_reagents = list(/datum/reagent/consumable/berryjuice = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) - bonus_reagents = list(/datum/reagent/consumable/berryjuice = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 4) - overlay_state = "creamsicle_m" - foodtype = FRUIT | DAIRY | SUGAR - -/obj/item/reagent_containers/food/snacks/popsicle/jumbo - name = "jumbo icecream" - desc = "A luxurius icecream covered in rich chocolate. It seems smaller than you remember it being." - list_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 4) - bonus_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2) - overlay_state = "jumbo" - -/obj/item/reagent_containers/food/snacks/popsicle/nogga_black - name = "nogga black" - desc = "A salty licorice icecream recently reintroduced due to all the records of the controversy being lost to time. Those who cannot remember the past are doomed to repeat it." - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4) - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4) - tastes = list("salty liquorice") - overlay_state = "nogga_black" - -/obj/item/reagent_containers/food/snacks/cornuto - name = "cornuto" - w_class = WEIGHT_CLASS_SMALL - icon = 'icons/obj/food/frozen_treats.dmi' - icon_state = "cornuto" - desc = "A neapolitan vanilla and chocolate icecream cone. It menaces with a sprinkling of caramelized nuts." - tastes = list("chopped hazelnuts", "waffle") - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 2) - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 1) - foodtype = DAIRY | SUGAR 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 78a68db36da..00000000000 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ /dev/null @@ -1,419 +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/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4) - bitesize = 3 - filling_color = "#CD853F" - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/capsaicin = 1) - tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1) - foodtype = MEAT - value = FOOD_EXOTIC - -/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/protein = 4, /datum/reagent/toxin/carpotoxin = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - bitesize = 6 - filling_color = "#FA8072" - tastes = list("fish" = 1) - foodtype = MEAT - value = FOOD_JUNK - -/obj/item/reagent_containers/food/snacks/carpmeat/Initialize() - . = ..() - eatverb = pick("bite","chew","gnaw","swallow","chomp") - if(!istype(src, /obj/item/reagent_containers/food/snacks/carpmeat/imitation)) - AddElement(/datum/element/swabable, CELL_LINE_TABLE_CARP, CELL_VIRUS_TABLE_GENERIC_MOB) - -/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/fishfingers - name = "fish fingers" - desc = "A finger of fish." - icon_state = "fishfingers" - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 3) - bitesize = 1 - filling_color = "#CD853F" - tastes = list("fish" = 1, "breadcrumbs" = 1) - foodtype = MEAT - value = FOOD_EXOTIC - -/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/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 3) - filling_color = "#FA8072" - tastes = list("fish" = 1, "chips" = 1) - foodtype = MEAT | VEGETABLES | FRIED - value = FOOD_EXOTIC - -////////////////////////////////////////////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/protein = 2) - filling_color = "#F0E68C" - tastes = list("tofu" = 1) - foodtype = VEGETABLES - value = FOOD_JUNK - -/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/protein = 3, /datum/reagent/toxin = 2) - cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg - filling_color = "#000000" - tastes = list("cobwebs" = 1) - foodtype = MEAT | TOXIC - value = FOOD_JUNK - -/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/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 4) - tastes = list("meat" = 1, "cabbage" = 1) - foodtype = MEAT | VEGETABLES - value = FOOD_RARE - -/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 - value = FOOD_EXOTIC - -/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/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 1) - filling_color = "#800000" - tastes = list("meat" = 1) - foodtype = MEAT - value = FOOD_JUNK - -/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/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /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 - var/roasted = FALSE - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/sausage/Initialize() - . = ..() - eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") - -/obj/item/reagent_containers/food/snacks/salami - name = "salami" - desc = "A slice of cured salami." - icon_state = "salami" - filling_color = "#CD4122" - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 1) - tastes = list("meat" = 1, "smoke" = 1) - foodtype = MEAT - value = FOOD_JUNK - -/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/protein = 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 - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/khinkali - name = "khinkali" - desc = "One hundred khinkalis? Do I look like a pig?" - icon_state = "khinkali" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1) - bitesize = 3 - filling_color = "#F0F0F0" - tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) - foodtype = MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/monkeycube - name = "monkey cube" - desc = "Just add water!" - icon_state = "monkeycube" - bitesize = 12 - list_reagents = list(/datum/reagent/monkey_powder = 30) - filling_color = "#CD853F" - tastes = list("the jungle" = 1, "bananas" = 1) - foodtype = MEAT | SUGAR - var/faction - var/spawned_mob = /mob/living/carbon/monkey - -/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand() - var/mob/spammer = get_mob_by_key(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/suicide_act(mob/living/M) - M.visible_message("[M] is putting [src] in [M.p_their()] mouth! It looks like [M.p_theyre()] trying to commit suicide!") - var/eating_success = do_after(M, 10, TRUE, src, TRUE) - if(QDELETED(M)) //qdeletion: the nuclear option of self-harm - return SHAME - if(!eating_success || QDELETED(src)) //checks if src is gone or if they failed to wait for a second - M.visible_message("[M] chickens out!") - return SHAME - if(HAS_TRAIT(M, TRAIT_NOHUNGER)) //plasmamen don't have saliva/stomach acid - M.visible_message("[M] realizes [M.p_their()] body won't activate [src]!" - ,"Your body won't activate [src]...") - return SHAME - playsound(M, 'sound/items/eatfood.ogg', rand(10,50), TRUE) - M.temporarilyRemoveItemFromInventory(src) //removes from hands, keeps in M - addtimer(CALLBACK(src, .proc/finish_suicide, M), 15) //you've eaten it, you can run now - return MANUAL_SUICIDE - -/obj/item/reagent_containers/food/snacks/monkeycube/proc/finish_suicide(mob/living/M) ///internal proc called by a monkeycube's suicide_act using a timer and callback. takes as argument the mob/living who activated the suicide - if(QDELETED(M) || QDELETED(src)) - return - if((src.loc != M)) //how the hell did you manage this - to_chat(M, "Something happened to [src]...") - return - Expand() - M.visible_message("[M]'s torso bursts open as a primate emerges!") - M.gib(null, TRUE, null, TRUE) - -/obj/item/reagent_containers/food/snacks/monkeycube/syndicate - faction = list("neutral", ROLE_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/monkey_powder = 30, /datum/reagent/medicine/strange_reagent = 5) - tastes = list("the jungle" = 1, "bananas" = 1, "jimmies" = 1) - spawned_mob = /mob/living/simple_animal/hostile/gorilla - value = FOOD_ILLEGAL - -/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/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - bitesize = 4 - filling_color = "#FFA07A" - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/capsaicin = 6) - tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) - foodtype = MEAT - value = FOOD_EXOTIC - -/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, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 5) - filling_color = "#D2691E" - tastes = list("soy" = 1, "vegetables" = 1) - foodtype = VEGETABLES - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize() - . = ..() - 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/protein = 1, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/capsaicin = 2) - filling_color = "#000000" - tastes = list("hot peppers" = 1, "cobwebs" = 1) - foodtype = MEAT - value = FOOD_JUNK - -/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/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 6) - bitesize = 4 - filling_color = "#7FFF00" - tastes = list("meat" = 1, "the colour green" = 1) - foodtype = MEAT - value = FOOD_FAST - -/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/protein = 4, /datum/reagent/consumable/capsaicin = 4, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/capsaicin = 5) - filling_color = "#FA8072" - tastes = list("fish" = 1, "hot peppers" = 1) - foodtype = MEAT | TOXIC - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/sashimi/Initialize() - . = ..() - AddElement(/datum/element/swabable, CELL_LINE_TABLE_CARP, CELL_VIRUS_TABLE_GENERIC_MOB) -/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/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2) - tastes = list("\"chicken\"" = 1) - foodtype = MEAT - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/nugget/Initialize() - . = ..() - 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 = 4, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1) - filling_color = "#800000" - tastes = list("meat" = 1, "butter" = 1) - foodtype = MEAT | DAIRY - value = FOOD_FAST - -/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/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5) - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/bbqsauce = 5) //loose reagents included in the recipe do not get added to the finished food automatically. - tastes = list("meat" = 3, "smokey sauce" = 1) - foodtype = MEAT - value = FOOD_EXOTIC - -/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/protein = 12) - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2) - 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/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("tender meat" = 3, "metal" = 1) - foodtype = MEAT | GROSS - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/kebab/monkey - name = "meat-kebab" - desc = "Delicious meat, on a stick." - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("meat" = 3, "metal" = 1) - foodtype = MEAT - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/kebab/tofu - name = "tofu-kebab" - desc = "Vegan meat, on a stick." - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 1) - tastes = list("tofu" = 3, "metal" = 1) - foodtype = VEGETABLES - value = FOOD_FAST - -/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/protein = 16, /datum/reagent/consumable/nutriment/vitamin = 4) //lizard tails are not reagent containers, so the bonus_reagents need to be set higher. - tastes = list("meat" = 8, "metal" = 4, "scales" = 1) - foodtype = MEAT - value = FOOD_RARE - -/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/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 2) - bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("rat meat" = 1, "metal" = 1) - foodtype = MEAT | GROSS - value = FOOD_FAST - -/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/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 4) - value = FOOD_RARE - -/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/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/capsaicin = 3) - value = FOOD_EXOTIC diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 517f47dfb6f..5b0ab171ed1 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -42,23 +42,21 @@ juice_results = list(/datum/reagent/consumable/watermelonjuice = 5) value = FOOD_WORTHLESS -/obj/item/reagent_containers/food/snacks/candy_corn +/obj/item/food/candy_corn name = "candy corn" desc = "It's a handful of candy corn. Can be stored in a detective's hat." icon_state = "candy_corn" - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2) - filling_color = "#FF8C00" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2) tastes = list("candy corn" = 1) - foodtype = JUNKFOOD | SUGAR - value = FOOD_JUNK + foodtypes = JUNKFOOD | SUGAR -/obj/item/reagent_containers/food/snacks/candy_corn/prison +/obj/item/food/candy_corn/prison name = "desiccated candy corn" desc = "If this candy corn were any harder Security would confiscate it for being a potential shiv." force = 1 // the description isn't lying throwforce = 1 // if someone manages to bust out of jail with candy corn god bless them tastes = list("bitter wax" = 1) - foodtype = GROSS + foodtypes = GROSS /obj/item/reagent_containers/food/snacks/chocolatebar name = "chocolate bar" @@ -209,16 +207,13 @@ foodtype = TOXIC | SUGAR value = FOOD_EXOTIC -/obj/item/reagent_containers/food/snacks/eggwrap +/obj/item/food/eggwrap name = "egg wrap" desc = "The precursor to Pigs in a Blanket." icon_state = "eggwrap" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 5) - filling_color = "#F0E68C" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 3) tastes = list("egg" = 1) - foodtype = MEAT | GRAIN - value = FOOD_EXOTIC + foodtypes = MEAT | GRAIN /obj/item/reagent_containers/food/snacks/spidereggs name = "spider eggs" @@ -285,18 +280,14 @@ foodtype = JUNKFOOD | SUGAR value = FOOD_RARE -/obj/item/reagent_containers/food/snacks/eggplantparm +/obj/item/food/eggplantparm name = "eggplant parmigiana" desc = "The only good recipe for eggplant." icon_state = "eggplantparm" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - - filling_color = "#BA55D3" + trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("eggplant" = 3, "cheese" = 1) - foodtype = VEGETABLES | DAIRY - value = FOOD_FAST + foodtypes = VEGETABLES | DAIRY /obj/item/reagent_containers/food/snacks/tortilla name = "tortilla" diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index f4d9b14caed..8acabc420d6 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -667,16 +667,13 @@ foodtype = GRAIN | MEAT | VEGETABLES value = FOOD_RARE -/obj/item/reagent_containers/food/snacks/meatbun +/obj/item/food/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" + food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("bun" = 3, "meat" = 2) - foodtype = GRAIN | MEAT | VEGETABLES - value = FOOD_EXOTIC + foodtypes = GRAIN | MEAT | VEGETABLES /obj/item/reagent_containers/food/snacks/khachapuri name = "khachapuri" diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm deleted file mode 100644 index a005432e961..00000000000 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ /dev/null @@ -1,134 +0,0 @@ -//this category is very little but I think that it has great potential to grow -////////////////////////////////////////////SALAD//////////////////////////////////////////// -/obj/item/reagent_containers/food/snacks/salad - icon = 'icons/obj/food/soupsalad.dmi' - trash = /obj/item/reagent_containers/glass/bowl - bitesize = 3 - w_class = WEIGHT_CLASS_NORMAL - list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("leaves" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/salad/Initialize() - . = ..() - eatverb = pick("devour","nibble","gnaw","gobble","chomp") //who the fuck gnaws and devours on a salad - -/obj/item/reagent_containers/food/snacks/salad/aesirsalad - name = "\improper Aesir salad" - desc = "Probably too incredible for mortal men to fully enjoy." - icon_state = "aesirsalad" - bonus_reagents = list(/datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/nutriment/vitamin = 6) - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/medicine/omnizine = 8, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("leaves" = 1) - foodtype = VEGETABLES | FRUIT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/salad/herbsalad - name = "herb salad" - desc = "A tasty salad with apples on top." - icon_state = "herbsalad" - bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("leaves" = 1, "apple" = 1) - foodtype = VEGETABLES | FRUIT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/salad/validsalad - name = "valid salad" - desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." - icon_state = "validsalad" - bonus_reagents = list(/datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1) - foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/salad/oatmeal - name = "oatmeal" - desc = "A nice bowl of oatmeal." - icon_state = "oatmeal" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("oats" = 1, "milk" = 1) - foodtype = DAIRY | GRAIN | BREAKFAST - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/salad/fruit - name = "fruit salad" - desc = "Your standard fruit salad." - icon_state = "fruitsalad" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("fruit" = 1) - foodtype = FRUIT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/salad/jungle - name = "jungle salad" - desc = "Exotic fruits in a bowl." - icon_state = "junglesalad" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("fruit" = 1, "the jungle" = 1) - foodtype = FRUIT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/salad/citrusdelight - name = "citrus delight" - desc = "Citrus overload!" - icon_state = "citrusdelight" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("sourness" = 1, "leaves" = 1) - foodtype = FRUIT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/salad/ricebowl - name = "ricebowl" - desc = "A bowl of raw rice." - icon_state = "ricebowl" - cooked_type = /obj/item/reagent_containers/food/snacks/salad/boiledrice - list_reagents = list(/datum/reagent/consumable/nutriment = 4) - tastes = list("rice" = 1) - foodtype = GRAIN | RAW - value = FOOD_JUNK - -/obj/item/reagent_containers/food/snacks/salad/boiledrice - name = "boiled rice" - desc = "A warm bowl of rice." - icon_state = "boiledrice" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("rice" = 1) - foodtype = GRAIN - value = FOOD_JUNK - -/obj/item/reagent_containers/food/snacks/salad/ricepudding - name = "rice pudding" - desc = "Everybody loves rice pudding!" - icon_state = "ricepudding" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("rice" = 1, "sweetness" = 1) - foodtype = GRAIN | DAIRY - value = FOOD_FAST - - -/obj/item/reagent_containers/food/snacks/salad/ricepork - name = "rice and pork" - desc = "Well, it looks like pork..." - icon_state = "riceporkbowl" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("rice" = 1, "meat" = 1) - foodtype = GRAIN | MEAT - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/salad/eggbowl - name = "egg bowl" - desc = "A bowl of rice with a fried egg." - icon_state = "eggbowl" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("rice" = 1, "egg" = 1) - foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017 - value = FOOD_RARE //No that's wrong ninja what the hell ~ArcaneMusic 2k20 diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm deleted file mode 100644 index 5a3137a1636..00000000000 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ /dev/null @@ -1,113 +0,0 @@ -/obj/item/reagent_containers/food/snacks/sandwich - name = "sandwich" - desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "sandwich" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - cooked_type = /obj/item/reagent_containers/food/snacks/toastedsandwich - tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) - foodtype = GRAIN | VEGETABLES - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/toastedsandwich - name = "toasted sandwich" - desc = "Now if you only had a pepper bar." - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "toastedsandwich" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/carbon = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/carbon = 2) - tastes = list("toast" = 1) - foodtype = GRAIN - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/grilledcheese - name = "cheese sandwich" - desc = "Goes great with Tomato soup!" - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "toastedsandwich" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("toast" = 1, "cheese" = 1) - foodtype = GRAIN | DAIRY - -/obj/item/reagent_containers/food/snacks/jellysandwich - name = "jelly sandwich" - desc = "You wish you had some peanut butter to go with this..." - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "jellysandwich" - trash = /obj/item/trash/plate - bitesize = 3 - tastes = list("bread" = 1, "jelly" = 1) - foodtype = GRAIN - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/jellysandwich/slime - bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - foodtype = GRAIN | TOXIC - -/obj/item/reagent_containers/food/snacks/jellysandwich/cherry - bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - foodtype = GRAIN | FRUIT | SUGAR - -/obj/item/reagent_containers/food/snacks/notasandwich - name = "not-a-sandwich" - desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "notasandwich" - trash = /obj/item/trash/plate - bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("nothing suspicious" = 1) - foodtype = GRAIN | GROSS - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/jelliedtoast - name = "jellied toast" - desc = "A slice of toast covered with delicious jam." - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "jellytoast" - trash = /obj/item/trash/plate - bitesize = 3 - tastes = list("toast" = 1, "jelly" = 1) - foodtype = GRAIN | BREAKFAST - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry - bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - foodtype = GRAIN | FRUIT | SUGAR | BREAKFAST - -/obj/item/reagent_containers/food/snacks/jelliedtoast/slime - bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - foodtype = GRAIN | TOXIC | SUGAR | BREAKFAST - -/obj/item/reagent_containers/food/snacks/butteredtoast - name = "buttered toast" - desc = "Butter lightly spread over a piece of toast." - icon = 'icons/obj/food/food.dmi' - icon_state = "butteredtoast" - bitesize = 3 - filling_color = "#FFA500" - list_reagents = list(/datum/reagent/consumable/nutriment = 4) - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("butter" = 1, "toast" = 1) - foodtype = GRAIN | BREAKFAST - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/twobread - name = "two bread" - desc = "This seems awfully bitter." - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "twobread" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("bread" = 2) - foodtype = GRAIN - value = FOOD_JUNK diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm deleted file mode 100644 index 8c44928802a..00000000000 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ /dev/null @@ -1,304 +0,0 @@ -/obj/item/reagent_containers/food/snacks/soup - w_class = WEIGHT_CLASS_NORMAL - icon = 'icons/obj/food/soupsalad.dmi' - trash = /obj/item/reagent_containers/glass/bowl - bitesize = 5 - volume = 80 - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("tasteless soup" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/soup/Initialize() - . = ..() - eatverb = pick("slurp","sip","inhale","drink") - -/obj/item/reagent_containers/food/snacks/soup/wish - name = "wish soup" - desc = "I wish this was soup." - icon_state = "wishsoup" - list_reagents = list(/datum/reagent/water = 10) - tastes = list("wishes" = 1) - value = FOOD_JUNK - -/obj/item/reagent_containers/food/snacks/soup/wish/Initialize() - . = ..() - var/wish_true = prob(25) - if(wish_true) - desc = "A wish come true!" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 1) - if(wish_true) - reagents.add_reagent(/datum/reagent/consumable/nutriment, 9) - reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/soup/meatball - name = "meatball soup" - desc = "You've got balls kid, BALLS!" - icon_state = "meatballsoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 4) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("meat" = 1) - foodtype = MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/slime - name = "slime soup" - desc = "If no water is available, you may substitute tears." - icon_state = "slimesoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("slime" = 1) - foodtype = TOXIC | SUGAR - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/blood - name = "tomato soup" - desc = "Smells like copper." - icon_state = "tomatosoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6) - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/blood = 10, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("iron" = 1) - foodtype = GROSS - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/wingfangchu - name = "wing fang chu" - desc = "A savory dish of alien wing wang in soy." - icon_state = "wingfangchu" - trash = /obj/item/reagent_containers/glass/bowl - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/soysauce = 5) - list_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/soysauce = 5, /datum/reagent/consumable/nutriment/vitamin = 3) - tastes = list("soy" = 1) - foodtype = MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/clownstears - name = "clown's tears" - desc = "Not very funny." - icon_state = "clownstears" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/clownstears = 10) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/clownstears = 10) - tastes = list("a bad joke" = 1) - foodtype = FRUIT | SUGAR - value = FOOD_LEGENDARY - -/obj/item/reagent_containers/food/snacks/soup/vegetable - name = "vegetable soup" - desc = "A true vegan meal." - icon_state = "vegetablesoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("vegetables" = 1) - foodtype = VEGETABLES - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/nettle - name = "nettle soup" - desc = "To think, the botanist would've beat you to death with one of these." - icon_state = "nettlesoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("nettles" = 1) - foodtype = VEGETABLES - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/mystery - name = "mystery soup" - desc = "The mystery is, why aren't you eating it?" - icon_state = "mysterysoup" - var/extra_reagent = null - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5) - tastes = list("chaos" = 1) - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/mystery/Initialize() - . = ..() - extra_reagent = pick(/datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil, /datum/reagent/medicine/omnizine, /datum/reagent/consumable/banana, /datum/reagent/blood, /datum/reagent/toxin/slimejelly, /datum/reagent/toxin, /datum/reagent/consumable/banana, /datum/reagent/carbon, /datum/reagent/medicine/oculine) - bonus_reagents = list(/datum/reagent/consumable/nutriment = 6) - bonus_reagents[extra_reagent] = 5 - reagents.add_reagent(extra_reagent, 5) - -/obj/item/reagent_containers/food/snacks/soup/hotchili - name = "hot chili" - desc = "A five alarm Texan Chili!" - icon_state = "hotchili" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/capsaicin = 3, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("hot peppers" = 1) - foodtype = VEGETABLES | MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/coldchili - name = "cold chili" - desc = "This slush is barely a liquid!" - icon_state = "coldchili" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/frostoil = 3, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("tomato" = 1, "mint" = 1) - foodtype = VEGETABLES | MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/clownchili - name = "chili con carnival" - desc = "A delicious stew of meat, chiles, and salty, salty clown tears." - icon_state = "clownchili" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/laughter = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/banana = 1) - tastes = list("tomato" = 1, "hot peppers" = 2, "clown feet" = 2, "kind of funny" = 2, "someone's parents" = 2) - foodtype = VEGETABLES | MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/monkeysdelight - name = "monkey's delight" - desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas." - icon_state = "monkeysdelight" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("the jungle" = 1, "banana" = 1) - foodtype = FRUIT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/tomato - name = "tomato soup" - desc = "Drinking this feels like being a vampire! A tomato vampire..." - icon_state = "tomatosoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 3) - tastes = list("tomato" = 1) - foodtype = VEGETABLES - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/soup/tomato/eyeball - name = "eyeball soup" - desc = "It looks back at you..." - icon_state = "eyeballsoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/liquidgibs = 3) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("tomato" = 1, "squirming" = 1) - foodtype = MEAT | GROSS - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/milo - name = "milosoup" - desc = "The universes best soup! Yum!!!" - icon_state = "milosoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("milo" = 1) // wtf is milo - foodtype = VEGETABLES - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/soup/mushroom - name = "chantrelle soup" - desc = "A delicious and hearty mushroom soup." - icon_state = "mushroomsoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("mushroom" = 1) - foodtype = VEGETABLES - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/soup/beet - name = "beet soup" - desc = "Wait, how do you spell it again..?" - icon_state = "beetsoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = VEGETABLES - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/soup/beet/Initialize() - . = ..() - name = pick("borsch","bortsch","borstch","borsh","borshch","borscht") - tastes = list(name = 1) - - -/obj/item/reagent_containers/food/snacks/soup/spacylibertyduff - name = "spacy liberty duff" - desc = "Jello gelatin, from Alfred Hubbard's cookbook." - icon_state = "spacylibertyduff" - bitesize = 3 - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/drug/mushroomhallucinogen = 6) - tastes = list("jelly" = 1, "mushroom" = 1) - foodtype = VEGETABLES - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/amanitajelly - name = "amanita jelly" - desc = "Looks curiously toxic." - icon_state = "amanitajelly" - bitesize = 3 - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/drug/mushroomhallucinogen = 3, /datum/reagent/toxin/amatoxin = 6) - tastes = list("jelly" = 1, "mushroom" = 1) - foodtype = VEGETABLES | TOXIC - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/stew - name = "stew" - desc = "A nice and warm stew. Healthy and strong." - icon_state = "stew" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - bitesize = 7 - volume = 100 - tastes = list("tomato" = 1, "carrot" = 1) - foodtype = VEGETABLES - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/sweetpotato - name = "sweet potato soup" - desc = "Delicious sweet potato in soup form." - icon_state = "sweetpotatosoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("sweet potato" = 1) - foodtype = VEGETABLES | SUGAR - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/soup/beet/red - name = "red beet soup" - desc = "Quite a delicacy." - icon_state = "redbeetsoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("beet" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/soup/onion - name = "french onion soup" - desc = "Good enough to make a grown mime cry." - icon_state = "onionsoup" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("caramelized onions" = 1) - foodtype = VEGETABLES - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/soup/bisque - name = "bisque" - desc = "A classic entree from Space-France." - icon_state = "bisque" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 6) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("creamy texture" = 1, "crab" = 4) - foodtype = MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/electron - name = "electron soup" - desc = "A gastronomic curiosity of ethereal origin. It is famed for the minature weather system formed over a properly prepared soup." - icon_state = "electronsoup" - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 5) - tastes = list("mushroom" = 1, "electrons" = 4) - filling_color = "#CC2B52" - foodtype = VEGETABLES | TOXIC - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/soup/bungocurry - name = "bungo curry" - desc = "A spicy vegetable curry made with the humble bungo fruit, Exotic!" - icon_state = "bungocurry" - bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/bungojuice = 6) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/bungojuice = 6, /datum/reagent/consumable/capsaicin = 5) - tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1) - filling_color = "#E6A625" - foodtype = VEGETABLES | FRUIT | DAIRY - value = FOOD_EXOTIC diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 7c4637da6f0..439120b1991 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 @@ -202,7 +202,7 @@ qdel(src.occupant) addtimer(CALLBACK(src, .proc/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, TRUE) 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 ec472a72dbd..a646238521e 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -89,7 +89,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, TRUE) 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 817853e9a65..773b8965169 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -16,7 +16,7 @@ /datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/reagent_containers/food/snacks/tofu(location) + new /obj/item/food/tofu(location) return /datum/chemical_reaction/chocolatepudding @@ -83,7 +83,7 @@ /datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/reagent_containers/food/snacks/meat/slab/synthmeat(location) + new /obj/item/food/meat/slab/synthmeat(location) /datum/chemical_reaction/hot_ramen results = list(/datum/reagent/consumable/hot_ramen = 3) @@ -95,12 +95,12 @@ /datum/chemical_reaction/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/carpmeat/imitation(location) if(holder && holder.my_atom) qdel(holder.my_atom) @@ -132,7 +132,7 @@ /datum/chemical_reaction/ricebowl/on_reaction(datum/reagents/holder) var/location = get_turf(holder.my_atom) - new /obj/item/reagent_containers/food/snacks/salad/ricebowl(location) + new /obj/item/food/salad/ricebowl(location) if(holder && holder.my_atom) qdel(holder.my_atom) @@ -140,7 +140,7 @@ results = list(/datum/reagent/consumable/nutriment/peptides = 0.5) required_reagents = list(/datum/reagent/consumable/nutriment/ = 0.5) required_catalysts = list(/datum/reagent/medicine/metafactor = 0.5) - + /datum/chemical_reaction/protein_peptide results = list(/datum/reagent/consumable/nutriment/peptides = 0.5) required_reagents = list(/datum/reagent/consumable/nutriment/protein = 0.5) diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm index 358201fedba..e10f2cd8a58 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -6,12 +6,12 @@ var/multiplier = 1 //This multiplies the number of products produced per object processed. /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 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 03c0032a679..43369149a36 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 @@ -38,7 +38,7 @@ reqs = list( /datum/reagent/consumable/milk = 5, /obj/item/food/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 3, + /obj/item/food/boiledegg = 3, /obj/item/reagent_containers/food/snacks/grown/banana = 1 ) result = /obj/item/food/bread/banana @@ -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 @@ -118,7 +118,7 @@ /obj/item/food/bread/plain = 1, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1, - /obj/item/reagent_containers/food/snacks/meat/slab = 3, + /obj/item/food/meat/slab = 3, /datum/reagent/blood = 50, /datum/reagent/medicine/strange_reagent = 5 ) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index ed3bef573b5..a3697390a84 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/carpmeat = 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/boiledegg = 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 ) @@ -352,8 +352,8 @@ /datum/crafting_recipe/food/mcguffin name = "McGuffin" reqs = list( - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/meat/bacon = 2, + /obj/item/food/friedegg = 1, + /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 = 2, + /obj/item/food/meat/steak/plain = 2, /obj/item/reagent_containers/food/snacks/bun = 1, /obj/item/reagent_containers/food/snacks/cheesewedge = 2, /obj/item/reagent_containers/food/snacks/grown/chili = 1, 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 95c9613eabb..fb30f9b471b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -165,7 +165,7 @@ always_available = FALSE reqs = list( /obj/item/food/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/sundae = 2, + /obj/item/food/sundae = 2, /obj/item/reagent_containers/food/snacks/grown/banana = 5 ) result = /obj/item/food/cake/clown_cake @@ -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_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm index 0a8b24a4c97..bbfe208b445 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm @@ -120,7 +120,7 @@ result = /obj/item/reagent_containers/food/drinks/bottle/candycornliquor time = 30 reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100, - /obj/item/reagent_containers/food/snacks/candy_corn = 1, + /obj/item/food/candy_corn = 1, /obj/item/reagent_containers/food/drinks/bottle = 1) category = CAT_DRINK @@ -129,7 +129,7 @@ result = /obj/item/reagent_containers/food/drinks/bottle/kong time = 30 reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100, - /obj/item/reagent_containers/food/snacks/monkeycube = 1, + /obj/item/food/monkeycube = 1, /obj/item/reagent_containers/food/drinks/bottle = 1) category = CAT_DRINK @@ -140,7 +140,7 @@ reqs = list(/obj/item/storage/bag/trash = 1, /obj/item/food/breadslice/moldy = 1, /obj/item/reagent_containers/food/snacks/grown = 4, - /obj/item/reagent_containers/food/snacks/candy_corn = 2, + /obj/item/food/candy_corn = 2, /datum/reagent/water = 15) category = CAT_DRINK 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 df68bfaf579..83c4ea1b5c0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -8,46 +8,46 @@ reqs = list( /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/food/snacks/egg = 1 + /obj/item/food/egg = 1 ) - result = /obj/item/reagent_containers/food/snacks/friedegg + result = /obj/item/food/friedegg subcategory = CAT_EGG /datum/crafting_recipe/food/omelette name = "Omelette" reqs = list( - /obj/item/reagent_containers/food/snacks/egg = 2, + /obj/item/food/egg = 2, /obj/item/reagent_containers/food/snacks/cheesewedge = 2 ) - result = /obj/item/reagent_containers/food/snacks/omelette + result = /obj/item/food/omelette subcategory = CAT_EGG /datum/crafting_recipe/food/chocolateegg name = "Chocolate egg" reqs = list( - /obj/item/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/food/boiledegg = 1, /obj/item/reagent_containers/food/snacks/chocolatebar = 1 ) - result = /obj/item/reagent_containers/food/snacks/chocolateegg + result = /obj/item/food/chocolateegg subcategory = CAT_EGG /datum/crafting_recipe/food/eggsbenedict 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/friedegg = 1, + /obj/item/food/meat/steak = 1, /obj/item/food/breadslice/plain = 1, ) - result = /obj/item/reagent_containers/food/snacks/benedict + result = /obj/item/food/benedict subcategory = CAT_EGG /datum/crafting_recipe/food/eggbowl name = "Egg bowl" reqs = list( - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/food/salad/boiledrice = 1, + /obj/item/food/boiledegg = 1, /obj/item/reagent_containers/food/snacks/grown/carrot = 1, /obj/item/reagent_containers/food/snacks/grown/corn = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/eggbowl + result = /obj/item/food/salad/eggbowl subcategory = CAT_EGG diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 588eb863fbd..38499994c3d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -10,7 +10,7 @@ /datum/reagent/consumable/ice = 5, /obj/item/reagent_containers/food/snacks/icecream = 1 ) - result = /obj/item/reagent_containers/food/snacks/icecreamsandwich + result = /obj/item/food/icecreamsandwich subcategory = CAT_ICE /datum/crafting_recipe/food/strawberryicecreamsandwich @@ -20,7 +20,7 @@ /datum/reagent/consumable/ice = 5, /obj/item/reagent_containers/food/snacks/grown/berries = 2, ) - result = /obj/item/reagent_containers/food/snacks/strawberryicecreamsandwich + result = /obj/item/food/strawberryicecreamsandwich subcategory = CAT_ICE /datum/crafting_recipe/food/spacefreezy @@ -30,7 +30,7 @@ /datum/reagent/consumable/spacemountainwind = 15, /obj/item/reagent_containers/food/snacks/icecream = 1 ) - result = /obj/item/reagent_containers/food/snacks/spacefreezy + result = /obj/item/food/spacefreezy subcategory = CAT_ICE /datum/crafting_recipe/food/sundae @@ -41,7 +41,7 @@ /obj/item/reagent_containers/food/snacks/grown/banana = 1, /obj/item/reagent_containers/food/snacks/icecream = 1 ) - result = /obj/item/reagent_containers/food/snacks/sundae + result = /obj/item/food/sundae subcategory = CAT_ICE /datum/crafting_recipe/food/honkdae @@ -53,7 +53,7 @@ /obj/item/reagent_containers/food/snacks/grown/banana = 2, /obj/item/reagent_containers/food/snacks/icecream = 1 ) - result = /obj/item/reagent_containers/food/snacks/honkdae + result = /obj/item/food/honkdae subcategory = CAT_ICE /datum/crafting_recipe/food/cornuto @@ -65,7 +65,7 @@ /datum/reagent/consumable/ice = 2, /datum/reagent/consumable/sugar = 4 ) - result = /obj/item/reagent_containers/food/snacks/cornuto + result = /obj/item/food/cornuto subcategory = CAT_ICE //////////////////////////SNOW CONES/////////////////////// @@ -76,7 +76,7 @@ /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15 ) - result = /obj/item/reagent_containers/food/snacks/snowcones + result = /obj/item/food/snowcones subcategory = CAT_ICE /datum/crafting_recipe/food/pineapple_sc @@ -86,7 +86,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/pineapplejuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple + result = /obj/item/food/snowcones/pineapple subcategory = CAT_ICE /datum/crafting_recipe/food/lime_sc @@ -96,7 +96,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/limejuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/lime + result = /obj/item/food/snowcones/lime subcategory = CAT_ICE /datum/crafting_recipe/food/lemon_sc @@ -106,7 +106,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/lemonjuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/lemon + result = /obj/item/food/snowcones/lemon subcategory = CAT_ICE /datum/crafting_recipe/food/apple_sc @@ -116,7 +116,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/applejuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/apple + result = /obj/item/food/snowcones/apple subcategory = CAT_ICE /datum/crafting_recipe/food/grape_sc @@ -126,7 +126,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/grapejuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/grape + result = /obj/item/food/snowcones/grape subcategory = CAT_ICE /datum/crafting_recipe/food/orange_sc @@ -136,7 +136,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/orangejuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/orange + result = /obj/item/food/snowcones/orange subcategory = CAT_ICE /datum/crafting_recipe/food/blue_sc @@ -146,7 +146,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/bluecherryjelly= 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/blue + result = /obj/item/food/snowcones/blue subcategory = CAT_ICE /datum/crafting_recipe/food/red_sc @@ -156,7 +156,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/cherryjelly= 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/red + result = /obj/item/food/snowcones/red subcategory = CAT_ICE /datum/crafting_recipe/food/berry_sc @@ -166,7 +166,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/berryjuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/berry + result = /obj/item/food/snowcones/berry subcategory = CAT_ICE /datum/crafting_recipe/food/fruitsalad_sc @@ -179,7 +179,7 @@ /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/lemonjuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad + result = /obj/item/food/snowcones/fruitsalad subcategory = CAT_ICE /datum/crafting_recipe/food/mime_sc @@ -189,7 +189,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/nothing = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/mime + result = /obj/item/food/snowcones/mime subcategory = CAT_ICE /datum/crafting_recipe/food/clown_sc @@ -199,7 +199,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/laughter = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/clown + result = /obj/item/food/snowcones/clown subcategory = CAT_ICE /datum/crafting_recipe/food/soda_sc @@ -209,7 +209,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/space_cola = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/soda + result = /obj/item/food/snowcones/soda subcategory = CAT_ICE /datum/crafting_recipe/food/spacemountainwind_sc @@ -219,7 +219,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/spacemountainwind = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind + result = /obj/item/food/snowcones/spacemountainwind subcategory = CAT_ICE /datum/crafting_recipe/food/pwrgame_sc @@ -229,7 +229,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/pwr_game = 15 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame + result = /obj/item/food/snowcones/pwrgame subcategory = CAT_ICE /datum/crafting_recipe/food/honey_sc @@ -239,7 +239,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/honey = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/honey + result = /obj/item/food/snowcones/honey subcategory = CAT_ICE /datum/crafting_recipe/food/rainbow_sc @@ -249,7 +249,7 @@ /datum/reagent/consumable/ice = 15, /datum/reagent/colorful_reagent = 1 //Harder to make ) - result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow + result = /obj/item/food/snowcones/rainbow subcategory = CAT_ICE //////////////////////////POPSICLES/////////////////////// @@ -267,7 +267,7 @@ /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 2 ) - result = /obj/item/reagent_containers/food/snacks/popsicle/creamsicle_orange + result = /obj/item/food/popsicle/creamsicle_orange subcategory = CAT_ICE /datum/crafting_recipe/food/berry_popsicle @@ -280,7 +280,7 @@ /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 2 ) - result = /obj/item/reagent_containers/food/snacks/popsicle/creamsicle_berry + result = /obj/item/food/popsicle/creamsicle_berry subcategory = CAT_ICE /datum/crafting_recipe/food/jumbo @@ -293,7 +293,7 @@ /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2 ) - result = /obj/item/reagent_containers/food/snacks/popsicle/jumbo + result = /obj/item/food/popsicle/jumbo subcategory = CAT_ICE /datum/crafting_recipe/food/nogga_black @@ -307,5 +307,5 @@ /datum/reagent/consumable/vanilla = 2, /datum/reagent/consumable/sugar = 2 ) - result = /obj/item/reagent_containers/food/snacks/popsicle/nogga_black + result = /obj/item/food/popsicle/nogga_black subcategory = CAT_ICE 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 4c5775b86e4..043e904aa58 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/carpmeat = 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/carpmeat = 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/carpmeat = 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/carpmeat = 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 @@ -142,24 +142,24 @@ /obj/item/reagent_containers/food/snacks/grown/carrot = 1, /obj/item/reagent_containers/food/snacks/grown/tomato = 1 ) - result = /obj/item/reagent_containers/food/snacks/stewedsoymeat + result = /obj/item/food/stewedsoymeat subcategory = CAT_MEAT /datum/crafting_recipe/food/sausage name = "Sausage" reqs = list( - /obj/item/reagent_containers/food/snacks/meatball = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2 + /obj/item/food/meatball = 1, + /obj/item/food/meat/cutlet = 2 ) - result = /obj/item/reagent_containers/food/snacks/sausage + result = /obj/item/food/sausage subcategory = CAT_MEAT /datum/crafting_recipe/food/nugget name = "Chicken nugget" reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 + /obj/item/food/meat/cutlet = 1 ) - result = /obj/item/reagent_containers/food/snacks/nugget + result = /obj/item/food/nugget subcategory = CAT_MEAT /datum/crafting_recipe/food/rawkhinkali @@ -167,9 +167,9 @@ 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/pigblanket @@ -177,9 +177,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 +188,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,33 +197,33 @@ /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/salad/boiledrice = 1, + /obj/item/food/meat/cutlet = 2 ) - result = /obj/item/reagent_containers/food/snacks/salad/ricepork + result = /obj/item/food/salad/ricepork subcategory = CAT_MEAT /datum/crafting_recipe/food/ribs 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 372106a9dc7..b40e65dcf99 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -71,10 +71,10 @@ /datum/crafting_recipe/food/wrap name = "Wrap" reqs = list(/datum/reagent/consumable/soysauce = 10, - /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/food/friedegg = 1, /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, ) - result = /obj/item/reagent_containers/food/snacks/eggwrap + result = /obj/item/food/eggwrap subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/beans @@ -92,7 +92,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge = 2, /obj/item/reagent_containers/food/snacks/grown/eggplant = 1 ) - result = /obj/item/reagent_containers/food/snacks/eggplantparm + result = /obj/item/food/eggplantparm subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/baguette @@ -113,7 +113,7 @@ /datum/reagent/toxin/slimejelly = 5, /obj/item/food/breadslice/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime + result = /obj/item/food/jelliedtoast/slime subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/jelliedyoast @@ -122,7 +122,7 @@ /datum/reagent/consumable/cherryjelly = 5, /obj/item/food/breadslice/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry + result = /obj/item/food/jelliedtoast/cherry subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/butteredtoast @@ -131,7 +131,7 @@ /obj/item/food/breadslice/plain = 1, /obj/item/reagent_containers/food/snacks/butter = 1 ) - result = /obj/item/reagent_containers/food/snacks/butteredtoast + result = /obj/item/food/butteredtoast subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/twobread @@ -140,7 +140,7 @@ /datum/reagent/consumable/ethanol/wine = 5, /obj/item/food/breadslice/plain = 2 ) - result = /obj/item/reagent_containers/food/snacks/twobread + result = /obj/item/food/twobread subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/burrito @@ -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 @@ -295,7 +295,7 @@ name = "Bran Requests Cereal" reqs = list( /obj/item/reagent_containers/food/snacks/grown/wheat = 1, - /obj/item/reagent_containers/food/snacks/no_raisin = 1, + /obj/item/food/no_raisin = 1, ) result = /obj/item/reagent_containers/food/snacks/branrequests subcategory = CAT_MISCFOOD @@ -305,9 +305,9 @@ reqs = list( /datum/reagent/consumable/milk = 5, /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 + /obj/item/food/salad/boiledrice = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/ricepudding + result = /obj/item/food/salad/ricepudding subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/butterbear //ITS ALIVEEEEEE! @@ -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 f8aedf8d335..bb7b72b7a7d 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 @@ -342,7 +342,7 @@ name = "Spicy-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/meatball = 1, + /obj/item/food/meatball = 1, /obj/item/reagent_containers/food/snacks/grown/chili ) result = /obj/item/reagent_containers/food/snacks/donkpocket/spicy @@ -353,7 +353,7 @@ name = "Teriyaki-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/meatball = 1, + /obj/item/food/meatball = 1, /datum/reagent/consumable/soysauce = 3 ) result = /obj/item/reagent_containers/food/snacks/donkpocket/teriyaki @@ -364,7 +364,7 @@ name = "Pizza-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/meatball = 1, + /obj/item/food/meatball = 1, /obj/item/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/reagent_containers/food/snacks/donkpocket/pizza @@ -396,7 +396,7 @@ name = "Gondola-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/meatball = 1, + /obj/item/food/meatball = 1, /datum/reagent/tranquility = 5 ) result = /obj/item/reagent_containers/food/snacks/donkpocket/gondola @@ -440,7 +440,7 @@ reqs = list( /datum/reagent/water = 5, /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/boiledegg = 2, + /obj/item/food/boiledegg = 2, /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) result = /obj/item/reagent_containers/food/snacks/chawanmushi @@ -453,7 +453,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_PASTRY @@ -463,10 +463,10 @@ 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/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_PASTRY /datum/crafting_recipe/food/khachapuri @@ -554,7 +554,7 @@ /datum/crafting_recipe/food/raisincookie name = "Raisin cookie" reqs = list( - /obj/item/reagent_containers/food/snacks/no_raisin = 1, + /obj/item/food/no_raisin = 1, /obj/item/reagent_containers/food/snacks/pastrybase = 1, /obj/item/reagent_containers/food/snacks/grown/oat = 1 ) 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 8c39dd96222..43934cd81ea 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 2cb668df4fd..33c4b910b94 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 920691bcb75..2ceccc67fcc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -10,7 +10,7 @@ /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, /obj/item/reagent_containers/food/snacks/grown/apple = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/herbsalad + result = /obj/item/food/salad/herbsalad subcategory = CAT_SALAD /datum/crafting_recipe/food/aesirsalad @@ -20,7 +20,7 @@ /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 3, /obj/item/reagent_containers/food/snacks/grown/apple/gold = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/aesirsalad + result = /obj/item/food/salad/aesirsalad subcategory = CAT_SALAD /datum/crafting_recipe/food/validsalad @@ -29,9 +29,9 @@ /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 + result = /obj/item/food/salad/validsalad subcategory = CAT_SALAD /datum/crafting_recipe/food/monkeysdelight @@ -41,10 +41,10 @@ /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 + result = /obj/item/food/soup/monkeysdelight subcategory = CAT_SALAD /datum/crafting_recipe/food/oatmeal @@ -54,7 +54,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/oat = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/oatmeal + result = /obj/item/food/salad/oatmeal subcategory = CAT_SALAD /datum/crafting_recipe/food/fruitsalad @@ -67,7 +67,7 @@ /obj/item/reagent_containers/food/snacks/watermelonslice = 2 ) - result = /obj/item/reagent_containers/food/snacks/salad/fruit + result = /obj/item/food/salad/fruit subcategory = CAT_SALAD /datum/crafting_recipe/food/junglesalad @@ -80,7 +80,7 @@ /obj/item/reagent_containers/food/snacks/watermelonslice = 2 ) - result = /obj/item/reagent_containers/food/snacks/salad/jungle + result = /obj/item/food/salad/jungle subcategory = CAT_SALAD /datum/crafting_recipe/food/citrusdelight @@ -92,5 +92,5 @@ /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight + result = /obj/item/food/salad/citrusdelight subcategory = CAT_SALAD 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 0734c8b413f..fd217494ee1 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -10,10 +10,10 @@ 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 + result = /obj/item/food/sandwich subcategory = CAT_SANDWICH /datum/crafting_recipe/food/grilledcheesesandwich @@ -22,7 +22,7 @@ /obj/item/food/breadslice/plain = 2, /obj/item/reagent_containers/food/snacks/cheesewedge = 2 ) - result = /obj/item/reagent_containers/food/snacks/grilledcheese + result = /obj/item/food/grilledcheese subcategory = CAT_SANDWICH /datum/crafting_recipe/food/slimesandwich @@ -31,7 +31,7 @@ /datum/reagent/toxin/slimejelly = 5, /obj/item/food/breadslice/plain = 2, ) - result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime + result = /obj/item/food/jellysandwich/slime subcategory = CAT_SANDWICH /datum/crafting_recipe/food/cherrysandwich @@ -40,7 +40,7 @@ /datum/reagent/consumable/cherryjelly = 5, /obj/item/food/breadslice/plain = 2, ) - result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry + result = /obj/item/food/jellysandwich/cherry subcategory = CAT_SANDWICH /datum/crafting_recipe/food/notasandwich @@ -49,7 +49,7 @@ /obj/item/food/breadslice/plain = 2, /obj/item/clothing/mask/fakemoustache = 1 ) - result = /obj/item/reagent_containers/food/snacks/notasandwich + result = /obj/item/food/notasandwich subcategory = CAT_SANDWICH diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index a31abc04e7f..a10a039a320 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -8,11 +8,11 @@ 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 ) - result = /obj/item/reagent_containers/food/snacks/soup/meatball + result = /obj/item/food/soup/meatball subcategory = CAT_SOUP /datum/crafting_recipe/food/vegetablesoup @@ -25,7 +25,7 @@ /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/vegetable + result = /obj/item/food/soup/vegetable subcategory = CAT_SOUP /datum/crafting_recipe/food/nettlesoup @@ -35,9 +35,9 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/nettle = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 1 + /obj/item/food/boiledegg = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/nettle + result = /obj/item/food/soup/nettle subcategory = CAT_SOUP /datum/crafting_recipe/food/wingfangchu @@ -45,9 +45,9 @@ 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 + result = /obj/item/food/soup/wingfangchu subcategory = CAT_SOUP /datum/crafting_recipe/food/wishsoup @@ -56,41 +56,41 @@ /datum/reagent/water = 20, /obj/item/reagent_containers/glass/bowl = 1 ) - result= /obj/item/reagent_containers/food/snacks/soup/wish + result= /obj/item/food/soup/wish subcategory = CAT_SOUP /datum/crafting_recipe/food/hotchili 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 ) - result = /obj/item/reagent_containers/food/snacks/soup/hotchili + result = /obj/item/food/soup/hotchili subcategory = CAT_SOUP /datum/crafting_recipe/food/coldchili 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 ) - result = /obj/item/reagent_containers/food/snacks/soup/coldchili + result = /obj/item/food/soup/coldchili subcategory = CAT_SOUP /datum/crafting_recipe/food/clownchili name = "Chili con carnival" 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, /obj/item/clothing/shoes/clown_shoes = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/clownchili + result = /obj/item/food/soup/clownchili subcategory = CAT_SOUP /datum/crafting_recipe/food/tomatosoup @@ -100,7 +100,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/tomato = 2 ) - result = /obj/item/reagent_containers/food/snacks/soup/tomato + result = /obj/item/food/soup/tomato subcategory = CAT_SOUP /datum/crafting_recipe/food/eyeballsoup @@ -111,7 +111,7 @@ /obj/item/reagent_containers/food/snacks/grown/tomato = 2, /obj/item/organ/eyes = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/tomato/eyeball + result = /obj/item/food/soup/tomato/eyeball subcategory = CAT_SOUP @@ -121,9 +121,9 @@ /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 + result = /obj/item/food/soup/milo subcategory = CAT_SOUP /datum/crafting_recipe/food/bloodsoup @@ -133,7 +133,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2 ) - result = /obj/item/reagent_containers/food/snacks/soup/blood + result = /obj/item/food/soup/blood subcategory = CAT_SOUP /datum/crafting_recipe/food/slimesoup @@ -143,7 +143,7 @@ /datum/reagent/toxin/slimejelly = 5, /obj/item/reagent_containers/glass/bowl = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/slime + result = /obj/item/food/soup/slime subcategory = CAT_SOUP /datum/crafting_recipe/food/clownstears @@ -154,7 +154,7 @@ /obj/item/reagent_containers/food/snacks/grown/banana = 1, /obj/item/stack/sheet/mineral/bananium = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/clownstears + result = /obj/item/food/soup/clownstears subcategory = CAT_SOUP /datum/crafting_recipe/food/mysterysoup @@ -163,11 +163,11 @@ /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/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/food/tofu = 1, + /obj/item/food/boiledegg = 1, /obj/item/reagent_containers/food/snacks/cheesewedge = 1, ) - result = /obj/item/reagent_containers/food/snacks/soup/mystery + result = /obj/item/food/soup/mystery subcategory = CAT_SOUP /datum/crafting_recipe/food/mushroomsoup @@ -178,7 +178,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/mushroom + result = /obj/item/food/soup/mushroom subcategory = CAT_SOUP /datum/crafting_recipe/food/beetsoup @@ -189,7 +189,7 @@ /obj/item/reagent_containers/food/snacks/grown/whitebeet = 1, /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, ) - result = /obj/item/reagent_containers/food/snacks/soup/beet + result = /obj/item/food/soup/beet subcategory = CAT_SOUP /datum/crafting_recipe/food/stew @@ -198,13 +198,13 @@ /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, /obj/item/reagent_containers/food/snacks/grown/mushroom = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/stew + result = /obj/item/food/soup/stew subcategory = CAT_SOUP /datum/crafting_recipe/food/spacylibertyduff @@ -214,7 +214,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 3 ) - result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff + result = /obj/item/food/soup/spacylibertyduff subcategory = CAT_SOUP /datum/crafting_recipe/food/amanitajelly @@ -224,7 +224,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3 ) - result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly + result = /obj/item/food/soup/amanitajelly subcategory = CAT_SOUP /datum/crafting_recipe/food/sweetpotatosoup @@ -235,7 +235,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 2 ) - result = /obj/item/reagent_containers/food/snacks/soup/sweetpotato + result = /obj/item/food/soup/sweetpotato subcategory = CAT_SOUP /datum/crafting_recipe/food/redbeetsoup @@ -246,7 +246,7 @@ /obj/item/reagent_containers/food/snacks/grown/redbeet = 1, /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/beet/red + result = /obj/item/food/soup/beet/red subcategory = CAT_SOUP /datum/crafting_recipe/food/onionsoup @@ -257,7 +257,7 @@ /obj/item/reagent_containers/food/snacks/grown/onion = 1, /obj/item/reagent_containers/food/snacks/cheesewedge = 1, ) - result = /obj/item/reagent_containers/food/snacks/soup/onion + result = /obj/item/food/soup/onion subcategory = CAT_SOUP /datum/crafting_recipe/food/bisque @@ -265,10 +265,10 @@ reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/meat/crab = 1, - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 + /obj/item/food/meat/crab = 1, + /obj/item/food/salad/boiledrice = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/bisque + result = /obj/item/food/soup/bisque subcategory = CAT_SOUP /datum/crafting_recipe/food/bungocurry @@ -280,7 +280,7 @@ /obj/item/reagent_containers/food/snacks/grown/chili = 1, /obj/item/reagent_containers/food/snacks/grown/bungofruit = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/bungocurry + result = /obj/item/food/soup/bungocurry subcategory = CAT_SOUP /datum/crafting_recipe/food/electron @@ -291,5 +291,5 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/electron + result = /obj/item/food/soup/electron subcategory = CAT_SOUP 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 2ad56d0ce62..455f63acddf 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 ) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 2167d8e2294..3bbbe9f1c58 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -41,8 +41,8 @@ speak_emote = list("sniffles","twitches") 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) - egg_type = /obj/item/reagent_containers/food/snacks/egg/loaded + butcher_results = list(/obj/item/food/meat/slab = 1) + egg_type = /obj/item/food/egg/loaded food_type = /obj/item/reagent_containers/food/snacks/grown/carrot eggsleft = 10 eggsFertile = FALSE @@ -69,7 +69,7 @@ /obj/item/storage/basket/easter/Initialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) - STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/chocolateegg, /obj/item/reagent_containers/food/snacks/boiledegg)) + STR.set_holdable(list(/obj/item/food/egg, /obj/item/food/chocolateegg, /obj/item/food/boiledegg)) /obj/item/storage/basket/easter/proc/countEggs() cut_overlays() @@ -110,18 +110,18 @@ inhand_icon_state = "satchel_carrot" //Egg prizes and egg spawns! -/obj/item/reagent_containers/food/snacks/egg +/obj/item/food/egg var/containsPrize = FALSE -/obj/item/reagent_containers/food/snacks/egg/loaded +/obj/item/food/egg/loaded containsPrize = TRUE -/obj/item/reagent_containers/food/snacks/egg/loaded/Initialize() +/obj/item/food/egg/loaded/Initialize() . = ..() var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow") icon_state = "egg-[eggcolor]" -/obj/item/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where) +/obj/item/food/egg/proc/dispensePrize(turf/where) var/won = pick(/obj/item/clothing/head/bunnyhead, /obj/item/clothing/suit/bunnysuit, /obj/item/storage/backpack/satchel/bunnysatchel, @@ -154,9 +154,9 @@ /obj/item/toy/windup_toolbox, /obj/item/clothing/head/collectable/rabbitears) new won(where) - new/obj/item/reagent_containers/food/snacks/chocolateegg(where) + new/obj/item/food/chocolateegg(where) -/obj/item/reagent_containers/food/snacks/egg/attack_self(mob/user) +/obj/item/food/egg/attack_self(mob/user) ..() if(containsPrize) to_chat(user, "You unwrap [src] and find a prize inside!") @@ -203,19 +203,12 @@ reqs = list( /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/boiledegg = 1, + /obj/item/food/meatball = 1 ) result = /obj/item/reagent_containers/food/snacks/scotchegg subcategory = CAT_MISCFOOD -/obj/item/reagent_containers/food/snacks/soup/mammi - name = "Mammi" - desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement." - icon_state = "mammi" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) - /datum/crafting_recipe/food/mammi name = "Mammi" reqs = list( @@ -223,7 +216,7 @@ /obj/item/reagent_containers/food/snacks/chocolatebar = 1, /datum/reagent/consumable/milk = 5 ) - result = /obj/item/reagent_containers/food/snacks/soup/mammi + result = /obj/item/food/soup/mammi subcategory = CAT_MISCFOOD /obj/item/reagent_containers/food/snacks/chocolatebunny diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index d4763a7a720..ce3675fce2f 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -8,14 +8,14 @@ /datum/recipe/sugarcookie/spookyskull reagents_list = list(/datum/reagent/consumable/flour = 5, /datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/milk = 5) items = list( - /obj/item/reagent_containers/food/snacks/egg, + /obj/item/food/egg, ) result = /obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull /datum/recipe/sugarcookie/spookycoffin reagents_list = list(/datum/reagent/consumable/flour = 5, /datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/coffee = 5) items = list( - /obj/item/reagent_containers/food/snacks/egg, + /obj/item/food/egg, ) result = /obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 799f5223a4b..1f165160831 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -594,7 +594,7 @@ /datum/holiday/easter/celebrate() GLOB.maintenance_loot += list( list( - /obj/item/reagent_containers/food/snacks/egg/loaded = 15, + /obj/item/food/egg/loaded = 15, /obj/item/storage/basket/easter = 15 ) = maint_holiday_weight, ) diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index ece20e5c8d3..4532a238872 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -218,7 +218,7 @@ name = "bunch of grapes" desc = "Nutritious!" icon_state = "grapes" - dried_type = /obj/item/reagent_containers/food/snacks/no_raisin/healthy + dried_type = /obj/item/food/no_raisin/healthy filling_color = "#FF1493" bitesize_mod = 2 foodtype = FRUIT diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index ed774710b7f..08bc7b9e294 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -101,7 +101,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, TRUE) - 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/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm index f893ad9e57c..a9977180a60 100644 --- a/code/modules/hydroponics/grown/eggplant.dm +++ b/code/modules/hydroponics/grown/eggplant.dm @@ -43,7 +43,7 @@ name = "egg-plant" desc = "There MUST be a chicken inside." icon_state = "eggyplant" - trash = /obj/item/reagent_containers/food/snacks/egg + trash = /obj/item/food/egg filling_color = "#F8F8FF" bitesize_mod = 2 foodtype = MEAT diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 6930ba819ed..739c447a3f6 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -213,7 +213,7 @@ prize_list += list( new /datum/data/mining_equipment("Extra Id", /obj/item/card/id/mining, 250), new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), - new /datum/data/mining_equipment("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 300), + new /datum/data/mining_equipment("Monkey Cube", /obj/item/food/monkeycube, 300), new /datum/data/mining_equipment("Toolbelt", /obj/item/storage/belt/utility, 350), new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500), new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 62c2e35faea..29ceb8fa462 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 var/has_fine_manipulation = 0 var/move_delay_add = 0 // movement delay to add diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index ba453facb39..63ff0646c86 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 = 1 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 2ae3f7fbf09..3b8a435bae0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -8,7 +8,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' diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index aa37bdc3c25..2d5bf44b9ce 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -52,7 +52,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 618cdf7687e..044c6ee9149 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) ///If your race uses a non standard bloodtype (A+, O-, AB-, etc). For example, lizards have L type blood. var/exotic_bloodtype = "" ///What the species drops when gibbed by a gibber machine. - var/meat = /obj/item/reagent_containers/food/snacks/meat/slab/human + var/meat = /obj/item/food/meat/slab/human ///What skin the species drops when gibbed by a gibber machine. var/skinned_type ///Bitfield for food types that the species likes, giving them a mood boost. Lizards like meat, for example. 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 c53ccae27e7..11a778cb39d 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -6,7 +6,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/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 ae87c802b52..aef8c02acdf 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -7,7 +7,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 disliked_food = null liked_food = GROSS changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT 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 a1cd43d77bc..51ee2295876 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -18,7 +18,7 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC sexes = 1 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 @@ -66,7 +66,7 @@ /datum/species/golem/adamantine name = "Adamantine Golem" id = "adamantine golem" - 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/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 289ddab6ebb..5e9eb5299ab 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -7,7 +7,7 @@ species_traits = list(MUTCOLORS,EYECOLOR,NOBLOOD) inherent_traits = list(TRAIT_TOXINLOVER) mutantlungs = /obj/item/organ/lungs/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/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index aa872b35bd6..b5e3fa01824 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" disliked_food = GRAIN | DAIRY 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 437cb406ce1..bc0d31e8047 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -10,7 +10,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/moth + meat = /obj/item/food/meat/slab/human/mutant/moth liked_food = VEGETABLES | DAIRY | CLOTH disliked_food = FRUIT | GROSS toxic_food = MEAT | RAW 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 742ca01cd67..dfc8f4584a9 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -12,7 +12,7 @@ burnmod = 1.25 heatmod = 1.5 payday_modifier = 0.75 - meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant + meat = /obj/item/food/meat/slab/human/mutant/plant disliked_food = MEAT | DAIRY liked_food = VEGETABLES | FRUIT | GRAIN changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT 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 f8ffed573bc..b0461b3cda8 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -6,7 +6,7 @@ name = "???" id = "shadow" 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) 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 7922ba18f55..6c0cde62ba0 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 @@ id = "skeleton" say_mod = "rattles" 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, HAS_BONE) inherent_traits = list(TRAIT_NOMETABOLISM,TRAIT_TOXIMMUNE,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_GENELESS,\ 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 38633d2e3a8..0f88afa8877 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -6,7 +6,7 @@ id = "zombie" say_mod = "moans" 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, HAS_FLESH, HAS_BONE) inherent_traits = list(TRAIT_NOMETABOLISM,TRAIT_TOXIMMUNE,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_EASYDISMEMBER,TRAIT_EASYLIMBWOUND,TRAIT_LIMBATTACHMENT,TRAIT_NOBREATH,TRAIT_NODEATH,TRAIT_FAKEDEATH,TRAIT_NOCLONELOSS) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID @@ -96,7 +96,7 @@ id = "goofzombies" limbs_id = "zombie" //They look like zombies sexes = 0 - 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 species_traits = list(HAS_FLESH, HAS_BONE) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index efefd945d1d..16119d82cef 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -8,8 +8,8 @@ pass_flags = PASSTABLE ventcrawler = VENTCRAWLER_NUDE mob_biotypes = 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 can_be_shoved_into = TRUE diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index d7e970f3c8b..a5b285ecfd8 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -23,7 +23,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) + butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1) response_help_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -82,7 +82,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/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/food/breadslice/plain = 1) /mob/living/simple_animal/pet/cat/breadcat/add_cell_sample() return @@ -272,7 +272,7 @@ gender = FEMALE harm_intent_damage = 10 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_continuous = "takes a bite out of" response_harm_simple = "take a bite out of" attacked_sound = 'sound/items/eatfood.ogg' diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index dd7650f7622..75449c32d84 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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 337e60c9632..2c5d91d6f98 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -92,7 +92,7 @@ icon_living = "corgi" icon_dead = "corgi_dead" held_state = "corgi" - 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 @@ -130,7 +130,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 collar_type = "pug" held_state = "pug" @@ -150,7 +150,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 collar_type = "bullterrier" held_state = "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 1e80957da9e..2aa0d7cceb7 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -12,7 +12,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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -125,7 +125,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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -253,7 +253,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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -312,8 +312,8 @@ density = FALSE speak_chance = 2 turns_per_move = 3 - butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 2) - var/egg_type = /obj/item/reagent_containers/food/snacks/egg + butcher_results = list(/obj/item/food/meat/slab/chicken = 2) + var/egg_type = /obj/item/food/egg food_type = list(/obj/item/reagent_containers/food/snacks/grown/wheat) response_help_continuous = "pets" response_help_simple = "pet" @@ -385,8 +385,8 @@ if(chicken_count < MAX_CHICKENS && prob(25)) START_PROCESSING(SSobj, E) -/obj/item/reagent_containers/food/snacks/egg/var/amount_grown = 0 -/obj/item/reagent_containers/food/snacks/egg/process(delta_time) +/obj/item/food/egg/var/amount_grown = 0 +/obj/item/food/egg/process(delta_time) if(isturf(loc)) amount_grown += rand(1,2) * delta_time if(amount_grown >= 200) @@ -436,7 +436,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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently nudges" diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index 8a8a844d703..44da7fc0a85 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.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 = 3) + butcher_results = list(/obj/item/food/meat/slab = 3) response_help_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm index 2e75ecd8824..ef5512964da 100644 --- a/code/modules/mob/living/simple_animal/friendly/gondola.dm +++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm @@ -20,7 +20,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/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 2e30d6967dc..b2213d575df 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -13,7 +13,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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -202,7 +202,7 @@ /obj/item/reagent_containers/food/snacks/deadmouse/attackby(obj/item/I, mob/user, params) if(I.get_sharpness() && 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 bdf29239a11..f8d06536bb5 100644 --- a/code/modules/mob/living/simple_animal/friendly/penguin.dm +++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm @@ -17,7 +17,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) pet_bonus = TRUE pet_bonus_emote = "honks happily!" @@ -35,7 +35,7 @@ icon_living = "penguin" icon_dead = "penguin_dead" 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" @@ -56,5 +56,5 @@ 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 2a2b69c9390..b906de69f70 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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 24dfef5e727..aa90769ffa6 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -8,7 +8,7 @@ icon_gib = "syndicate_gib" gender = FEMALE 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 @@ -86,7 +86,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' @@ -137,7 +137,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 9a5e7c94186..51577f9bae0 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -15,7 +15,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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -97,7 +97,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_lower = 18 melee_damage_upper = 20 wound_bonus = 0 @@ -147,7 +147,7 @@ response_harm_simple = "take 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' attack_verb_continuous = "slaps" diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 94df42c353d..71c8c98cb85 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -11,7 +11,7 @@ mob_biotypes = 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/carpmeat = 2) response_help_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -21,7 +21,7 @@ speed = 0 maxHealth = 25 health = 25 - food_type = list(/obj/item/reagent_containers/food/snacks/meat) + food_type = list(/obj/item/food/meat) tame_chance = 10 bonus_tame_chance = 5 search_objects = 1 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 3a552078edd..703256101a6 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -31,7 +31,7 @@ speak_chance = 5 turns_per_move = 5 see_in_dark = 4 - 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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -109,7 +109,7 @@ icon_living = "nurse" icon_dead = "nurse_dead" 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) maxHealth = 40 health = 40 melee_damage_lower = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index c827d25ebfa..202ace8c9a9 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -8,7 +8,7 @@ mob_biotypes = 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_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" 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 fd109706d7a..f346ed5e1c1 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_continuous = "prods" response_help_simple = "prod" response_disarm_continuous = "challenges" diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm index 8b1de1c2b8a..db3373dba28 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_continuous = "prods" response_help_simple = "prod" response_disarm_continuous = "pushes aside" 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 1277f2d75e9..37a41b30964 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 @@ -97,7 +97,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 = HARD_CRIT @@ -148,7 +148,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/mining_mobs/lobstrosity.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm index 140042024df..09afdc09da7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm @@ -29,7 +29,7 @@ aggro_vision_range = 7 charger = TRUE charge_distance = 4 - butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/crab = 2, /obj/item/stack/sheet/bone = 2) + butcher_results = list(/obj/item/food/meat/crab = 2, /obj/item/stack/sheet/bone = 2) robust_searching = TRUE footstep_type = FOOTSTEP_MOB_CLAW gold_core_spawnable = HOSTILE_SPAWN diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index 4bdb6e4071d..d7ac6e0d3e7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -25,7 +25,7 @@ move_force = MOVE_FORCE_VERY_STRONG move_resist = MOVE_FORCE_VERY_STRONG pull_force = MOVE_FORCE_VERY_STRONG - butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/bear = 3, /obj/item/stack/sheet/bone = 2) + butcher_results = list(/obj/item/food/meat/slab/bear = 3, /obj/item/stack/sheet/bone = 2) guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 1) loot = list() crusher_loot = /obj/item/crusher_trophy/goliath_tentacle diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm index 3d6e9a5384b..77fdf2824a6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm @@ -28,7 +28,7 @@ move_force = MOVE_FORCE_WEAK move_resist = MOVE_FORCE_WEAK pull_force = MOVE_FORCE_WEAK - butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2, /obj/item/stack/sheet/sinew/wolf = 2, /obj/item/stack/sheet/bone = 2) + butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/stack/sheet/sinew/wolf = 2, /obj/item/stack/sheet/bone = 2) loot = list() crusher_loot = /obj/item/crusher_trophy/watcher_wing stat_attack = HARD_CRIT diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm index 0314b585284..a5f62f453b1 100644 --- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm +++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm @@ -185,7 +185,7 @@ see_in_dark = 6 maxHealth = 15 health = 15 - butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/mouse = 1) + butcher_results = list(/obj/item/food/meat/slab/mouse = 1) density = FALSE ventcrawler = VENTCRAWLER_ALWAYS pass_flags = PASSTABLE | PASSGRILLE | PASSMOB 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 0f632d6d6a3..77044787129 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm @@ -20,7 +20,7 @@ melee_damage_upper = 5 attack_verb_continuous = "bites" attack_verb_simple = "bite" - 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/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index a2bea19e534..bf049e69613 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -25,7 +25,7 @@ ventcrawler = VENTCRAWLER_ALWAYS faction = list("hostile") attack_sound = 'sound/effects/reee.ogg' - butcher_results = list(/obj/item/reagent_containers/food/snacks/nugget = 1) + butcher_results = list(/obj/item/food/nugget = 1) pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY gold_core_spawnable = FRIENDLY_SPAWN @@ -39,7 +39,7 @@ icon_state = "rare_frog" icon_living = "rare_frog" icon_dead = "rare_frog_dead" - butcher_results = list(/obj/item/reagent_containers/food/snacks/nugget = 5) + butcher_results = list(/obj/item/food/nugget = 5) /mob/living/simple_animal/hostile/retaliate/frog/Crossed(AM as mob|obj) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 3af827b70fe..7f62d5a0dd8 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -180,8 +180,8 @@ exposed_obj.extinguish() exposed_obj.wash(CLEAN_TYPE_ACID) // Monkey cube - if(istype(exposed_obj, /obj/item/reagent_containers/food/snacks/monkeycube)) - var/obj/item/reagent_containers/food/snacks/monkeycube/cube = exposed_obj + if(istype(exposed_obj, /obj/item/food/monkeycube)) + var/obj/item/food/monkeycube/cube = exposed_obj cube.Expand() // Dehydrated carp diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index b05e68338f1..914113a1ab6 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -104,7 +104,7 @@ /datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct(location) + new /obj/item/food/meat/slab/meatproduct(location) return /datum/chemical_reaction/carbondioxide @@ -438,7 +438,7 @@ required_reagents = list(/datum/reagent/monkey_powder = 30, /datum/reagent/water = 1) /datum/chemical_reaction/monkey/on_reaction(datum/reagents/holder, created_volume) - var/obj/item/reagent_containers/food/snacks/monkeycube/cube = holder.my_atom + var/obj/item/food/monkeycube/cube = holder.my_atom if(istype(cube)) cube.Expand() else diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 0615500a4a6..7de08b2d731 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -36,7 +36,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/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 5731c63b5ae..0c07a6430d8 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -108,8 +108,8 @@ reagents.expose_temperature(hotness) to_chat(user, "You heat [name] with [I]!") - if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs - var/obj/item/reagent_containers/food/snacks/egg/E = I + if(istype(I, /obj/item/food/egg)) //breaking eggs + var/obj/item/food/egg/E = I if(reagents) if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "[src] is full.") diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index 4c25366ac59..0dc26d356b7 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -63,7 +63,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 //easy nut :) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 0de053e6405..ed415f46e4a 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -599,9 +599,9 @@ O.extinguish() //All shamelessly copied from water's expose_obj, since I didn't seem to be able to get it here for some reason. O.wash(CLEAN_TYPE_ACID) // 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/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm index 6eead050c38..8326906e93f 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 f51c5a27117..88d50fb1685 100644 --- a/code/modules/research/xenobiology/crossbreeding/reproductive.dm +++ b/code/modules/research/xenobiology/crossbreeding/reproductive.dm @@ -20,14 +20,14 @@ Reproductive extracts: return if(istype(O, /obj/item/storage/bag/bio)) var/list/inserted = list() - SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/monkeycube, src, 1, null, null, user, inserted) + SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/food/monkeycube, src, 1, null, null, user, inserted) if(inserted.len) - var/obj/item/reagent_containers/food/snacks/monkeycube/M = inserted[1] + var/obj/item/food/monkeycube/M = inserted[1] if(istype(M)) eat_cube(M, user) else to_chat(user, "There are no monkey cubes in the bio bag!") - if(istype(O,/obj/item/reagent_containers/food/snacks/monkeycube)) + if(istype(O,/obj/item/food/monkeycube)) eat_cube(O, user) if(cubes_eaten >= 3) var/cores = rand(1,4) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 3586beefdc3..411d4ae809b 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -143,7 +143,7 @@ ..() /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) @@ -152,7 +152,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 207d5d0b0da..d3980f0ffad 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -98,7 +98,7 @@ /obj/item/slime_extract/grey/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - var/obj/item/reagent_containers/food/snacks/monkeycube/M = new + var/obj/item/food/monkeycube/M = new if(!user.put_in_active_hand(M)) M.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, TRUE) diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm index 5e4604f9b93..d67a2bf70f0 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 -= NUTRITION_LEVEL_WELL_FED //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 && 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/snack.dm b/code/modules/vending/snack.dm index 79803894a2d..d242e0b6599 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -5,17 +5,17 @@ product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" icon_state = "snack" light_mask = "snack-light-mask" - products = list(/obj/item/reagent_containers/food/snacks/spacetwinkie = 6, - /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6, - /obj/item/reagent_containers/food/snacks/candy = 6, - /obj/item/reagent_containers/food/snacks/chips = 6, - /obj/item/reagent_containers/food/snacks/sosjerky = 6, - /obj/item/reagent_containers/food/snacks/no_raisin = 6, + products = list(/obj/item/food/spacetwinkie = 6, + /obj/item/food/cheesiehonkers = 6, + /obj/item/food/candy = 6, + /obj/item/food/chips = 6, + /obj/item/food/sosjerky = 6, + /obj/item/food/no_raisin = 6, /obj/item/reagent_containers/food/drinks/dry_ramen = 3, /obj/item/storage/box/gum = 3, - /obj/item/reagent_containers/food/snacks/energybar = 6) - contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6, - /obj/item/reagent_containers/food/snacks/candy/bronx = 1) + /obj/item/food/energybar = 6) + contraband = list(/obj/item/food/syndicake = 6, + /obj/item/food/candy/bronx = 1) refill_canister = /obj/item/vending_refill/snack canload_access_list = list(ACCESS_KITCHEN) default_price = 60 diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm index 5184b5f75df..5c0f01e42a8 100644 --- a/code/modules/vending/sustenance.dm +++ b/code/modules/vending/sustenance.dm @@ -5,10 +5,10 @@ product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Even prisoners deserve their daily bread!;Have some more candy corn!;Try our new ice cups!" light_mask = "snack-light-mask" icon_state = "sustenance" - products = list(/obj/item/reagent_containers/food/snacks/tofu/prison = 24, + products = list(/obj/item/food/tofu/prison = 24, /obj/item/food/breadslice/moldy = 15, /obj/item/reagent_containers/food/drinks/ice/prison = 12, - /obj/item/reagent_containers/food/snacks/candy_corn/prison = 6) + /obj/item/food/candy_corn/prison = 6) contraband = list(/obj/item/kitchen/knife = 6, /obj/item/reagent_containers/food/drinks/coffee = 12, /obj/item/tank/internals/emergency_oxygen = 6, diff --git a/tgstation.dme b/tgstation.dme index 2c1f30f933a..85ec85ce079 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1083,6 +1083,13 @@ #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\egg.dm" +#include "code\game\objects\items\food\frozen.dm" +#include "code\game\objects\items\food\meat.dm" +#include "code\game\objects\items\food\salad.dm" +#include "code\game\objects\items\food\sandwichtoast.dm" +#include "code\game\objects\items\food\snacks.dm" +#include "code\game\objects\items\food\soup.dm" #include "code\game\objects\items\food\spaghetti.dm" #include "code\game\objects\items\grenades\antigravity.dm" #include "code\game\objects\items\grenades\atmos_grenades.dm" @@ -1925,19 +1932,11 @@ #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_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" #include "code\modules\food_and_drinks\food\snacks_pizza.dm" -#include "code\modules\food_and_drinks\food\snacks_salad.dm" -#include "code\modules\food_and_drinks\food\snacks_sandwichtoast.dm" -#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"