diff --git a/code/WorkInProgress/Tastyfish/livestock.dm b/code/WorkInProgress/Tastyfish/livestock.dm index 36d2ba6385..f13e5b5291 100644 --- a/code/WorkInProgress/Tastyfish/livestock.dm +++ b/code/WorkInProgress/Tastyfish/livestock.dm @@ -5,7 +5,7 @@ emote_see = list("shakes its head", "kicks the ground") speak_chance = 1 turns_per_move = 15 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" @@ -107,7 +107,7 @@ icon_state = "cow" icon_living = "cow" icon_dead = "cow_d" - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cow + meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/cow meat_amount = 10 max_nutrition = 1000 speak = list("Moo.","Moooo!","Snort.") @@ -131,7 +131,7 @@ if(user.a_intent == "hurt") rage_at(user) -/obj/item/weapon/reagent_containers/food/snacks/meat/cow +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/cow name = "Beef" desc = "It's what's for dinner!" @@ -141,7 +141,7 @@ icon_state = "chick" icon_living = "chick" icon_dead = "chick_d" - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/chicken meat_amount = 3 max_nutrition = 200 speak = list("Bock bock!","Cl-cluck.","Click.") @@ -158,7 +158,7 @@ new/obj/item/weapon/reagent_containers/food/snacks/egg(src.loc) // lay an egg nutrition -= 25 -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/chicken name = "Chicken" desc = "Tasty!" diff --git a/code/defines/mob/simple_animal/cat.dm b/code/defines/mob/simple_animal/cat.dm index a6bad00f87..d5d19f9543 100644 --- a/code/defines/mob/simple_animal/cat.dm +++ b/code/defines/mob/simple_animal/cat.dm @@ -12,7 +12,7 @@ emote_see = list("shakes it's head", "shivers") speak_chance = 1 turns_per_move = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat response_help = "pets the" response_disarm = "gently pushes aside the" response_harm = "kicks the" diff --git a/code/defines/mob/simple_animal/corgi.dm b/code/defines/mob/simple_animal/corgi.dm index d45294f84f..9ede05f0a7 100644 --- a/code/defines/mob/simple_animal/corgi.dm +++ b/code/defines/mob/simple_animal/corgi.dm @@ -13,7 +13,7 @@ emote_see = list("shakes it's head", "shivers") speak_chance = 1 turns_per_move = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi + meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi meat_amount = 3 response_help = "pets the" response_disarm = "gently pushes aside the" @@ -311,6 +311,6 @@ M.loc = old_loc return -/obj/item/weapon/reagent_containers/food/snacks/meat/corgi +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi name = "Corgi meat" desc = "Tastes like... well you know..." \ No newline at end of file diff --git a/code/defines/mob/simple_animal/crab.dm b/code/defines/mob/simple_animal/crab.dm index c2b7e0ed9c..c75e783156 100644 --- a/code/defines/mob/simple_animal/crab.dm +++ b/code/defines/mob/simple_animal/crab.dm @@ -10,7 +10,7 @@ emote_see = list("clacks") speak_chance = 1 turns_per_move = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat response_help = "pets the" response_disarm = "gently pushes aside the" response_harm = "stomps the" diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 9fd3a2d6e5..683e5328cc 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -156,7 +156,7 @@ if("milk") beaker.reagents.add_reagent("milk",10) if("meat") - new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc) + new/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat(src.loc) if("ez") new/obj/item/nutrient/ez(src.loc) if("l4z") diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 987406df37..ff35e47488 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -141,7 +141,7 @@ var/totalslabs = 8 for (var/i=1 to totalslabs) - var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new() + var/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human/newmeat = new() newmeat.name = sourcename + newmeat.name newmeat.subjectname = sourcename newmeat.subjectjob = sourcejob @@ -155,7 +155,7 @@ var/totalslabs = 5 for (var/i=1 to totalslabs) - var/obj/item/weapon/reagent_containers/food/snacks/meat/monkey/newmeat = new() + var/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey/newmeat = new() newmeat.name = sourcename + newmeat.name newmeat.reagents.add_reagent("nutriment", sourcenutriment / totalslabs) // Thehehe. Fat guys go first src.occupant.reagents.trans_to(newmeat, round(sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 0a57dec0de..a0d3cfbc41 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -128,7 +128,7 @@ user << "\red This is ridiculous. You can not fit \the [G.affecting] in this [src]." return 1 else - user << "\red You have no idea what you can cook with this [O]." + user << "\red You have no idea what you can cook with \this [O]." return 1 src.updateUsrDialog() @@ -169,7 +169,7 @@ if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) items_measures[display_name] = "tofu chunk" items_measures_p[display_name] = "tofu chunks" - if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat)) //any meat items_measures[display_name] = "slab of meat" items_measures_p[display_name] = "slabs of meat" if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index f2bd93b634..43dfb63cac 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -30,24 +30,25 @@ output = /obj/item/weapon/reagent_containers/food/snacks/flour meat - input = /obj/item/weapon/reagent_containers/food/snacks/meat - output = /obj/item/weapon/reagent_containers/food/snacks/faggot + input = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat + output = /obj/item/weapon/reagent_containers/food/snacks/rawfaggot meat2 input = /obj/item/weapon/syntiflesh - output = /obj/item/weapon/reagent_containers/food/snacks/faggot + output = /obj/item/weapon/reagent_containers/food/snacks/rawfaggot /* monkeymeat - input = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey + input = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey output = /obj/item/weapon/reagent_containers/food/snacks/faggot humanmeat - input = /obj/item/weapon/reagent_containers/food/snacks/meat/human + input = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human output = /obj/item/weapon/reagent_containers/food/snacks/faggot */ + potato input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato - output = /obj/item/weapon/reagent_containers/food/snacks/fries + output = /obj/item/weapon/reagent_containers/food/snacks/rawsticks carrot input = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm index 348b64470b..130f8e4317 100644 --- a/code/game/magic/library.dm +++ b/code/game/magic/library.dm @@ -232,13 +232,13 @@ list/icon/photos // in-game photos used proc/navbar() - return "
" \ + return "
" \ + "
"+(cur_page > 1 \ - ? "<" \ + ? "< " \ + "<" \ : "") \ + "
"+(cur_page < pages.len \ - ? ">" \ + ? "> " \ + ">" \ : "") \ + "
[cur_page]/[pages.len]
" @@ -284,9 +284,14 @@ attack_self(var/mob/user as mob, opening=1) if(src.dat) cache_imgs(user) - if(pages.len == 0) // For instance, when the book is spawned by admisn + if(!pages || pages.len == 0) // For instance, when the book is spawned by admisn src.gen_pages() - user << browse("
[title]
[author]
[pages[cur_page]]
[pages.len > 1 ? navbar() : ""]", "window=book;size=600x500") + user << browse("[title]" \ + + "" \ + + "
[title]
[author]
" \ + + "
[pages[cur_page]]
" \ + + (pages.len > 1 ? navbar() : "") \ + + "", "window=book;size=600x500") if(opening) if(title) diff --git a/code/game/objects/closets/kitchen.dm b/code/game/objects/closets/kitchen.dm index ed6509d830..c8428ec34d 100644 --- a/code/game/objects/closets/kitchen.dm +++ b/code/game/objects/closets/kitchen.dm @@ -43,10 +43,10 @@ sleep(2) new /obj/item/kitchen/egg_box(src) new /obj/item/kitchen/egg_box(src) - new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src) - new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src) - new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src) - new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src) /obj/structure/closet/secure_closet/fridge/New() ..() diff --git a/code/game/objects/kitchen.dm b/code/game/objects/kitchen.dm index 7900e3f41f..4b822f63e0 100644 --- a/code/game/objects/kitchen.dm +++ b/code/game/objects/kitchen.dm @@ -48,11 +48,11 @@ if(src.meattype == 1) if(src.meat > 1) src.meat-- - new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey( src.loc ) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey( src.loc ) usr << "You remove some meat from the monkey." else if(src.meat == 1) src.meat-- - new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src.loc) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src.loc) usr << "You remove the last piece of meat from the monkey!" src.icon_state = "spike" src.occupied = 0 diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 9f4d99fff2..9ff8f835b4 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1782,7 +1782,7 @@ datum if(!M) M = holder.my_atom M:bodytemperature += 5 if(prob(40) && !istype(M, /mob/living/carbon/metroid)) - M.take_organ_damage(0, 1) + M.apply_damage(1, BURN, pick("head", "chest")) if(istype(M, /mob/living/carbon/metroid)) M:bodytemperature += rand(5,20) @@ -1837,7 +1837,7 @@ datum if(!M) M = holder.my_atom M:bodytemperature -= 5 if(prob(40)) - M.take_organ_damage(0, 1) + M.apply_damage(1, BURN, pick("head", "chest")) if(prob(80) && istype(M, /mob/living/carbon/metroid)) M.adjustFireLoss(rand(5,20)) M << "\red You feel a terrible chill inside your body!" diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index 9973dbb45b..a403d17e01 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -605,7 +605,7 @@ datum required_other = 2 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/syntiflesh(location) return metroidenzyme @@ -894,7 +894,7 @@ datum result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/syntiflesh(location) return hot_ramen diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 9fef047d5f..823d5ed770 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1278,6 +1278,13 @@ src.pixel_x = rand(-5.0, 5) //Randomizes postion slightly. src.pixel_y = rand(-5.0, 5) + + proc/foodloc(var/mob/M, var/obj/item/O) + if(O.loc == M) + return M.loc + else + return O.loc + /obj/item/weapon/reagent_containers/food/snacks //Food items that are eaten normally and don't leave anything behind. name = "snack" desc = "yummy" diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 13eb9a4f94..e6d2c0dc64 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -200,16 +200,18 @@ ..() reagents.add_reagent("nutriment", 1) -/obj/item/weapon/reagent_containers/food/snacks/meat +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat name = "meat" desc = "A slab of meat" icon_state = "meat" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet + slices_num = 3 New() ..() reagents.add_reagent("nutriment", 3) src.bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/syntiflesh name = "synthetic meat" desc = "A synthetic slab of flesh." @@ -231,12 +233,12 @@ reagents.add_reagent("nutriment", 1) src.bitesize = 1 -/obj/item/weapon/reagent_containers/food/snacks/meat/human +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human name = "-meat" var/subjectname = "" var/subjectjob = null -/obj/item/weapon/reagent_containers/food/snacks/meat/monkey +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey //same as plain meat /obj/item/weapon/reagent_containers/food/snacks/tofu @@ -308,8 +310,8 @@ src.bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/faggot - name = "Faggot" - desc = "A great meal all round. Not a cord of wood." + name = "meatball" + desc = "A great meal all round." icon_state = "faggot" New() ..() @@ -342,14 +344,27 @@ src.name = "donk-pocket" return -/obj/item/weapon/reagent_containers/food/snacks/brainburger - name = "brainburger" - desc = "A strange looking burger. It looks almost sentient." - icon_state = "brainburger" +/obj/item/weapon/reagent_containers/food/snacks/burger + name = "burger" + desc = "The cornerstone of every nutritious breakfast." + icon_state = "burger" + bitesize = 2 New() ..() reagents.add_reagent("nutriment", 6) - bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/burger/cheese + name = "cheeseburger" + desc = "The cheese adds a good flavor." + icon_state = "cheeseburger" + New() + ..() + reagents.add_reagent("nutriment", 2) + +/obj/item/weapon/reagent_containers/food/snacks/burger/brain + name = "brainburger" + desc = "A strange looking burger. It looks almost sentient." + icon_state = "brainburger" /obj/item/weapon/reagent_containers/food/snacks/human var/hname = "" @@ -358,50 +373,35 @@ /obj/item/weapon/reagent_containers/food/snacks/human/burger name = "-burger" desc = "A bloody burger." - icon_state = "hburger" + icon_state = "burger" New() ..() reagents.add_reagent("nutriment", 6) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/monkeyburger - name = "burger" - desc = "The cornerstone of every nutritious breakfast." - icon_state = "hburger" - New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/fishburger +/obj/item/weapon/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" New() ..() - reagents.add_reagent("nutriment", 6) reagents.add_reagent("carpotoxin", 3) bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/tofuburger +/obj/item/weapon/reagent_containers/food/snacks/burger/tofu name = "Tofu Burger" desc = "What.. is that meat?" icon_state = "tofuburger" - New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/roburger +/obj/item/weapon/reagent_containers/food/snacks/burger/ro name = "roburger" desc = "The lettuce is the only organic component. Beep." icon_state = "roburger" New() ..() reagents.add_reagent("nanites", 2) - bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/roburgerbig +/obj/item/weapon/reagent_containers/food/snacks/burger/ro_big name = "roburger" desc = "This massive patty looks like poison. Beep." icon_state = "roburger" @@ -411,37 +411,30 @@ reagents.add_reagent("nanites", 100) bitesize = 0.1 -/obj/item/weapon/reagent_containers/food/snacks/xenoburger +/obj/item/weapon/reagent_containers/food/snacks/burger/xeno name = "xenoburger" desc = "Smells caustic. Tastes like heresy." icon_state = "xburger" New() ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 + reagents.add_reagent("nutriment", 2) -/obj/item/weapon/reagent_containers/food/snacks/clownburger +/obj/item/weapon/reagent_containers/food/snacks/burger/clown name = "Clown Burger" desc = "This tastes funny..." icon_state = "clownburger" - New() +/* New() ..() -/* + var/datum/disease/F = new /datum/disease/pierrot_throat(0) var/list/data = list("viruses"= list(F)) reagents.add_reagent("blood", 4, data) */ - reagents.add_reagent("nutriment", 6) - bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/mimeburger +/obj/item/weapon/reagent_containers/food/snacks/burger/mime name = "Mime Burger" desc = "It's taste defies language." icon_state = "mimeburger" - New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/omelette name = "Omelette Du Fromage" @@ -801,7 +794,7 @@ reagents.add_reagent("carbon", 1) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/meatsteak +/obj/item/weapon/reagent_containers/food/snacks/sliceable/meatsteak name = "Meat steak" desc = "A piece of hot spicy meat." icon_state = "meatstake" @@ -1729,3 +1722,234 @@ icon_state = "vegetablepizzaslice" bitesize = 2 +/////////////////////////////////////////// +// new food stuff from bs12 +/////////////////////////////////////////// + +// Flour + egg = dough +/obj/item/weapon/reagent_containers/food/snacks/flour/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/dough(spawnloc) + user << "You make some dough." + del(W) + del(src) + +/obj/item/weapon/reagent_containers/food/snacks/dough + name = "dough" + desc = "A dough." + icon = 'food_ingredients.dmi' + icon_state = "dough" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 5) + +// Dough + rolling pin = flat dough +/obj/item/weapon/reagent_containers/food/snacks/dough/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/kitchen/rollingpin)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(spawnloc) + user << "You flatten the dough." + del(src) + +// slicable into 3xdoughslices +/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough + name = "flat dough" + desc = "A flattened dough." + icon = 'food_ingredients.dmi' + icon_state = "flat dough" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice + slices_num = 3 + New() + ..() + reagents.add_reagent("nutriment", 3) + +/obj/item/weapon/reagent_containers/food/snacks/doughslice + name = "dough slice" + desc = "Make your magic." + icon = 'food_ingredients.dmi' + icon_state = "doughslice" + New() + ..() + bitesize = 2 + reagents.add_reagent("nutriment", 2) + +/obj/item/weapon/reagent_containers/food/snacks/bun + name = "bun" + desc = "A base for any self-respecting burger." + icon = 'food_ingredients.dmi' + icon_state = "bun" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 4) + +/obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/weapon/W as obj, mob/user as mob) + // Bun + meatball = burger + if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/faggot)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/burger(spawnloc) + user << "You make a burger." + del(W) + del(src) + + // Bun + cutlet = hamburger + else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/cutlet)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/burger(spawnloc) + user << "You make a burger." + del(W) + del(src) + + // Bun + sausage = hotdog + else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/sausage)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/hotdog(spawnloc) + user << "You make a hotdog." + del(W) + del(src) + +// Burger + cheese wedge = cheeseburger +/obj/item/weapon/reagent_containers/food/snacks/burger/attackby(obj/item/weapon/reagent_containers/food/snacks/cheesewedge/W as obj, mob/user as mob) + if(istype(W) && !istype(src,/obj/item/weapon/reagent_containers/food/snacks/burger/cheese)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/burger/cheese(spawnloc) + user << "You make a cheeseburger." + del(W) + del(src) + return + else + ..() + +// Human Burger + cheese wedge = cheeseburger +/obj/item/weapon/reagent_containers/food/snacks/human/burger/attackby(obj/item/weapon/reagent_containers/food/snacks/cheesewedge/W as obj, mob/user as mob) + if(istype(W)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/burger/cheese(spawnloc) + user << "You make a cheeseburger." + del(W) + del(src) + return + else + ..() + +// Cheese burger + cheeseburger = big bite burger +/obj/item/weapon/reagent_containers/food/snacks/burger/cheese/attackby(obj/item/weapon/reagent_containers/food/snacks/burger/cheese/W as obj, mob/user as mob) + if(istype(W)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger(spawnloc) + user << "You make a big bite burger." + del(W) + del(src) + return + else + ..() + +// Big bite burger + Big bite burger = unfinished super bite burger +/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger/attackby(obj/item/weapon/reagent_containers/food/snacks/bigbiteburger/W as obj, mob/user as mob) + if(istype(W)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/unfinished_superbiteburger(spawnloc) + user << "You start to make a super bite burger. It could use more ingredients." + del(W) + del(src) + return + else + ..() + +/obj/item/weapon/reagent_containers/food/snacks/taco + name = "taco" + desc = "Take a bite!" + icon_state = "taco" + bitesize = 3 + New() + ..() + reagents.add_reagent("nutriment", 7) + +/obj/item/weapon/reagent_containers/food/snacks/rawcutlet + name = "raw cutlet" + desc = "A thin piece of meat." + icon = 'food_ingredients.dmi' + icon_state = "rawcutlet" + bitesize = 1 + New() + ..() + reagents.add_reagent("nutriment", 1) + +/obj/item/weapon/reagent_containers/food/snacks/cutlet + name = "cutlet" + desc = "A tasty meat slice - 'Bacon'." + icon = 'food_ingredients.dmi' + icon_state = "cutlet" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 2) + +/obj/item/weapon/reagent_containers/food/snacks/rawfaggot + name = "raw meatball" + desc = "A raw meatball." + icon = 'food_ingredients.dmi' + icon_state = "rawmeatball" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 2) + +/obj/item/weapon/reagent_containers/food/snacks/hotdog + name = "hotdog" + desc = "Unrelated to dogs." + icon_state = "hotdog" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 6) + +/obj/item/weapon/reagent_containers/food/snacks/flatbread + name = "flatbread" + desc = "Bland but filling." + icon = 'food_ingredients.dmi' + icon_state = "flatbread" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 3) + +// potato + knife = raw sticks +/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/kitchen/utensil/knife)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(spawnloc) + user << "You cut the potato." + del(src) + +/obj/item/weapon/reagent_containers/food/snacks/rawsticks + name = "raw potato sticks" + desc = "Maybe you should cook it first?" + icon = 'food_ingredients.dmi' + icon_state = "rawsticks" + bitesize = 2 + New() + ..() + reagents.add_reagent("nutriment", 3) + +/obj/item/weapon/reagent_containers/food/snacks/mint + name = "mint" + desc = "Minty fresh!" + icon_state = "mint" + trash = "plate" + bitesize = 3 + New() + ..() + reagents.add_reagent("sugar", 2) + reagents.add_reagent("frostoil", 1) + +/obj/item/weapon/reagent_containers/food/snacks/unfinished_superbiteburger + name = "Unfinished Super Bite Burger" + desc = "This is a mountain of a burger. Could be bigger." + icon_state = "superbiteburger" + New() + ..() + reagents.add_reagent("nutriment", 30) + bitesize = 10 diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 076890065e..d5922514f5 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -3,7 +3,7 @@ /datum/recipe/telebacon items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, /obj/item/device/assembly/signaler ) result = /obj/item/weapon/reagent_containers/food/snacks/telebacon @@ -40,17 +40,16 @@ */ /datum/recipe/jellydonut - reagents = list("berryjuice" = 5) + reagents = list("berryjuice" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg + /obj/item/weapon/reagent_containers/food/snacks/dough ) result = /obj/item/weapon/reagent_containers/food/snacks/jellydonut /datum/recipe/donut + reagents = list("sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg + /obj/item/weapon/reagent_containers/food/snacks/dough ) result = /obj/item/weapon/reagent_containers/food/snacks/donut @@ -59,7 +58,7 @@ make_food(var/obj/container as obj) var/human_name var/human_job - for (var/obj/item/weapon/reagent_containers/food/snacks/meat/human/HM in container) + for (var/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human/HM in container) if (!HM.subjectname) continue human_name = HM.subjectname @@ -74,47 +73,17 @@ HB.job = human_job return HB -/datum/recipe/human/burger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat/human - ) - result = /obj/item/weapon/reagent_containers/food/snacks/human/burger - -/* -/datum/recipe/monkeyburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger -*/ - -/datum/recipe/plainburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/humanburger - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger - -/datum/recipe/syntiburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/syntiflesh - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger - /datum/recipe/brainburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/brain ) - result = /obj/item/weapon/reagent_containers/food/snacks/brainburger + result = /obj/item/weapon/reagent_containers/food/snacks/burger/brain /* NO FUN ALLOWED /datum/recipe/roburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/robot_parts/head ) result = /obj/item/weapon/reagent_containers/food/snacks/roburger @@ -122,46 +91,45 @@ /datum/recipe/xenoburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/weapon/reagent_containers/food/snacks/xenomeat ) - result = /obj/item/weapon/reagent_containers/food/snacks/xenoburger + result = /obj/item/weapon/reagent_containers/food/snacks/burger/xeno /datum/recipe/fishburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/weapon/reagent_containers/food/snacks/carpmeat ) - result = /obj/item/weapon/reagent_containers/food/snacks/fishburger + result = /obj/item/weapon/reagent_containers/food/snacks/burger/fish /datum/recipe/tofuburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/weapon/reagent_containers/food/snacks/tofu ) - result = /obj/item/weapon/reagent_containers/food/snacks/tofuburger + result = /obj/item/weapon/reagent_containers/food/snacks/burger/tofu /datum/recipe/clownburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/clothing/mask/gas/clown_hat, /* /obj/item/weapon/reagent_containers/food/snacks/grown/banana, */ ) - result = /obj/item/weapon/reagent_containers/food/snacks/clownburger + result = /obj/item/weapon/reagent_containers/food/snacks/burger/clown /datum/recipe/mimeburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/clothing/head/beret ) - result = /obj/item/weapon/reagent_containers/food/snacks/mimeburger + result = /obj/item/weapon/reagent_containers/food/snacks/burger/mime /datum/recipe/waffles + reagents = list("sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough ) result = /obj/item/weapon/reagent_containers/food/snacks/waffles @@ -174,7 +142,7 @@ /datum/recipe/donkpocket items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/faggot, ) result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL @@ -202,12 +170,12 @@ /datum/recipe/meatbread items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, @@ -216,9 +184,9 @@ /datum/recipe/syntibread items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/syntiflesh, /obj/item/weapon/syntiflesh, /obj/item/weapon/syntiflesh, @@ -238,9 +206,9 @@ /datum/recipe/xenomeatbread items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/xenomeat, /obj/item/weapon/reagent_containers/food/snacks/xenomeat, /obj/item/weapon/reagent_containers/food/snacks/xenomeat, @@ -251,14 +219,11 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread /datum/recipe/bananabread - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/grown/banana, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread @@ -275,8 +240,7 @@ /datum/recipe/muffin reagents = list("milk" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, ) result = /obj/item/weapon/reagent_containers/food/snacks/muffin @@ -302,79 +266,67 @@ /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human, ) result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen /datum/recipe/carrotcake - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot //TODO: more carrots ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake /datum/recipe/cheesecake - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake /datum/recipe/plaincake - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake /datum/recipe/meatpie items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, ) result = /obj/item/weapon/reagent_containers/food/snacks/meatpie /datum/recipe/tofupie items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/tofu, ) result = /obj/item/weapon/reagent_containers/food/snacks/tofupie /datum/recipe/xemeatpie items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/xenomeat, ) result = /obj/item/weapon/reagent_containers/food/snacks/xemeatpie /datum/recipe/pie + reagents = list("sugar") items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/grown/banana, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/weapon/reagent_containers/food/snacks/grown/banana, ) result = /obj/item/weapon/reagent_containers/food/snacks/pie /* @@ -388,8 +340,7 @@ */ /datum/recipe/berryclafoutis items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/grown/berries, ) result = /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis @@ -402,26 +353,25 @@ result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu /datum/recipe/chaosdonut - reagents = list("frostoil" = 2, "capsaicin" = 2, ) + reagents = list("frostoil" = 2, "capsaicin" = 2, "sugar" = 5 ) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg + /obj/item/weapon/reagent_containers/food/snacks/dough ) result = /obj/item/weapon/reagent_containers/food/snacks/chaosdonut /datum/recipe/human/kabob items = list( /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human, ) result = /obj/item/weapon/reagent_containers/food/snacks/human/kabob /datum/recipe/monkeykabob items = list( /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey, ) result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob @@ -443,9 +393,9 @@ /datum/recipe/tofubread items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/tofu, /obj/item/weapon/reagent_containers/food/snacks/tofu, /obj/item/weapon/reagent_containers/food/snacks/tofu, @@ -471,7 +421,7 @@ /datum/recipe/cubancarp items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, ) @@ -484,9 +434,9 @@ result = /obj/item/weapon/reagent_containers/food/snacks/popcorn /datum/recipe/fortunecookie + reagents = list("sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/doughslice, /obj/item/weapon/paper, ) result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie @@ -507,21 +457,20 @@ /datum/recipe/meatsteak reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatsteak /datum/recipe/syntisteak reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( /obj/item/weapon/syntiflesh ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatsteak /datum/recipe/pizzamargherita items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, @@ -532,11 +481,10 @@ /datum/recipe/meatpizza items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) @@ -544,8 +492,7 @@ /datum/recipe/syntipizza items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/syntiflesh, /obj/item/weapon/syntiflesh, /obj/item/weapon/syntiflesh, @@ -556,24 +503,25 @@ /datum/recipe/mushroompizza items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza /datum/recipe/vegetablepizza items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/corn, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza @@ -633,7 +581,7 @@ /datum/recipe/hotchili items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) @@ -641,7 +589,7 @@ /datum/recipe/coldchili items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) @@ -649,44 +597,35 @@ /datum/recipe/amanita_pie items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita, ) result = /obj/item/weapon/reagent_containers/food/snacks/amanita_pie /datum/recipe/plump_pie items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet, ) result = /obj/item/weapon/reagent_containers/food/snacks/plump_pie /datum/recipe/spellburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/burger, /obj/item/clothing/head/wizard/fake, ) result = /obj/item/weapon/reagent_containers/food/snacks/spellburger /datum/recipe/spellburger items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/burger, /obj/item/clothing/head/wizard, ) result = /obj/item/weapon/reagent_containers/food/snacks/spellburger -/datum/recipe/bigbiteburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger - /datum/recipe/enchiladas items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/corn, @@ -715,9 +654,8 @@ /datum/recipe/baguette reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, ) result = /obj/item/weapon/reagent_containers/food/snacks/baguette @@ -729,29 +667,25 @@ result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips /datum/recipe/birthdaycake - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/clothing/head/cakehat ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake /datum/recipe/bread items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/egg, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread /datum/recipe/sandwich items = list( - /obj/item/weapon/reagent_containers/food/snacks/meatsteak, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatsteak, /obj/item/weapon/reagent_containers/food/snacks/breadslice, /obj/item/weapon/reagent_containers/food/snacks/breadslice, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, @@ -781,12 +715,10 @@ result = /obj/item/weapon/reagent_containers/food/snacks/tomatosoup /datum/recipe/rofflewaffles - reagents = list("psilocybin" = 5) + reagents = list("psilocybin" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, ) result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles @@ -794,7 +726,7 @@ reagents = list("water" = 10) items = list( /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, /obj/item/weapon/reagent_containers/food/snacks/grown/potato, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, @@ -847,9 +779,8 @@ /datum/recipe/poppypretzel items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/seeds/poppyseed, - /obj/item/weapon/reagent_containers/food/snacks/egg, ) result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel @@ -873,30 +804,6 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw -/datum/recipe/superbiteburger - reagents = list("sodiumchloride" = 5, "blackpepper" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - - ) - result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger - /datum/recipe/candiedapple reagents = list("water" = 5, "sugar" = 5) items = list( @@ -906,21 +813,17 @@ /datum/recipe/applepie items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, ) result = /obj/item/weapon/reagent_containers/food/snacks/applepie /datum/recipe/applecake - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, ) @@ -1058,7 +961,7 @@ /datum/recipe/sausage items = list( /obj/item/weapon/reagent_containers/food/snacks/faggot, - /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/cutlet, ) result = /obj/item/weapon/reagent_containers/food/snacks/sausage @@ -1079,4 +982,59 @@ /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) - result = /obj/item/weapon/reagent_containers/food/snacks/mysterysoup \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/mysterysoup + +////////////////////////////////////////// +// bs12 food port stuff +////////////////////////////////////////// + +/datum/recipe/taco + items = list( + /obj/item/weapon/reagent_containers/food/snacks/doughslice, + /obj/item/weapon/reagent_containers/food/snacks/cutlet, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/weapon/reagent_containers/food/snacks/taco + +/datum/recipe/bun + items = list( + /obj/item/weapon/reagent_containers/food/snacks/dough + ) + result = /obj/item/weapon/reagent_containers/food/snacks/bun + +/datum/recipe/flatbread + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough + ) + result = /obj/item/weapon/reagent_containers/food/snacks/flatbread + +/datum/recipe/faggot + items = list( + /obj/item/weapon/reagent_containers/food/snacks/rawfaggot + ) + result = /obj/item/weapon/reagent_containers/food/snacks/faggot + +/datum/recipe/cutlet + items = list( + /obj/item/weapon/reagent_containers/food/snacks/rawcutlet + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cutlet + +/datum/recipe/fries + items = list( + /obj/item/weapon/reagent_containers/food/snacks/rawsticks + ) + result = /obj/item/weapon/reagent_containers/food/snacks/fries + +/datum/recipe/mint + reagents = list("sugar" = 5, "frostoil" = 5) + result = /obj/item/weapon/reagent_containers/food/snacks/mint + +/datum/recipe/superbiteburger + reagents = list("salt" = 5, "pepper" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/unfinished_superbiteburger, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 28a0f0a8c6..27b05fd606 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi new file mode 100644 index 0000000000..eea8240f6d Binary files /dev/null and b/icons/obj/food_ingredients.dmi differ