diff --git a/code/WorkInProgress/Chemistry-Machinery.dm b/code/WorkInProgress/Chemistry-Machinery.dm index 769619621a2..29602525570 100644 --- a/code/WorkInProgress/Chemistry-Machinery.dm +++ b/code/WorkInProgress/Chemistry-Machinery.dm @@ -504,7 +504,14 @@ /obj/item/stack/sheet/clown = "banana", /obj/item/stack/sheet/silver = "silver", /obj/item/stack/sheet/gold = "gold", + /obj/item/weapon/reagent_containers/food/snacks/grown/banana = "banana", + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot = "imidazoline", /obj/item/weapon/reagent_containers/food/snacks/grown/corn = "cornoil", + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap = "psilocybin", + /obj/item/weapon/reagent_containers/food/snacks/grown/chili = "capsaicin", + /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper = "frostoil", + /obj/item/weapon/grown/nettle = "acid", + /obj/item/weapon/grown/deathnettle = "pacid", ) /obj/machinery/reagentgrinder/New() @@ -625,7 +632,20 @@ else if (O.potency == -1) return 5 else - return round(5*sqrt(O.potency)) + return round(O.potency / 5) + +/obj/machinery/reagentgrinder/proc/get_grownweapon_id(var/obj/item/weapon/grown/O) + for (var/i in allowed_items) + if (istype(O, i)) + return allowed_items[i] + +/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(var/obj/item/weapon/grown/O) + if (!istype(O)) + return 5 + else if (O.potency == -1) + return 5 + else + return round(O.potency) /obj/machinery/reagentgrinder/proc/get_grind_id(var/obj/item/stack/sheet/O) for (var/i in allowed_items) @@ -636,12 +656,12 @@ return 20 /obj/machinery/reagentgrinder/proc/grind() - power_change() //it is a portable machine + power_change() if(stat & (NOPOWER|BROKEN)) return if (!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume) return - playsound(src.loc, 'juicer.ogg', 50, 1) + playsound(src.loc, 'juicer.ogg', 20, 1) for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents) var/r_id = get_juice_id(O) beaker.reagents.add_reagent(r_id,get_juice_amount(O)) @@ -652,5 +672,11 @@ var/g_id = get_grind_id(O) beaker.reagents.add_reagent(g_id,get_grind_amount(O)) del(O) + if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) + break + for (var/obj/item/weapon/grown/O in src.contents) + var/g_id = get_grownweapon_id(O) + beaker.reagents.add_reagent(g_id,get_grownweapon_amount(O)) + del(O) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break \ No newline at end of file diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 15b574b9c2c..872d6a10941 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -227,27 +227,6 @@ datum T.wet_overlay = null return - bilk - name = "Bilk" - id = "bilk" - description = "This appears to be beer mixed with milk. Disgusting." - reagent_state = LIQUID - on_mob_life(var/mob/living/M as mob) - if(M:bruteloss && prob(10)) M:heal_organ_damage(1,0) - M:nutrition += 2 - if(!data) data = 1 - data++ - M.make_dizzy(3) - M:jitteriness = max(M:jitteriness-3,0) - if(data >= 25) - if (!M:stuttering) M:stuttering = 1 - M:stuttering += 3 - if(data >= 40 && prob(33)) - if (!M:confused) M:confused = 1 - M:confused += 2 - ..() - return - anti_toxin name = "Anti-Toxin (Dylovene)" id = "anti_toxin" @@ -1134,6 +1113,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(M.bodytemperature < 170) + if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-1) if(M:oxyloss) M:oxyloss = max(0, M:oxyloss-3) M:heal_organ_damage(3,3) if(M:toxloss) M:toxloss = max(0, M:toxloss-3) @@ -1291,6 +1271,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(!data) data = 1 + data++ switch(data) if(1) M:confused += 2 @@ -1300,7 +1281,6 @@ datum if(51 to INFINITY) M:sleeping += 1 M:toxloss += (data - 50) - data++ ..() return @@ -2099,6 +2079,97 @@ datum /////////////////////////////////////////////////////////////////cocktail entities////////////////////////////////////////////// + bilk + name = "Bilk" + id = "bilk" + description = "This appears to be beer mixed with milk. Disgusting." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(M:bruteloss && prob(10)) M:heal_organ_damage(1,0) + M:nutrition += 2 + if(!data) data = 1 + data++ + M.make_dizzy(3) + M:jitteriness = max(M:jitteriness-3,0) + if(data >= 25) + if (!M:stuttering) M:stuttering = 1 + M:stuttering += 3 + if(data >= 40 && prob(33)) + if (!M:confused) M:confused = 1 + M:confused += 2 + ..() + return + + atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + description = "Nuclear proliferation never tasted so good." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 50) + M.confused = max(M:confused+2,0) + M.make_dizzy(10) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + if(!data) data = 1 + data++ + switch(data) + if(51 to INFINITY) + M:sleeping += 1 + ..() + return + + threemileisland + name = "THree Mile Island Iced Tea" + id = "threemileisland" + description = "Made for a woman, strong enough for a man." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.dizziness +=3 + M.druggy = max(M.druggy, 50) + if(data >= 35 && data <90) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + else if(data >= 90) + M.confused = max(M:confused+2,0) + ..() + return + + goldschlager + name = "Goldschlager" + id = "goldschlager" + description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.dizziness +=3 + if(data >= 45 && data <125) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + else if(data >= 125 && prob(33)) + M.confused = max(M:confused+2,0) + ..() + return + + patron + name = "Patron" + id = "patron" + description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.dizziness +=3 + if(data >= 45 && data <125) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + else if(data >= 125 && prob(33)) + M.confused = max(M:confused+2,0) + ..() + return gintonic name = "Gin and Tonic" diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index 1fb92f86773..a9492f9ae53 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -14,13 +14,6 @@ datum //I recommend you set the result amount to the total volume of all components. - bilk - name = "Bilk" - id = "bilk" - result = "bilk" - required_reagents = list("milk" = 1, "beer" = 1) - result_amount = 2 - explosion_potassium name = "Explosion" id = "explosion_potassium" @@ -152,7 +145,8 @@ datum name = "Leporazine" id = "leporazine" result = "leporazine" - required_reagents = list("silicon" = 1, "plasma" = 1, ) + required_reagents = list("silicon" = 1, "copper" = 1) + required_catalysts = list("plasma" = 5) result_amount = 2 cryptobiolin @@ -180,8 +174,9 @@ datum name = "Dexalin" id = "dexalin" result = "dexalin" - required_reagents = list("plasma" = 1, "oxygen" = 1) - result_amount = 2 + required_reagents = list("oxygen" = 2) + required_catalysts = list("plasma" = 5) + result_amount = 1 dexalinp name = "Dexalin Plus" @@ -216,14 +211,15 @@ datum id = "cryoxadone" result = "cryoxadone" required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1) - result_amount = 10 + result_amount = 3 clonexadone name = "Clonexadone" id = "clonexadone" result = "clonexadone" - required_reagents = list("plasma" = 1, "cryoxadone" = 1, "sodium" = 1) - result_amount = 10 + required_reagents = list("cryoxadone" = 1, "sodium" = 1) + required_catalysts = list("plasma" = 5) + result_amount = 2 spaceacillin name = "Spaceacillin" @@ -526,6 +522,18 @@ datum new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location) return + syntiflesh + name = "Syntiflesh" + id = "syntiflesh" + result = null + required_reagents = list("blood" = 5) + required_catalysts = list("clonexadone" = 1) + result_amount = 1 + on_reaction(var/datum/reagents/holder, var/created_volume) + var/location = get_turf(holder.my_atom) + new /obj/item/weapon/syntiflesh(location) + return + hot_ramen name = "Hot Ramen" id = "hot_ramen" @@ -543,6 +551,27 @@ datum ////////////////////////////////////////// COCKTAILS ////////////////////////////////////// + goldschlager + name = "Goldschlager" + id = "goldschlager" + result = "goldschlager" + required_reagents = list("vodka" = 10, "gold" = 1) + result_amount = 10 + + patron + name = "Patron" + id = "patron" + result = "patron" + required_reagents = list("tequilla" = 10, "silver" = 1) + result_amount = 10 + + bilk + name = "Bilk" + id = "bilk" + result = "bilk" + required_reagents = list("milk" = 1, "beer" = 1) + result_amount = 2 + icetea name = "Iced Tea" id = "icetea" @@ -724,6 +753,13 @@ datum required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1) result_amount = 3 + atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + result = "atomicbomb" + required_reagents = list("b52" = 10, "uranium" = 1) + result_amount = 10 + margarita name = "Margarita" id = "margarita" @@ -738,6 +774,13 @@ datum required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1) result_amount = 4 + threemileisland + name = "Three Mile Island Iced Tea" + id = "threemileisland" + result = "threemileisland" + required_reagents = list("longislandicedtea" = 10, "uranium" = 1) + result_amount = 10 + whiskeysoda name = "Whiskey Soda" id = "whiskeysoda" diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index c6e4357cc88..90cc822fdd6 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -2162,6 +2162,14 @@ ..() reagents.add_reagent("tequilla", 100) +/obj/item/weapon/reagent_containers/food/drinks/bottle/patron + name = "Wrapp Artiste Patron" + desc = "Silver laced tequilla, served in space night clubs across the galaxy." + icon_state = "patronbottle" + New() + ..() + reagents.add_reagent("patron", 100) + /obj/item/weapon/reagent_containers/food/drinks/bottle/rum name = "Captain Pete's Cuban Spiced Rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." @@ -2186,6 +2194,14 @@ ..() reagents.add_reagent("kahlua", 100) +/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager + name = "College Girl Goldschlager" + desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." + icon_state = "goldschlagerbottle" + New() + ..() + reagents.add_reagent("goldschlager", 100) + /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac name = "Chateau De Baton Premium Cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." @@ -2451,6 +2467,10 @@ icon_state = "glass_red" name = "Glass of Tomato juice" desc = "Are you sure this is tomato juice?" + if("blood") + icon_state = "glass_red" + name = "Glass of Tomato juice" + desc = "Are you sure this is tomato juice?" if("limejuice") icon_state = "glass_green" name = "Glass of Lime juice" @@ -2467,6 +2487,10 @@ icon_state = "ginvodkaglass" name = "Glass of vodka" desc = "The glass contain wodka. Xynta." + if("goldschlager") + icon_state = "ginvodkaglass" + name = "Glass of goldschlager" + desc = "100 proof that teen girls will drink anything with gold in it." if("wine") icon_state = "wineglass" name = "Glass of wine" @@ -2487,6 +2511,10 @@ icon_state = "tequillaglass" name = "Glass of Tequilla" desc = "Now all that's missing is the weird colored shades!" + if("patron") + icon_state = "patronglass" + name = "Glass of Patron" + desc = "Drinking patron in the bar, with all the subpar ladies." if("rum") icon_state = "rumglass" name = "Glass of Rum" @@ -2567,10 +2595,18 @@ icon_state = "b52glass" name = "B-52" desc = "Kahlua, Irish Cream, and congac. You will get bombed." + if("atomicbomb") + icon_state = "atomicbombglass" + name = "Atomic Bomb" + desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing." if("longislandicedtea") icon_state = "longislandicedteaglass" name = "Long Island Iced Tea" desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + if("threemileisland") + icon_state = "threemileislandglass" + name = "Three Mile Island Ice Tea" + desc = "A glass of this is sure to prevent a melt down." if("margarita") icon_state = "margaritaglass" name = "Margarita" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index e004613b28a..f2101605ad2 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1735,6 +1735,14 @@ Total SMES charging rate should not exceed total power generation rate, or an ov g_amt = 10000 origin_tech = "materials=1;biotech=1" +/obj/item/weapon/syntiflesh + name = "Syntiflesh" + icon = 'food.dmi' + icon_state = "meat" + flags = FPRINT | TABLEPASS | CONDUCT + w_class = 1.0 + origin_tech = "biotech=2" + /obj/item/weapon/stamp desc = "A rubber stamp for stamping important documents." name = "rubber stamp" diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 53204afc12d..067be2cad87 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -32,6 +32,10 @@ meat input = /obj/item/weapon/reagent_containers/food/snacks/meat output = /obj/item/weapon/reagent_containers/food/snacks/faggot + + meat2 + input = /obj/item/weapon/syntiflesh + output = /obj/item/weapon/reagent_containers/food/snacks/faggot /* monkeymeat input = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 8b77e8b9c51..6203524ab05 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -63,9 +63,9 @@ if(prob(30)) src.icon_state = "donut2" src.name = "frosted donut" - src.bitesize = 2 - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sprinkles", 1) + src.bitesize = 3 + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sprinkles", 3) /obj/item/weapon/reagent_containers/food/snacks/egg name = "egg" @@ -165,7 +165,7 @@ icon_state = "brainburger" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/human @@ -178,7 +178,7 @@ icon_state = "hburger" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/monkeyburger @@ -187,7 +187,7 @@ icon_state = "hburger" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/fishburger @@ -196,9 +196,9 @@ icon_state = "fishburger" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) reagents.add_reagent("carpotoxin", 3) - bitesize = 2 + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/tofuburger name = "Tofu Burger" @@ -206,7 +206,7 @@ icon_state = "tofuburger" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/roburger @@ -251,7 +251,7 @@ var/list/data = list("virus"= F) reagents.add_reagent("blood", 4, data) */ - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/mimeburger @@ -260,7 +260,7 @@ icon_state = "mimeburger" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/omelette @@ -270,7 +270,7 @@ //var/herp = 0 New() ..() - reagents.add_reagent("nutriment", 10) + reagents.add_reagent("nutriment", 8) bitesize = 1 attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/kitchen/utensil/fork)) @@ -307,6 +307,7 @@ New() ..() reagents.add_reagent("nutriment", 6) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/pie name = "Banana Cream Pie" @@ -316,16 +317,7 @@ ..() reagents.add_reagent("nutriment", 4) reagents.add_reagent("banana",5) -/* -/obj/item/weapon/reagent_containers/food/snacks/berrypie - name = "Very Berry Pie" - desc = "No black birds, this is a good sign." - icon_state = "pie" - New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("berryjuice", 5) -*/ + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis name = "Berry Clafoutis" @@ -335,6 +327,7 @@ ..() reagents.add_reagent("nutriment", 4) reagents.add_reagent("berryjuice", 5) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/waffles name = "waffles" @@ -351,7 +344,7 @@ icon_state = "eggplantparm" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/jellydonut @@ -367,8 +360,8 @@ src.icon_state = "donut2" src.name = "Frosted Jelly Donut" reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 3) - bitesize = 4 + reagents.add_reagent("sprinkles", 6) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/soylentgreen name = "Soylent Green" @@ -566,7 +559,7 @@ ..() reagents.add_reagent("nutriment", 4) reagents.add_reagent("syndicream", 2) - bitesize = 2 + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato name = "Loaded Baked Potato" @@ -595,15 +588,6 @@ reagents.add_reagent("nutriment", 6) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/cheesyfries - name = "Cheesy Fries" - desc = "Fries. Covered in cheese. Duh." - icon_state = "cheesyfries" - New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/fortunecookie name = "Fortune cookie" desc = "A true prophecy in each cookie!" @@ -631,40 +615,38 @@ ..() reagents.add_reagent("toxin", 1) reagents.add_reagent("carbon", 1) - bitesize = 1 + bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/meatstake +/obj/item/weapon/reagent_containers/food/snacks/meatsteak name = "Meat steak" desc = "A piece of hot spicy meat." icon_state = "meatstake" New() ..() - reagents.add_reagent("nutriment", 6) + reagents.add_reagent("nutriment", 4) reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("capsaicin", 3) - bitesize = 2 - + reagents.add_reagent("blackpepper", 1) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff name = "Spacy Liberty Duff" - desc = "" //TODO + desc = "Jello gelatin, if Alfred Hubbard were a confectionist" //TODO icon_state = "spacylibertyduff" New() ..() reagents.add_reagent("nutriment", 6) - reagents.add_reagent("water", 6) reagents.add_reagent("psilocybin", 6) - bitesize = 2 + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/amanitajelly name = "Amanita Jelly" - desc = "Looks curiously" + desc = "Looks curiously toxic" icon_state = "amanitajelly" New() ..() reagents.add_reagent("nutriment", 6) - reagents.add_reagent("water", 6) - reagents.add_reagent("psilocybin", 6) + reagents.add_reagent("amatoxin", 6) + reagents.add_reagent("psilocybin", 3) bitesize = 3 /* /obj/item/weapon/reagent_containers/food/snacks/poppypretzel @@ -685,8 +667,7 @@ New() ..() reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 10) - bitesize = 5 + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup name = "Vegetable soup" @@ -695,8 +676,7 @@ New() ..() reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 10) - bitesize = 5 + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/nettlesoup name = "Nettle soup" @@ -705,9 +685,8 @@ New() ..() reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 10) reagents.add_reagent("tricordrazine", 3) - bitesize = 5 + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/hotchili name = "Hot Chili" @@ -737,10 +716,10 @@ desc = "It takes a little odd but it is still delicious." icon_state = "bacon" var/obj/item/device/radio/beacon/bacon/baconbeacon - bitesize = 3 + bitesize = 2 New() ..() - reagents.add_reagent("nutriment", 6) + reagents.add_reagent("nutriment", 4) baconbeacon = new /obj/item/device/radio/beacon/bacon(src) On_Consume() if(!reagents.total_volume) @@ -1029,13 +1008,14 @@ /obj/item/weapon/reagent_containers/food/snacks/amanita_pie name = "amanita pie" - desc = "Sweet and tasty hallucinogenic pie." + desc = "Sweet and tasty poison pie." icon_state = "amanita_pie" New() ..() reagents.add_reagent("nutriment", 5) - reagents.add_reagent("psilocybin", 5) - bitesize = 2 + reagents.add_reagent("amatoxin", 3) + reagents.add_reagent("psilocybin", 1) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/plump_pie name = "plump pie" diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 2efdabfac7a..4d62e797950 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -8,6 +8,13 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/telebacon +/datum/recipe/syntitelebacon + items = list( + /obj/item/weapon/syntiflesh, + /obj/item/device/radio/signaler + ) + result = /obj/item/weapon/reagent_containers/food/snacks/telebacon + /datum/recipe/bananaphone reagents = list("psilocybin" = 5) //Trippin' balls, man. items = list( @@ -74,6 +81,13 @@ ) 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, @@ -182,6 +196,20 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread +/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/syntiflesh, + /obj/item/weapon/syntiflesh, + /obj/item/weapon/syntiflesh, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /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/meatbread + /* /datum/recipe/meatbreadhuman flour_amount = 3 @@ -229,7 +257,6 @@ /datum/recipe/muffin reagents = list("milk" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/flour, ) @@ -317,6 +344,14 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/momeatpie +/datum/recipe/syntipie + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/syntiflesh, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/momeatpie + /datum/recipe/tofupie items = list( /obj/item/weapon/reagent_containers/food/snacks/flour, @@ -353,8 +388,6 @@ 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/grown/berries, /obj/item/weapon/reagent_containers/food/snacks/grown/berries, ) result = /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis @@ -390,6 +423,14 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob +/datum/recipe/syntikabob + items = list( + /obj/item/stack/rods, + /obj/item/weapon/syntiflesh, + /obj/item/weapon/syntiflesh, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob + /datum/recipe/tofukabob items = list( /obj/item/stack/rods, @@ -461,12 +502,19 @@ return 0 return . -/datum/recipe/meatstake +/datum/recipe/meatsteak reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( /obj/item/weapon/reagent_containers/food/snacks/meat ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatstake + result = /obj/item/weapon/reagent_containers/food/snacks/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 /datum/recipe/pizzamargherita items = list( @@ -492,6 +540,18 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza +/datum/recipe/syntipizza + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/syntiflesh, + /obj/item/weapon/syntiflesh, + /obj/item/weapon/syntiflesh, + /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/meatpizza + /datum/recipe/mushroompizza items = list( /obj/item/weapon/reagent_containers/food/snacks/flour, @@ -598,7 +658,7 @@ /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, diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index bbe3270f880..57473e52563 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index ad947c465d2..d24eabd1504 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index c030d1b4a07..88d765119f5 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ