diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 853d9a90725..4fd74460bb1 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -2654,6 +2654,24 @@ datum ..() return + manhattan_proj + name = "Manhattan Project" + id = "manhattan_proj" + description = "A scienitst drink of choice, for thinking how to blow up the station." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.dizziness +=4 + M.druggy = max(M.druggy, 30) + if(data >= 55 && data <115) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + else if(data >= 115 && prob(33)) + M.confused = max(M:confused+2,0) + ..() + return + whiskeysoda name = "Whiskey Soda" id = "whiskeysoda" @@ -2768,16 +2786,19 @@ datum on_mob_life(var/mob/living/M as mob) if(!data) data = 1 data++ - M.dizziness +=4 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - else if(data >= 115 && prob(33)) - M.confused = max(M:confused+3,3) + 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 + ..() return - iced_beer name = "Iced Beer" id = "iced_beer" @@ -2788,64 +2809,68 @@ datum M.bodytemperature = min(270, M.bodytemperature-40) //310 is the normal bodytemp. 310.055 if(!data) data = 1 data++ - M.dizziness +=5 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 6 - else if(data >= 125 && prob(33)) - M.confused = max(M:confused+4,5) + 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 + ..() return grog name = "Grog" id = "grog" - description = "A fine drink for Space." + description = "Watered down rum, Nanotrasen approves!" reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) if(!data) data = 1 data++ - M.dizziness +=7 - if(data >= 55 && data <115) + M.dizziness +=2 + if(data >= 90 && data <250) if (!M.stuttering) M.stuttering = 1 - M.stuttering += 7 - else if(data >= 115 && prob(33)) - M.confused = max(M:confused+7,7) + M.stuttering += 2 + else if(data >= 250 && prob(33)) + M.confused = max(M:confused+2,0) ..() return nuka_cola name = "Nuka Cola" id = "nuka_cola" - description = "A high quality drink promising to jitter you." + description = "Cola, cola never changes." reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) + M.make_jittery(20) M.druggy = max(M.druggy, 30) - M.confused = max(M:confused+3,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 += 2 + M.dizziness +=5 + M:drowsyness = 0 + M:sleeping = 0 + if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature-5) + M:nutrition += 1 ..() return soy_latte name = "Soy Latte" id = "soy_latte" - description = "A nice and tasty beverage while you are reading." + description = "A nice and tasty beverage while you are reading your hippie books." reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) ..() - M.dizziness = max(0,M.dizziness-20) - M:drowsyness = max(0,M:drowsyness-20) + M.dizziness = max(0,M.dizziness-5) + M:drowsyness = max(0,M:drowsyness-3) M:sleeping = 0 if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature+5) M.make_jittery(5) + if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0) + M:nutrition++ ..() return @@ -2856,12 +2881,14 @@ datum reagent_state = LIQUID on_mob_life(var/mob/living/M as mob) ..() - M.dizziness = max(0,M.dizziness-30) - M:drowsyness = max(0,M:drowsyness-30) + M.dizziness = max(0,M.dizziness-5) + M:drowsyness = max(0,M:drowsyness-3) M:sleeping = 0 if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature+10) - M.make_jittery(10) + M.bodytemperature = min(310, M.bodytemperature+5) + M.make_jittery(5) + if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0) + M:nutrition++ ..() return @@ -2964,23 +2991,28 @@ datum nutriment_factor = 1 * REAGENTS_METABOLISM on_mob_life(var/mob/living/M as mob) M:nutrition += nutriment_factor + if(!data) data = 1 + data++ if(istype(M, /mob/living/carbon/human) && M.job in list("Clown")) if(!M) M = holder.my_atom M:heal_organ_damage(1,1) + M.dizziness +=5 + if(data >= 55 && data <165) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 5 + else if(data >= 165 && prob(33)) + M.confused = max(M:confused+5,0) ..() return if(istype(M, /mob/living/carbon/monkey)) if(!M) M = holder.my_atom M:heal_organ_damage(1,1) - M.stunned = 4 - if(!data) data = 1 - data++ - M.dizziness +=5 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 165 && prob(33)) - M.confused = max(M:confused+5,0) + M.dizziness +=5 + if(data >= 55 && data <165) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 5 + else if(data >= 165 && prob(33)) + M.confused = max(M:confused+5,0) ..() return diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index 88f9baf3746..c0f103f58b2 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -821,6 +821,13 @@ datum required_reagents = list("whiskey" = 2, "vermouth" = 1) result_amount = 3 + manhattan_proj + name = "Manhattan Project" + id = "manhattan_proj" + result = "manhattan_proj" + required_reagents = list("manhattan" = 10, "uranium" = 1) + result_amount = 10 + vodka_tonic name = "Vodka and Tonic" id = "vodkatonic" @@ -853,14 +860,15 @@ datum name = "Red Mead" id = "red_mead" result = "red_mead" - required_reagents = list("blood" = 1, "water" = 1, "wine" = 1) - result_amount = 3 + required_reagents = list("blood" = 1, "mead" = 1) + result_amount = 2 mead name = "Mead" id = "mead" result = "mead" - required_reagents = list("orangejuice" = 1, "wine" = 1) + required_reagents = list("sugar" = 1, "water" = 1) + required_catalysts = list("enzyme" = 5) result_amount = 2 iced_beer @@ -870,6 +878,13 @@ datum required_reagents = list("beer" = 10, "frostoil" = 1) result_amount = 10 + iced_beer2 + name = "Iced Beer" + id = "iced_beer" + result = "iced_beer" + required_reagents = list("beer" = 5, "ice" = 1) + result_amount = 6 + grog name = "Grog" id = "grog" @@ -881,8 +896,8 @@ datum name = "Nuka Cola" id = "nuka_cola" result = "nuka_cola" - required_reagents = list("radium" = 1, "cola" = 1) - result_amount = 2 + required_reagents = list("uranium" = 1, "cola" = 5) + result_amount = 5 soy_latte name = "Soy Latte" @@ -895,36 +910,36 @@ datum name = "Cafe Latte" id = "cafe_latte" result = "cafe_latte" - required_reagents = list("coffee" = 1, "milk" = 1, "cream" = 1) - result_amount = 3 + required_reagents = list("coffee" = 1, "milk" = 1) + result_amount = 2 acidspit name = "Acid Spit" id = "acidspit" result = "acidspit" - required_reagents = list("radium" = 1, "plasma" = 1, "wine" = 1) - result_amount = 3 + required_reagents = list("acid" = 1, "wine" = 5) + result_amount = 6 amasec name = "Amasec" id = "amasec" result = "amasec" - required_reagents = list("iron" = 1, "wine" = 1, "vodka" = 1) - result_amount = 3 + required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5) + result_amount = 10 neurotoxin name = "Neurotoxin" id = "neurotoxin" result = "neurotoxin" - required_reagents = list("gargleblaster" = 1, "fuel" = 1, "acid" = 1) - result_amount = 3 + required_reagents = list("gargleblaster" = 1, "stoxin" = 1) + result_amount = 2 hippiesdelight name = "Hippies Delight" id = "hippiesdelight" result = "hippiesdelight" - required_reagents = list("psilocybin" = 1, "gargleblaster" = 1, "space_drugs" = 1) - result_amount = 3 + required_reagents = list("psilocybin" = 1, "gargleblaster" = 1) + result_amount = 2 bananahonk name = "Banana Honk" @@ -937,5 +952,5 @@ datum name = "Singulo" id = "singulo" result = "singulo" - required_reagents = list("vodka" = 1, "cream" = 1, "milk" = 1, "wine" = 1) - result_amount = 4 + required_reagents = list("vodka" = 5, "radium" = 1, "plasma" = 1, "wine" = 5) + result_amount = 10 diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 37c9bfce6b3..bac5047f8ac 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -2649,6 +2649,10 @@ icon_state = "manhattanglass" name = "Manhattan" desc = "The Detective's undercover drink of choice. He never could stomach gin..." + if("manhattan_proj") + icon_state = "proj_manhattanglass" + name = "Manhattan Project" + desc = "A scienitst drink of choice, for thinking how to blow up the station." if("ginfizz") icon_state = "ginfizzglass" name = "Gin Fizz" diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 476e0f73d5b..f2bd93b6342 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -49,6 +49,10 @@ input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato output = /obj/item/weapon/reagent_containers/food/snacks/fries + carrot + input = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot + output = /obj/item/weapon/reagent_containers/food/snacks/carrotfries + soybeans input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans output = /obj/item/weapon/reagent_containers/food/snacks/soydope diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 89829031417..ba1049766ee 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -857,7 +857,7 @@ icon_state = "spellburger" New() ..() - reagents.add_reagent("nutriment", 4) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger @@ -866,7 +866,7 @@ icon_state = "bigbiteburger" New() ..() - reagents.add_reagent("nutriment", 50) + reagents.add_reagent("nutriment", 14) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/enchiladas @@ -875,10 +875,9 @@ icon_state = "enchiladas" New() ..() - reagents.add_reagent("nutriment",5) - reagents.add_reagent("capsaicin", 5) - reagents.add_reagent("blackpepper", 10) - bitesize = 5 + reagents.add_reagent("nutriment",8) + reagents.add_reagent("capsaicin", 6) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/monkiesdelight name = "Monkie's Delight" @@ -886,7 +885,8 @@ icon_state = "monkiesdelight" New() ..() - reagents.add_reagent("nutriment", 15) + reagents.add_reagent("nutriment", 14) + reagents.add_reagent("banana", 5) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) bitesize = 6 @@ -897,7 +897,7 @@ icon_state = "baguette" New() ..() - reagents.add_reagent("nutriment", 5) + reagents.add_reagent("nutriment", 6) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) bitesize = 3 @@ -908,36 +908,37 @@ icon_state = "fishandchips" New() ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("carpotoxin", 4) + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("carpotoxin", 3) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/sandwich name = "Sandwich" - desc = "This comes from your local Deli...or chef if you are poor." + desc = "A grand creation of meat, cheese, bread and several leafs oflettuce! Arthur Dent would be proud." icon_state = "sandwich" New() ..() - reagents.add_reagent("nutriment", 3) + reagents.add_reagent("nutriment", 8) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich name = "Toasted Sandwich" - desc = "A nice, warm and toasted sandwich." + desc = "Now if you only had a pepper bar." icon_state = "toastedsandwich" New() ..() - reagents.add_reagent("nutriment", 5) + reagents.add_reagent("nutriment", 9) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/tomatosoup name = "Tomato Soup" - desc = "A nice and red soup to fill your day." + desc = "Drinking this feels like being a vampire! A tomato vampire..." icon_state = "tomatosoup" New() ..() reagents.add_reagent("nutriment", 4) - reagents.add_reagent("water", 7) + reagents.add_reagent("tomatojuice", 10) + reagents.add_reagent("water", 10) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles @@ -947,8 +948,8 @@ New() ..() reagents.add_reagent("nutriment", 8) - reagents.add_reagent("psilocybin", 7) - bitesize = 5 + reagents.add_reagent("psilocybin", 8) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/stew name = "Stew" @@ -956,9 +957,11 @@ icon_state = "stew" New() ..() - reagents.add_reagent("nutriment", 6) + reagents.add_reagent("nutriment", 20) + reagents.add_reagent("tomatojuice", 5) + reagents.add_reagent("imidazoline", 5) reagents.add_reagent("water", 10) - bitesize = 3 + bitesize = 10 /obj/item/weapon/reagent_containers/food/snacks/metroidtoast name = "Metroid Toast" @@ -966,8 +969,8 @@ icon_state = "metroidtoast" New() ..() - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("toxin", 10) + reagents.add_reagent("nutriment", 1) + reagents.add_reagent("metroid", 5) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/milosoup @@ -976,7 +979,7 @@ icon_state = "milosoup" New() ..() - reagents.add_reagent("nutriment", 6) + reagents.add_reagent("nutriment", 12) reagents.add_reagent("water", 20) bitesize = 4 @@ -986,47 +989,45 @@ icon_state = "stewedsoymeat" New() ..() - reagents.add_reagent("nutriment", 6) - bitesize = 3 + reagents.add_reagent("nutriment", 8) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti name = "Boiled Spagetti" - desc = "Spagetti boiled in 100 degree celcius water until it is soft." + desc = "A plain dish of noodles, this sucks." icon_state = "spagettiboiled" New() ..() reagents.add_reagent("nutriment", 2) - reagents.add_reagent("water", 5) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/pastatomato - name = "Pasta Tomato" - desc = "Spagetti boiled in 100 degree celcius water until it is soft, with a bit of red tomato on it." + name = "Spagetti" + desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!" icon_state = "pastatomato" New() ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("water", 5) - bitesize = 2 + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("tomatojuice", 10) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti - name = "Meatball Spagetti" + name = "Spagetti & Meatballs" desc = "Now thats a nic'e meatball!" icon_state = "meatballspagetti" New() ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("water", 5) + reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/poppypretzel name = "Poppy Pretzel" - desc = "A pretzel full of POP!" + desc = "A large soft pretzel full of POP!" icon_state = "poppypretzel" New() ..() - reagents.add_reagent("nutriment", 3) - bitesize = 3 + reagents.add_reagent("nutriment", 5) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/carrotfries name = "Carrot Fries" @@ -1034,7 +1035,8 @@ icon_state = "carrotfries" New() ..() - reagents.add_reagent("nutriment", 2) + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("imidazoline", 3) bitesize = 2 /////////////////////////////////////////////////Sliceable//////////////////////////////////////// @@ -1188,7 +1190,8 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 50) + reagents.add_reagent("nutriment", 30) + reagents.add_reagent("sprinkles", 10) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice @@ -1205,7 +1208,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 30) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/breadslice @@ -1296,7 +1299,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 40) + reagents.add_reagent("nutriment", 20) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 630d1f2ffe0..2349bc11bb0 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -576,7 +576,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza /datum/recipe/spacylibertyduff - reagents = list("water" = 10, "vodka" = 5) + reagents = list("water" = 5, "vodka" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap, @@ -585,7 +585,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff /datum/recipe/amanitajelly - reagents = list("water" = 5, "vodka" = 10) + reagents = list("water" = 5, "vodka" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita, @@ -596,17 +596,6 @@ var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked = ..(container) being_cooked.reagents.del_reagent("amatoxin") return being_cooked -/* -/datum/recipe/poppypretzel - 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/egg, - /obj/item/seeds/poppyseed, //poppy seeds are commented out for some reason -- rastaf0 - /obj/item/seeds/poppyseed, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel -*/ /datum/recipe/meatballsoup reagents = list("water" = 10) @@ -706,12 +695,12 @@ 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/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread - - /datum/recipe/monkiesdelight reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( @@ -800,7 +789,6 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, - ) result = /obj/item/weapon/reagent_containers/food/snacks/stew @@ -812,7 +800,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/metroidtoast /datum/recipe/milosoup - reagents = list("water" = 30) + reagents = list("water" = 10) items = list( /obj/item/weapon/reagent_containers/food/snacks/soydope, /obj/item/weapon/reagent_containers/food/snacks/soydope, @@ -832,14 +820,14 @@ /datum/recipe/boiledspagetti - reagents = list("water" = 20) + reagents = list("water" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/spagetti, ) result = /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti /datum/recipe/pastatomato - reagents = list("water" = 20) + reagents = list("water" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, @@ -851,25 +839,15 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/seeds/poppyseed, - /obj/item/seeds/poppyseed, - /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/egg, ) result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel /datum/recipe/meatballspagetti - reagents = list("water" = 20) + reagents = list("water" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/faggot, ) result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti - -/datum/recipe/carrotfries - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, - /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/carrotfries -