diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 872d6a10941..499a42f63bc 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -1382,14 +1382,12 @@ datum id = "sodiumchloride" description = "A salt made of sodium chloride. Commonly used to season food." reagent_state = SOLID - nutriment_factor = 1 * REAGENTS_METABOLISM blackpepper name = "Black Pepper" id = "blackpepper" description = "A power ground from peppercorns. *AAAACHOOO*" reagent_state = SOLID - nutriment_factor = 1 * REAGENTS_METABOLISM amatoxin name = "Amatoxin" @@ -1522,6 +1520,19 @@ datum id = "banana" description = "The raw essence of a banana. HONK" nutriment_factor = 1 * REAGENTS_METABOLISM + on_mob_life(var/mob/living/M as mob) + M:nutrition += nutriment_factor + if(istype(M, /mob/living/carbon/human) && M.job in list("Clown")) + if(!M) M = holder.my_atom + M:heal_organ_damage(1,1) + ..() + return + if(istype(M, /mob/living/carbon/monkey)) + if(!M) M = holder.my_atom + M:heal_organ_damage(1,1) + ..() + return + ..() dry_ramen name = "Dry Ramen" @@ -1541,6 +1552,7 @@ datum nutriment_factor = 5 * REAGENTS_METABOLISM on_mob_life(var/mob/living/M as mob) ..() + M:nutrition += nutriment_factor if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature+10) return @@ -1553,6 +1565,7 @@ datum nutriment_factor = 5 * REAGENTS_METABOLISM on_mob_life(var/mob/living/M as mob) ..() + M:nutrition += nutriment_factor M:bodytemperature += 10 return @@ -1574,7 +1587,7 @@ datum reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(M:bruteloss && prob(10)) M:heal_organ_damage(1,0) + if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0) M:nutrition++ ..() return @@ -1586,7 +1599,7 @@ datum reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(M:bruteloss && prob(10)) M:heal_organ_damage(1,0) + if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0) M:nutrition++ ..() return @@ -1651,7 +1664,8 @@ datum M.dizziness = max(0,M.dizziness-2) M:drowsyness = max(0,M:drowsyness-1) M:sleeping = 0 - if(M:toxloss && prob(50)) M:toxloss-- + if(M:toxloss && prob(50)) + M:toxloss-- if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature-5) return @@ -1754,13 +1768,13 @@ datum data++ M.make_dizzy(3) M:jitteriness = max(M:jitteriness-3,0) + M:nutrition += 2 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 - M:nutrition += 2 ..() return @@ -1923,9 +1937,6 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(M:oxyloss && prob(30)) M:oxyloss-- - if(M:bruteloss && prob(30)) M:heal_organ_damage(1,0) - if(M:fireloss && prob(30)) M:heal_organ_damage(0,1) - if(M:toxloss && prob(30)) M:toxloss-- M:nutrition++ ..() return @@ -1937,10 +1948,7 @@ datum reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(M:oxyloss && prob(20)) M:oxyloss-- - if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0) if(M:fireloss && prob(20)) M:heal_organ_damage(0,1) - if(M:toxloss && prob(20)) M:toxloss-- M:nutrition++ ..() return @@ -1952,14 +1960,21 @@ datum reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(M:oxyloss && prob(20)) M:oxyloss-- - if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0) - if(M:fireloss && prob(20)) M:heal_organ_damage(0,1) if(M:toxloss && prob(20)) M:toxloss-- M:nutrition++ ..() return + cream + name = "Cream" + id = "cream" + description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0) + ..() + return + carrotjuice name = "Carrot juice" id = "carrotjuice" @@ -2012,12 +2027,6 @@ datum ..() return - cream - name = "Cream" - id = "cream" - description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" - reagent_state = LIQUID - hooch name = "Hooch" id = "hooch" diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index a9492f9ae53..09bbeddd0f5 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -526,8 +526,7 @@ datum name = "Syntiflesh" id = "syntiflesh" result = null - required_reagents = list("blood" = 5) - required_catalysts = list("clonexadone" = 1) + required_reagents = list("blood" = 5, "clonexadone" = 1) result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 90cc822fdd6..aacfc57f5ac 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -1068,7 +1068,7 @@ user << "\red None of [src] left, oh no!" del(src) return 0 - if(istype(M, /mob/living/carbon/human)) + if(istype(M, /mob/living/carbon)) if(M == user) //If you're eating it yourself. var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) if (fullness <= 50) diff --git a/code/game/objects/items/food.dm b/code/game/objects/items/food.dm index 688fa72cb78..c165dd48d50 100644 --- a/code/game/objects/items/food.dm +++ b/code/game/objects/items/food.dm @@ -2,7 +2,7 @@ CONTAINS: DONUT BOX EGG BOX -YOUR MUMS BOX +MONKEY CUBE BOX */ diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 6203524ab05..f7a910396c3 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -34,6 +34,7 @@ ..() reagents.add_reagent("nutriment", 1) reagents.add_reagent("sugar", 3) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy_corn name = "candy corm" //Not a typo @@ -51,6 +52,7 @@ New() ..() reagents.add_reagent("nutriment", 3) + bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/donut name = "donut" @@ -60,12 +62,11 @@ ..() reagents.add_reagent("nutriment", 3) reagents.add_reagent("sprinkles", 1) + src.bitesize = 3 if(prob(30)) src.icon_state = "donut2" src.name = "frosted donut" - src.bitesize = 3 - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 3) + reagents.add_reagent("sprinkles", 2) /obj/item/weapon/reagent_containers/food/snacks/egg name = "egg" @@ -90,6 +91,7 @@ New() ..() reagents.add_reagent("nutriment", 3) + src.bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/meat/human name = "-meat" @@ -106,6 +108,7 @@ New() ..() reagents.add_reagent("nutriment", 3) + src.bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/carpmeat @@ -116,6 +119,7 @@ ..() reagents.add_reagent("nutriment", 3) reagents.add_reagent("carpotoxin", 3) + src.bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/bearmeat name = "bear meat" @@ -125,6 +129,7 @@ ..() reagents.add_reagent("nutriment", 12) reagents.add_reagent("hyperzine", 5) + src.bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/xenomeat name = "meat" @@ -132,7 +137,8 @@ icon_state = "xenomeat" New() ..() - reagents.add_reagent("nutriment", 3) + reagents.add_reagent("xenomicrobes", 6) + src.bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/faggot name = "Faggot" @@ -140,7 +146,7 @@ icon_state = "faggot" New() ..() - reagents.add_reagent("nutriment", 2) + reagents.add_reagent("nutriment", 3) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/donkpocket @@ -149,7 +155,8 @@ icon_state = "donkpocket" New() ..() - reagents.add_reagent("nutriment", 2) + reagents.add_reagent("nutriment", 4) + var/warm = 0 proc/cooltime() //Not working, derp? if (src.warm) @@ -350,18 +357,17 @@ /obj/item/weapon/reagent_containers/food/snacks/jellydonut name = "Jelly Donut" desc = "Oh so gooey on the inside." - icon_state = "donut1" //Placeholder until I stop being lazy. ie. Never. -- Darem + icon_state = "jdonut1" New() ..() reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 3) - bitesize = 2 + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("berryjuice", 5) + bitesize = 5 if(prob(30)) - src.icon_state = "donut2" + src.icon_state = "jdonut2" src.name = "Frosted Jelly Donut" - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 6) - bitesize = 3 + reagents.add_reagent("sprinkles", 2) /obj/item/weapon/reagent_containers/food/snacks/soylentgreen name = "Soylent Green" @@ -410,6 +416,32 @@ reagents.add_reagent("nutriment", 10) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/amanita_pie + name = "amanita pie" + desc = "Sweet and tasty poison pie." + icon_state = "amanita_pie" + New() + ..() + reagents.add_reagent("nutriment", 5) + reagents.add_reagent("amatoxin", 3) + reagents.add_reagent("psilocybin", 1) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/plump_pie + name = "plump pie" + desc = "I bet you love stuff made out of plump helmets!" + icon_state = "plump_pie" + New() + ..() + if(prob(10)) + name = "exceptional plump pie" + desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" + reagents.add_reagent("nutriment", 15) + bitesize = 2 + else + reagents.add_reagent("nutriment", 10) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/xemeatpie name = "Xeno-pie" icon_state = "xenomeatpie" @@ -498,7 +530,7 @@ reagents.add_reagent("nutriment", 6) reagents.add_reagent("carpotoxin", 3) reagents.add_reagent("capsaicin", 3) - bitesize = 2 + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/popcorn name = "Popcorm" //not a typo @@ -615,7 +647,7 @@ ..() reagents.add_reagent("toxin", 1) reagents.add_reagent("carbon", 1) - bitesize = 3 + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/meatsteak name = "Meat steak" @@ -667,7 +699,8 @@ New() ..() reagents.add_reagent("nutriment", 10) - bitesize = 2 + reagents.add_reagent("water", 10) + bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup name = "Vegetable soup" @@ -676,7 +709,8 @@ New() ..() reagents.add_reagent("nutriment", 10) - bitesize = 2 + reagents.add_reagent("water", 10) + bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/nettlesoup name = "Nettle soup" @@ -685,8 +719,19 @@ New() ..() reagents.add_reagent("nutriment", 10) + reagents.add_reagent("water", 7) reagents.add_reagent("tricordrazine", 3) - bitesize = 3 + bitesize = 5 + +/obj/item/weapon/reagent_containers/food/snacks/wishsoup + name = "Wish Soup" + desc = "I wish this was soup." + icon = 'janitor.dmi' + icon_state = "bucket" + New() + ..() + reagents.add_reagent("water", 20) + bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/hotchili name = "Hot Chili" @@ -713,7 +758,7 @@ /obj/item/weapon/reagent_containers/food/snacks/telebacon name = "Tele Bacon" - desc = "It takes a little odd but it is still delicious." + desc = "It tastes a little odd but it is still delicious." icon_state = "bacon" var/obj/item/device/radio/beacon/bacon/baconbeacon bitesize = 2 @@ -1003,32 +1048,4 @@ name = "Vegetable pizza slice" desc = "A slice of the most green pizza of all pizzas not containing green ingredients " icon_state = "vegetablepizzaslice" - bitesize = 2 - - -/obj/item/weapon/reagent_containers/food/snacks/amanita_pie - name = "amanita pie" - desc = "Sweet and tasty poison pie." - icon_state = "amanita_pie" - New() - ..() - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("amatoxin", 3) - reagents.add_reagent("psilocybin", 1) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/plump_pie - name = "plump pie" - desc = "I bet you love stuff made out of plump helmets!" - icon_state = "plump_pie" - New() - ..() - if(prob(10)) - name = "exceptional plump pie" - desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" - reagents.add_reagent("nutriment", 15) - bitesize = 2 - else - reagents.add_reagent("nutriment", 10) - bitesize = 2 - + bitesize = 2 \ No newline at end of file diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 4d62e797950..77695fbc7d9 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -609,7 +609,7 @@ */ /datum/recipe/meatballsoup - reagents = list("water" = 20) + reagents = list("water" = 10) items = list( /obj/item/weapon/reagent_containers/food/snacks/faggot , /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, @@ -618,7 +618,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/meatballsoup /datum/recipe/vegetablesoup - reagents = list("water" = 20) + reagents = list("water" = 10) items = list( /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/corn, @@ -628,7 +628,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup /datum/recipe/nettlesoup - reagents = list("water" = 20) + reagents = list("water" = 10) items = list( /obj/item/weapon/grown/nettle, /obj/item/weapon/reagent_containers/food/snacks/grown/potato, @@ -636,6 +636,10 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/nettlesoup +/datum/recipe/wishsoup + reagents = list("water" = 20) + result= /obj/item/weapon/reagent_containers/food/snacks/wishsoup + /datum/recipe/hotchili items = list( /obj/item/weapon/reagent_containers/food/snacks/meat, diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index d54a69ad822..e40ed926379 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ