diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index 95499e5a1f3..7cbbaf16f80 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -384,7 +384,7 @@ "GK" = ( /obj/item/clothing/head/bearpelt, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/burger/fish, +/obj/item/food/burger/fish, /obj/item/reagent_containers/food/drinks/beer{ pixel_x = -4 }, diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 8dd85592076..6043b0ea763 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -1320,7 +1320,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/reagent_containers/food/snacks/burger/spell, +/obj/item/food/burger/spell, /obj/effect/turf_decal/tile/blue{ dir = 4 }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index f039c9068a0..d331d42e911 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -13603,7 +13603,7 @@ "El" = ( /obj/structure/table/wood, /obj/item/storage/bag/tray, -/obj/item/reagent_containers/food/snacks/burger/spell, +/obj/item/food/burger/spell, /turf/open/floor/carpet, /area/wizard_station) "Em" = ( diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm index c32ee237bc8..16596547877 100644 --- a/_maps/shuttles/emergency_cruise.dmm +++ b/_maps/shuttles/emergency_cruise.dmm @@ -257,7 +257,7 @@ /area/template_noop) "kJ" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/burger/baconburger{ +/obj/item/food/burger/baconburger{ pixel_x = 3 }, /obj/item/reagent_containers/food/snacks/cracker{ diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 7c9ea9ecdad..5cf7597bec8 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -232,7 +232,7 @@ /turf/open/floor/mineral/diamond, /area/shuttle/escape/luxury) "aN" = ( -/obj/item/reagent_containers/food/snacks/burger/baconburger{ +/obj/item/food/burger/baconburger{ pixel_y = 2 }, /obj/structure/table/wood/fancy/black, diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index e881e56aabb..9ab91165ab3 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -1450,7 +1450,7 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/storage/bag/tray, -/obj/item/reagent_containers/food/snacks/burger/bearger, +/obj/item/food/burger/bearger, /turf/open/floor/wood{ icon_state = "wood-broken3" }, diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 4886c8b4df4..a3b90c8c131 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -40,7 +40,7 @@ Behavior that's still missing from this component that original food items had t food_flags = NONE, foodtypes = NONE, volume = 50, - eat_time = 30, + eat_time = 10, list/tastes, list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, @@ -55,6 +55,9 @@ Behavior that's still missing from this component that original food items had t if(isitem(parent)) RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/UseFromHand) RegisterSignal(parent, COMSIG_ITEM_FRIED, .proc/OnFried) + var/obj/item/item = parent + item.grind_results = list() //Cursed but this is how snacks did it, grinding needs a refactor in the future. + else if(isturf(parent)) RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/TryToEatTurf) @@ -144,8 +147,12 @@ Behavior that's still missing from this component that original food items had t set waitfor = FALSE + if(QDELETED(parent)) + return + var/atom/owner = parent + if(feeder.a_intent == INTENT_HARM) return if(!owner.reagents.total_volume)//Shouldn't be needed but it checks to see if it has anything left in it. @@ -203,6 +210,11 @@ Behavior that's still missing from this component that original food items had t TakeBite(eater, feeder) + //If we're not force-feeding, try take another bite + if(eater == feeder) + INVOKE_ASYNC(src, .proc/TryToEat, eater, feeder) + + ///This function lets the eater take a bite and transfers the reagents to the eater. /datum/component/edible/proc/TakeBite(mob/living/eater, mob/living/feeder) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 8bb94375d4e..434bf00b082 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -231,9 +231,9 @@ /obj/item/reagent_containers/food/snacks/bearsteak, /obj/item/reagent_containers/food/snacks/enchiladas, /obj/item/reagent_containers/food/snacks/stewedsoymeat, - /obj/item/reagent_containers/food/snacks/burger/bigbite, - /obj/item/reagent_containers/food/snacks/burger/superbite, - /obj/item/reagent_containers/food/snacks/burger/fivealarm) + /obj/item/food/burger/bigbite, + /obj/item/food/burger/superbite, + /obj/item/food/burger/fivealarm) /obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload) loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1) diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm new file mode 100644 index 00000000000..3a68ccd05db --- /dev/null +++ b/code/game/objects/items/food/burgers.dm @@ -0,0 +1,368 @@ +/obj/item/food/burger + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "hburger" + bite_consumption = 3 + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1) + tastes = list("bun" = 2, "beef patty" = 4) + foodtypes = GRAIN | MEAT //lettuce doesn't make burger a vegetable. + eat_time = 15 //Quick snack + +/obj/item/food/burger/plain + name = "burger" + desc = "The cornerstone of every nutritious breakfast." + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 1) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/plain/Initialize() + . = ..() + if(prob(1)) + new/obj/effect/particle_effect/smoke(get_turf(src)) + playsound(src, 'sound/effects/smoke.ogg', 50, TRUE) + visible_message("Oh, ye gods! [src] is ruined! But what if...?") + name = "steamed ham" + desc = pick("Ahh, Head of Personnel, welcome. I hope you're prepared for an unforgettable luncheon!", + "And you call these steamed hams despite the fact that they are obviously microwaved?", + "Aurora Station 13? At this time of shift, in this time of year, in this sector of space, localized entirely within your freezer?", + "You know, these hamburgers taste quite similar to the ones they have at the Maltese Falcon.") + +/obj/item/food/burger/human + name = "human burger" + desc = "A bloody burger." + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("bun" = 2, "long pig" = 4) + foodtypes = MEAT | GRAIN | GROSS + var/subjectname = "" + var/subjectjob = null + +/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 + if(M) + subjectname = M.subjectname + subjectjob = M.subjectjob + if(subjectname) + name = "[subjectname] burger" + else if(subjectjob) + name = "[subjectjob] burger" + qdel(M) + + +/obj/item/food/burger/corgi + name = "corgi burger" + desc = "You monster." + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 6) + foodtypes = GRAIN | MEAT | GROSS + +/obj/item/food/burger/appendix + name = "appendix burger" + desc = "Tastes like appendicitis." + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 11, /datum/reagent/consumable/nutriment/vitamin = 7) + icon_state = "appendixburger" + tastes = list("bun" = 4, "grass" = 2) + foodtypes = GRAIN | MEAT | GROSS + +/obj/item/food/burger/fish + name = "fillet -o- carp sandwich" + desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp." + icon_state = "fishburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("bun" = 4, "fish" = 4) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/tofu + name = "tofu burger" + desc = "What.. is that meat?" + icon_state = "tofuburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 3) + tastes = list("bun" = 4, "tofu" = 4) + foodtypes = GRAIN | VEGETABLES + +/obj/item/food/burger/roburger + name = "roburger" + desc = "The lettuce is the only organic component. Beep." + icon_state = "roburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/nanomachines = 7, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) + foodtypes = GRAIN | TOXIC + +/obj/item/food/burger/roburgerbig + name = "roburger" + desc = "This massive patty looks like poison. Beep." + icon_state = "roburger" + max_volume = 120 + food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/nanomachines = 140, /datum/reagent/consumable/nutriment/vitamin = 15) + tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) + foodtypes = GRAIN | TOXIC + +/obj/item/food/burger/xeno + name = "xenoburger" + desc = "Smells caustic. Tastes like heresy." + icon_state = "xburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/nutriment/vitamin = 7) + tastes = list("bun" = 4, "acid" = 4) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/bearger + name = "bearger" + desc = "Best served rawr." + icon_state = "bearger" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 7) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/clown + name = "clown burger" + desc = "This tastes funny..." + icon_state = "clownburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 12, /datum/reagent/medicine/mannitol = 11, /datum/reagent/consumable/nutriment/vitamin = 6) + foodtypes = GRAIN | FRUIT + +/obj/item/food/burger/mime + name = "mime burger" + desc = "Its taste defies language." + icon_state = "mimeburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 11, /datum/reagent/consumable/nutriment/vitamin = 7, /datum/reagent/consumable/nothing = 6) + foodtypes = GRAIN + +/obj/item/food/burger/brain + name = "brainburger" + desc = "A strange looking burger. It looks almost sentient." + icon_state = "brainburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/medicine/mannitol = 11, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("bun" = 4, "brains" = 2) + foodtypes = GRAIN | MEAT | GROSS + +/obj/item/food/burger/ghost + name = "ghost burger" + desc = "Too Spooky!" + icon_state = "ghostburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 13, /datum/reagent/consumable/sodiumchloride = 5) + tastes = list("bun" = 2, "ectoplasm" = 4) + foodtypes = GRAIN + alpha = 170 + verb_say = "moans" + verb_yell = "wails" + +/obj/item/food/burger/ghost/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + +/obj/item/food/burger/ghost/process() + if(!isturf(loc)) //no floating out of bags + return + var/paranormal_activity = rand(100) + switch(paranormal_activity) + if(97 to 100) + audible_message("[src] rattles a length of chain.") + playsound(loc,'sound/spookoween/chain_rattling.ogg', 300, TRUE) + if(91 to 96) + say(pick("OoOoOoo.", "OoooOOooOoo!!")) + if(84 to 90) + dir = pick(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) + step(src, dir) + if(71 to 83) + step(src, dir) + if(65 to 70) + var/obj/machinery/light/L = locate(/obj/machinery/light) in view(4, src) + if(L) + L.flicker() + if(62 to 64) + playsound(loc,pick('sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg'), 50, TRUE, ignore_walls = FALSE) + if(61) + visible_message("[src] spews out a glob of ectoplasm!") + new /obj/effect/decal/cleanable/greenglow/ecto(loc) + playsound(loc,'sound/effects/splat.ogg', 200, TRUE) + + //If i was less lazy i would make the burger forcefeed itself to a nearby mob here. + +/obj/item/food/burger/ghost/Destroy() + STOP_PROCESSING(SSobj, src) + . = ..() + +/obj/item/food/burger/red + name = "red burger" + desc = "Perfect for hiding the fact it's burnt to a crisp." + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/red = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/orange + name = "orange burger" + desc = "Contains 0% juice." + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/orange = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/yellow + name = "yellow burger" + desc = "Bright to the last bite." + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/yellow = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/green + name = "green burger" + desc = "It's not tainted meat, it's painted meat!" + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/green = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/blue + name = "blue burger" + desc = "Is this blue rare?" + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/blue = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/purple + name = "purple burger" + desc = "Regal and low class at the same time." + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/purple = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/black + name = "black burger" + desc = "This is overcooked." + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/black = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/white + name = "white burger" + desc = "Delicous Titanium!" + icon_state = "cburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/colorful_reagent/powder/white = 10) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/spell + name = "spell burger" + desc = "This is absolutely Ei Nath." + icon_state = "spellburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 11) + tastes = list("bun" = 4, "magic" = 2) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/bigbite + name = "big bite burger" + desc = "Forget the Big Mac. THIS is the future!" + icon_state = "bigbiteburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 11, /datum/reagent/consumable/nutriment/vitamin = 7) + w_class = WEIGHT_CLASS_NORMAL + foodtypes = GRAIN | MEAT | DAIRY + +/obj/item/food/burger/jelly + name = "jelly burger" + desc = "Culinary delight..?" + icon_state = "jellyburger" + tastes = list("bun" = 4, "jelly" = 2) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/jelly/slime + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin/slimejelly = 10, /datum/reagent/consumable/nutriment/vitamin = 6) + foodtypes = GRAIN | TOXIC + +/obj/item/food/burger/jelly/cherry + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/cherryjelly = 10, /datum/reagent/consumable/nutriment/vitamin = 6) + foodtypes = GRAIN | FRUIT + +/obj/item/food/burger/superbite + name = "super bite burger" + desc = "This is a mountain of a burger. FOOD!" + icon_state = "superbiteburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 42, /datum/reagent/consumable/nutriment/vitamin = 15) + w_class = WEIGHT_CLASS_NORMAL + bite_consumption = 7 + max_volume = 100 + tastes = list("bun" = 4, "type two diabetes" = 10) + foodtypes = GRAIN | MEAT | DAIRY + +/obj/item/food/burger/fivealarm + name = "five alarm burger" + desc = "HOT! HOT!" + icon_state = "fivealarmburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/condensedcapsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 6) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/rat + name = "rat burger" + desc = "Pretty much what you'd expect..." + icon_state = "ratburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 2) + foodtypes = GRAIN | MEAT | GROSS + +/obj/item/food/burger/baseball + name = "home run baseball burger" + desc = "It's still warm. The steam coming off of it looks like baseball." + icon_state = "baseball" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 2) + foodtypes = GRAIN | GROSS + +/obj/item/food/burger/baconburger + name = "bacon burger" + desc = "The perfect combination of all things American." + icon_state = "baconburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 11, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("bacon" = 4, "bun" = 2) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/empoweredburger + name = "empowered burger" + desc = "It's shockingly good, if you live off of electricity that is." + icon_state = "empoweredburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/liquidelectricity = 5) + tastes = list("bun" = 2, "pure electricity" = 4) + foodtypes = GRAIN | TOXIC + +/obj/item/food/burger/crab + name = "crab burger" + desc = "A delicious patty of the crabby kind, slapped in between a bun." + icon_state = "crabburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("bun" = 2, "crab meat" = 4) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/soylent + name = "soylent burger" + desc = "An eco-friendly burger made using upcycled low value biomass." + icon_state = "soylentburger" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("bun" = 2, "assistant" = 4) + foodtypes = GRAIN | MEAT | DAIRY + +/obj/item/food/burger/rib + name = "mcrib" + desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." + icon_state = "mcrib" + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/bbqsauce = 1) + tastes = list("bun" = 2, "pork patty" = 4) + foodtypes = GRAIN | MEAT + +/obj/item/food/burger/mcguffin + name = "mcguffin" + desc = "A cheap and greasy imitation of an eggs benedict." + icon_state = "mcguffin" + tastes = list("muffin" = 2, "bacon" = 3) + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/eggyolk = 3, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 1) + foodtypes = GRAIN | MEAT | BREAKFAST + +/obj/item/food/burger/chicken + name = "chicken sandwich" //Apparently the proud people of Americlapstan object to this thing being called a burger. Apparently McDonald's just calls it a burger in Europe as to not scare and confuse us. + desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier." + icon_state = "chickenburger" + tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1) + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/mayonnaise = 3, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cooking_oil = 2) + foodtypes = GRAIN | MEAT | FRIED + +/obj/item/food/burger/cheese + name = "cheese burger" + desc = "This noble burger stands proudly clad in golden cheese." + icon_state = "cheeseburger" + tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 3) + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 2) + foodtypes = GRAIN | MEAT | DAIRY + +/obj/item/food/burger/cheese/Initialize() + . = ..() + if(prob(33)) + icon_state = "cheeseburgeralt" + diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 8689946cfeb..e31d816aa6c 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -69,7 +69,7 @@ name = "Super Bite Burger" description = "Commander Tubbs thinks he can set a competitive eating world record. All he needs is a super bite burger shipped to him." reward = 12000 - wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite) + wanted_types = list(/obj/item/food/burger/superbite) /datum/bounty/item/chef/poppypretzel name = "Poppy Pretzel" diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm deleted file mode 100644 index cd643485e93..00000000000 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ /dev/null @@ -1,415 +0,0 @@ -/obj/item/reagent_containers/food/snacks/burger - filling_color = "#CD853F" - icon = 'icons/obj/food/burgerbread.dmi' - icon_state = "hburger" - bitesize = 3 - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("bun" = 2, "beef patty" = 4) - foodtype = GRAIN | MEAT //lettuce doesn't make burger a vegetable. - -/obj/item/reagent_containers/food/snacks/burger/plain - name = "burger" - desc = "The cornerstone of every nutritious breakfast." - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | MEAT - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/burger/plain/Initialize() - . = ..() - if(prob(1)) - new/obj/effect/particle_effect/smoke(get_turf(src)) - playsound(src, 'sound/effects/smoke.ogg', 50, TRUE) - visible_message("Oh, ye gods! [src] is ruined! But what if...?") - name = "steamed ham" - desc = pick("Ahh, Head of Personnel, welcome. I hope you're prepared for an unforgettable luncheon!", - "And you call these steamed hams despite the fact that they are obviously microwaved?", - "Aurora Station 13? At this time of shift, in this time of year, in this sector of space, localized entirely within your freezer?", - "You know, these hamburgers taste quite similar to the ones they have at the Maltese Falcon.") - tastes = list("fast food hamburger" = 1) - -/obj/item/reagent_containers/food/snacks/burger/human - var/subjectname = "" - var/subjectjob = null - name = "human burger" - desc = "A bloody burger." - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("bun" = 2, "long pig" = 4) - foodtype = MEAT | GRAIN | GROSS - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/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 - if(M) - subjectname = M.subjectname - subjectjob = M.subjectjob - if(subjectname) - name = "[subjectname] burger" - else if(subjectjob) - name = "[subjectjob] burger" - qdel(M) - - -/obj/item/reagent_containers/food/snacks/burger/corgi - name = "corgi burger" - desc = "You monster." - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT | GROSS - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/appendix - name = "appendix burger" - desc = "Tastes like appendicitis." - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 6) - icon_state = "appendixburger" - tastes = list("bun" = 4, "grass" = 2) - foodtype = GRAIN | MEAT | GROSS - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/fish - name = "fillet -o- carp sandwich" - desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp." - icon_state = "fishburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 3) - tastes = list("bun" = 4, "fish" = 4) - foodtype = GRAIN | MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/tofu - name = "tofu burger" - desc = "What.. is that meat?" - icon_state = "tofuburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("bun" = 4, "tofu" = 4) - foodtype = GRAIN | VEGETABLES - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/burger/roburger - name = "roburger" - desc = "The lettuce is the only organic component. Beep." - icon_state = "roburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/nanomachines = 2, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/nanomachines = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) - foodtype = GRAIN | TOXIC - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/roburgerbig - name = "roburger" - desc = "This massive patty looks like poison. Beep." - icon_state = "roburger" - volume = 120 - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment/vitamin = 10) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) - foodtype = GRAIN | TOXIC - value = FOOD_LEGENDARY - -/obj/item/reagent_containers/food/snacks/burger/xeno - name = "xenoburger" - desc = "Smells caustic. Tastes like heresy." - icon_state = "xburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("bun" = 4, "acid" = 4) - foodtype = GRAIN | MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/bearger - name = "bearger" - desc = "Best served rawr." - icon_state = "bearger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 6) - foodtype = GRAIN | MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/clown - name = "clown burger" - desc = "This tastes funny..." - icon_state = "clownburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/medicine/mannitol = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | FRUIT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/mime - name = "mime burger" - desc = "Its taste defies language." - icon_state = "mimeburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nothing = 6) - foodtype = GRAIN - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/brain - name = "brainburger" - desc = "A strange looking burger. It looks almost sentient." - icon_state = "brainburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("bun" = 4, "brains" = 2) - foodtype = GRAIN | MEAT | GROSS - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/burger/ghost - name = "ghost burger" - desc = "Too Spooky!" - icon_state = "ghostburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 12, /datum/reagent/consumable/sodiumchloride = 5) - tastes = list("bun" = 2, "ectoplasm" = 4) - foodtype = GRAIN - alpha = 170 - verb_say = "moans" - verb_yell = "wails" - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/ghost/Initialize() - . = ..() - START_PROCESSING(SSobj, src) - -/obj/item/reagent_containers/food/snacks/burger/ghost/process() - if(!isturf(loc)) //no floating out of bags - return - var/paranormal_activity = rand(100) - switch(paranormal_activity) - if(97 to 100) - audible_message("[src] rattles a length of chain.") - playsound(loc,'sound/spookoween/chain_rattling.ogg', 300, TRUE) - if(91 to 96) - say(pick("OoOoOoo.", "OoooOOooOoo!!")) - if(84 to 90) - dir = pick(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) - step(src, dir) - if(71 to 83) - step(src, dir) - if(65 to 70) - var/obj/machinery/light/L = locate(/obj/machinery/light) in view(4, src) - if(L) - L.flicker() - if(62 to 64) - playsound(loc,pick('sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg'), 50, TRUE, ignore_walls = FALSE) - if(61) - visible_message("[src] spews out a glob of ectoplasm!") - new /obj/effect/decal/cleanable/greenglow/ecto(loc) - playsound(loc,'sound/effects/splat.ogg', 200, TRUE) - - //If i was less lazy i would make the burger forcefeed itself to a nearby mob here. - -/obj/item/reagent_containers/food/snacks/burger/ghost/Destroy() - STOP_PROCESSING(SSobj, src) - . = ..() - -/obj/item/reagent_containers/food/snacks/burger/red - name = "red burger" - desc = "Perfect for hiding the fact it's burnt to a crisp." - icon_state = "cburger" - color = "#DA0000FF" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/red = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/orange - name = "orange burger" - desc = "Contains 0% juice." - icon_state = "cburger" - color = "#FF9300FF" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/orange = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/yellow - name = "yellow burger" - desc = "Bright to the last bite." - icon_state = "cburger" - color = "#FFF200FF" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/yellow = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/green - name = "green burger" - desc = "It's not tainted meat, it's painted meat!" - icon_state = "cburger" - color = "#A8E61DFF" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/green = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/blue - name = "blue burger" - desc = "Is this blue rare?" - icon_state = "cburger" - color = "#00B7EFFF" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/blue = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/purple - name = "purple burger" - desc = "Regal and low class at the same time." - icon_state = "cburger" - color = "#DA00FFFF" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/purple = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/black - name = "black burger" - desc = "This is overcooked." - icon_state = "cburger" - color = "#1C1C1C" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/black = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/white - name = "white burger" - desc = "Delicous Titanium!" - icon_state = "cburger" - color = "#FFFFFF" - bonus_reagents = list(/datum/reagent/colorful_reagent/powder/white = 10, /datum/reagent/consumable/nutriment/vitamin = 5) - foodtype = GRAIN | MEAT - -/obj/item/reagent_containers/food/snacks/burger/spell - name = "spell burger" - desc = "This is absolutely Ei Nath." - icon_state = "spellburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 10) - tastes = list("bun" = 4, "magic" = 2) - foodtype = GRAIN | MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/bigbite - name = "big bite burger" - desc = "Forget the Big Mac. THIS is the future!" - icon_state = "bigbiteburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/nutriment/vitamin = 2) - w_class = WEIGHT_CLASS_NORMAL - foodtype = GRAIN | MEAT | DAIRY - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/jelly - name = "jelly burger" - desc = "Culinary delight..?" - icon_state = "jellyburger" - tastes = list("bun" = 4, "jelly" = 2) - foodtype = GRAIN | MEAT - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/jelly/slime - bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | TOXIC - -/obj/item/reagent_containers/food/snacks/burger/jelly/cherry - bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | FRUIT - -/obj/item/reagent_containers/food/snacks/burger/superbite - name = "super bite burger" - desc = "This is a mountain of a burger. FOOD!" - icon_state = "superbiteburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 10) - list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 38, /datum/reagent/consumable/nutriment/vitamin = 5) - w_class = WEIGHT_CLASS_NORMAL - bitesize = 7 - volume = 100 - tastes = list("bun" = 4, "type two diabetes" = 10) - foodtype = GRAIN | MEAT | DAIRY - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/fivealarm - name = "five alarm burger" - desc = "HOT! HOT!" - icon_state = "fivealarmburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 5) - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/condensedcapsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/rat - name = "rat burger" - desc = "Pretty much what you'd expect..." - icon_state = "ratburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | MEAT | GROSS - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/burger/baseball - name = "home run baseball burger" - desc = "It's still warm. The steam coming off of it looks like baseball." - icon_state = "baseball" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | GROSS - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/baconburger - name = "bacon burger" - desc = "The perfect combination of all things American." - icon_state = "baconburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 1) - tastes = list("bacon" = 4, "bun" = 2) - foodtype = GRAIN | MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/empoweredburger - name = "empowered burger" - desc = "It's shockingly good, if you live off of electricity that is." - icon_state = "empoweredburger" - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/liquidelectricity = 5) - tastes = list("bun" = 2, "pure electricity" = 4) - foodtype = GRAIN | TOXIC - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/burger/crab - name = "crab burger" - desc = "A delicious patty of the crabby kind, slapped in between a bun." - icon_state = "crabburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 3) - tastes = list("bun" = 2, "crab meat" = 4) - foodtype = GRAIN | MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/soylent - name = "soylent burger" - desc = "An eco-friendly burger made using upcycled low value biomass." - icon_state = "soylentburger" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 3) - tastes = list("bun" = 2, "assistant" = 4) - foodtype = GRAIN | MEAT | DAIRY - value = FOOD_EXOTIC - -/obj/item/reagent_containers/food/snacks/burger/rib - name = "mcrib" - desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." - icon_state = "mcrib" - bonus_reagents = list(/datum/reagent/consumable/bbqsauce = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 3) - tastes = list("bun" = 2, "pork patty" = 4) - foodtype = GRAIN | MEAT - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/mcguffin - name = "mcguffin" - desc = "A cheap and greasy imitation of an eggs benedict." - icon_state = "mcguffin" - tastes = list("muffin" = 2, "bacon" = 3) - bonus_reagents = list(/datum/reagent/consumable/eggyolk = 3, /datum/reagent/consumable/nutriment/protein = 2) - foodtype = GRAIN | MEAT | BREAKFAST - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/chicken - name = "chicken sandwich" //Apparently the proud people of Americlapstan object to this thing being called a burger. Apparently McDonald's just calls it a burger in Europe as to not scare and confuse us. - desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier." - icon_state = "chickenburger" - tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1) - bonus_reagents = list(/datum/reagent/consumable/mayonnaise = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2) - foodtype = GRAIN | MEAT | FRIED - value = FOOD_RARE - -/obj/item/reagent_containers/food/snacks/burger/cheese - name = "cheese burger" - desc = "This noble burger stands proudly clad in golden cheese." - icon_state = "cheeseburger" - tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 3) - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtype = GRAIN | MEAT | DAIRY - value = FOOD_FAST - -/obj/item/reagent_containers/food/snacks/burger/cheese/Initialize() - . = ..() - if(prob(33)) - icon_state = "cheeseburgeralt" - 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 0bb2b970ca2..f40e11f3350 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -13,7 +13,7 @@ parts = list( /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/human + result = /obj/item/food/burger/human subcategory = CAT_BURGER /datum/crafting_recipe/food/burger @@ -23,7 +23,7 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/plain + result = /obj/item/food/burger/plain subcategory = CAT_BURGER /datum/crafting_recipe/food/corgiburger @@ -33,7 +33,7 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/corgi + result = /obj/item/food/burger/corgi subcategory = CAT_BURGER /datum/crafting_recipe/food/appendixburger @@ -42,7 +42,7 @@ /obj/item/organ/appendix = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/appendix + result = /obj/item/food/burger/appendix subcategory = CAT_BURGER /datum/crafting_recipe/food/brainburger @@ -51,7 +51,7 @@ /obj/item/organ/brain = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/brain + result = /obj/item/food/burger/brain subcategory = CAT_BURGER /datum/crafting_recipe/food/xenoburger @@ -60,7 +60,7 @@ /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/xeno + result = /obj/item/food/burger/xeno subcategory = CAT_BURGER /datum/crafting_recipe/food/bearger @@ -69,7 +69,7 @@ /obj/item/reagent_containers/food/snacks/meat/steak/bear = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/bearger + result = /obj/item/food/burger/bearger subcategory = CAT_BURGER /datum/crafting_recipe/food/fishburger @@ -79,7 +79,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/fish + result = /obj/item/food/burger/fish subcategory = CAT_BURGER /datum/crafting_recipe/food/tofuburger @@ -88,7 +88,7 @@ /obj/item/reagent_containers/food/snacks/tofu = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/tofu + result = /obj/item/food/burger/tofu subcategory = CAT_BURGER /datum/crafting_recipe/food/ghostburger @@ -98,7 +98,7 @@ /datum/reagent/consumable/sodiumchloride = 2, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/ghost + result = /obj/item/food/burger/ghost subcategory = CAT_BURGER /datum/crafting_recipe/food/clownburger @@ -107,7 +107,7 @@ /obj/item/clothing/mask/gas/clown_hat = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/clown + result = /obj/item/food/burger/clown subcategory = CAT_BURGER /datum/crafting_recipe/food/mimeburger @@ -116,7 +116,7 @@ /obj/item/clothing/mask/gas/mime = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/mime + result = /obj/item/food/burger/mime subcategory = CAT_BURGER /datum/crafting_recipe/food/redburger @@ -126,7 +126,7 @@ /obj/item/toy/crayon/red = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/red + result = /obj/item/food/burger/red subcategory = CAT_BURGER /datum/crafting_recipe/food/orangeburger @@ -136,7 +136,7 @@ /obj/item/toy/crayon/orange = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/orange + result = /obj/item/food/burger/orange subcategory = CAT_BURGER /datum/crafting_recipe/food/yellowburger @@ -146,7 +146,7 @@ /obj/item/toy/crayon/yellow = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/yellow + result = /obj/item/food/burger/yellow subcategory = CAT_BURGER /datum/crafting_recipe/food/greenburger @@ -156,7 +156,7 @@ /obj/item/toy/crayon/green = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/green + result = /obj/item/food/burger/green subcategory = CAT_BURGER /datum/crafting_recipe/food/blueburger @@ -166,7 +166,7 @@ /obj/item/toy/crayon/blue = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/blue + result = /obj/item/food/burger/blue subcategory = CAT_BURGER /datum/crafting_recipe/food/purpleburger @@ -176,7 +176,7 @@ /obj/item/toy/crayon/purple = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/purple + result = /obj/item/food/burger/purple subcategory = CAT_BURGER /datum/crafting_recipe/food/blackburger @@ -186,7 +186,7 @@ /obj/item/toy/crayon/black = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/black + result = /obj/item/food/burger/black subcategory = CAT_BURGER /datum/crafting_recipe/food/whiteburger @@ -196,7 +196,7 @@ /obj/item/toy/crayon/white = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/white + result = /obj/item/food/burger/white subcategory = CAT_BURGER /datum/crafting_recipe/food/spellburger @@ -205,7 +205,7 @@ /obj/item/clothing/head/wizard/fake = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/spell + result = /obj/item/food/burger/spell subcategory = CAT_BURGER /datum/crafting_recipe/food/spellburger2 @@ -214,7 +214,7 @@ /obj/item/clothing/head/wizard = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/spell + result = /obj/item/food/burger/spell subcategory = CAT_BURGER /datum/crafting_recipe/food/bigbiteburger @@ -224,7 +224,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge = 2, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/bigbite + result = /obj/item/food/burger/bigbite subcategory = CAT_BURGER /datum/crafting_recipe/food/superbiteburger @@ -240,7 +240,7 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/superbite + result = /obj/item/food/burger/superbite subcategory = CAT_BURGER /datum/crafting_recipe/food/slimeburger @@ -249,7 +249,7 @@ /datum/reagent/toxin/slimejelly = 5, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime + result = /obj/item/food/burger/jelly/slime subcategory = CAT_BURGER /datum/crafting_recipe/food/jellyburger @@ -258,7 +258,7 @@ /datum/reagent/consumable/cherryjelly = 5, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry + result = /obj/item/food/burger/jelly/cherry subcategory = CAT_BURGER /datum/crafting_recipe/food/fivealarmburger @@ -268,7 +268,7 @@ /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/fivealarm + result = /obj/item/food/burger/fivealarm subcategory = CAT_BURGER /datum/crafting_recipe/food/ratburger @@ -277,7 +277,7 @@ /obj/item/reagent_containers/food/snacks/deadmouse = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/rat + result = /obj/item/food/burger/rat subcategory = CAT_BURGER /datum/crafting_recipe/food/baseballburger @@ -286,7 +286,7 @@ /obj/item/melee/baseball_bat = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/baseball + result = /obj/item/food/burger/baseball subcategory = CAT_BURGER /datum/crafting_recipe/food/baconburger @@ -296,7 +296,7 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/baconburger + result = /obj/item/food/burger/baconburger subcategory = CAT_BURGER /datum/crafting_recipe/food/empoweredburger @@ -306,7 +306,7 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/empoweredburger + result = /obj/item/food/burger/empoweredburger subcategory = CAT_BURGER /datum/crafting_recipe/food/crabburger @@ -316,7 +316,7 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/crab + result = /obj/item/food/burger/crab subcategory = CAT_BURGER /datum/crafting_recipe/food/cheeseburger @@ -326,7 +326,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/cheese + result = /obj/item/food/burger/cheese subcategory = CAT_BURGER /datum/crafting_recipe/food/soylentburger @@ -336,7 +336,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge = 2, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/soylent + result = /obj/item/food/burger/soylent subcategory = CAT_BURGER /datum/crafting_recipe/food/ribburger @@ -346,7 +346,7 @@ /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome. /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/rib + result = /obj/item/food/burger/rib subcategory = CAT_BURGER /datum/crafting_recipe/food/mcguffin @@ -356,7 +356,7 @@ /obj/item/reagent_containers/food/snacks/meat/bacon = 2, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/mcguffin + result = /obj/item/food/burger/mcguffin subcategory = CAT_BURGER /datum/crafting_recipe/food/chickenburger @@ -366,5 +366,5 @@ /datum/reagent/consumable/mayonnaise = 5, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/chicken + result = /obj/item/food/burger/chicken subcategory = CAT_BURGER diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm index e519372adbe..e4ab27b156b 100644 --- a/code/modules/vending/liberation.dm +++ b/code/modules/vending/liberation.dm @@ -5,8 +5,8 @@ product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!" product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?" vend_reply = "Remember the name: Liberation Station!" - products = list(/obj/item/reagent_containers/food/snacks/burger/plain = 5, //O say can you see, by the dawn's early light - /obj/item/reagent_containers/food/snacks/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming + products = list(/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light + /obj/item/food/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming /obj/item/reagent_containers/food/snacks/fries = 5, //Whose broad stripes and bright stars through the perilous fight /obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming? /obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2, @@ -22,10 +22,10 @@ /obj/item/ammo_box/magazine/m45 = 2, /obj/item/ammo_box/magazine/m75 = 2, /obj/item/reagent_containers/food/snacks/cheesyfries = 5, - /obj/item/reagent_containers/food/snacks/burger/baconburger = 5) //Premium burgers for the premium section + /obj/item/food/burger/baconburger = 5) //Premium burgers for the premium section contraband = list(/obj/item/clothing/under/misc/patriotsuit = 3, /obj/item/bedsheet/patriot = 5, - /obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A + /obj/item/food/burger/superbite = 3) //U S A armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF default_price = 150 diff --git a/tgstation.dme b/tgstation.dme index d0ad423c71e..7399c4a724b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1106,6 +1106,7 @@ #include "code\game\objects\items\devices\radio\radio.dm" #include "code\game\objects\items\food\_food.dm" #include "code\game\objects\items\food\bread.dm" +#include "code\game\objects\items\food\burgers.dm" #include "code\game\objects\items\grenades\antigravity.dm" #include "code\game\objects\items\grenades\chem_grenade.dm" #include "code\game\objects\items\grenades\clusterbuster.dm" @@ -1949,7 +1950,6 @@ #include "code\modules\food_and_drinks\food\condiment.dm" #include "code\modules\food_and_drinks\food\customizables.dm" #include "code\modules\food_and_drinks\food\snacks.dm" -#include "code\modules\food_and_drinks\food\snacks_burgers.dm" #include "code\modules\food_and_drinks\food\snacks_cake.dm" #include "code\modules\food_and_drinks\food\snacks_egg.dm" #include "code\modules\food_and_drinks\food\snacks_frozen.dm"