diff --git a/code/game/machinery/kitchen/icecream_vat.dm b/code/game/machinery/kitchen/icecream_vat.dm index 76cbac6f581..d88d3a1dc9e 100644 --- a/code/game/machinery/kitchen/icecream_vat.dm +++ b/code/game/machinery/kitchen/icecream_vat.dm @@ -12,7 +12,7 @@ var/list/ingredients_source = list( "berryjuice" = FLAVOUR_STRAWBERRY,\ -"coco" = FLAVOUR_CHOCOLATE,\ +"cocoa" = FLAVOUR_CHOCOLATE,\ "singulo" = FLAVOUR_BLUE,\ "milk" = INGR_MILK,\ "soymilk" = INGR_MILK,\ diff --git a/code/modules/food/recipes_candy.dm b/code/modules/food/recipes_candy.dm index 881ee57a1a1..794fcb649e2 100644 --- a/code/modules/food/recipes_candy.dm +++ b/code/modules/food/recipes_candy.dm @@ -16,12 +16,12 @@ // *********************************************************** /datum/recipe/candy/chocolate_bar - reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2) + reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2) items = list() result = /obj/item/weapon/reagent_containers/food/snacks/chocolatebar /datum/recipe/candy/chocolate_bar2 - reagents = list("milk" = 2, "coco" = 2, "sugar" = 2) + reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2) items = list() result = /obj/item/weapon/reagent_containers/food/snacks/chocolatebar diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index b39ca263d02..b530237eb14 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -101,7 +101,7 @@ descriptors |= "nutritious" if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin")) descriptors |= "spicy" - if(reagents.has_reagent("coco")) + if(reagents.has_reagent("cocoa")) descriptors |= "bitter" if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice")) descriptors |= "sweet-sour" diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 28cd89843ac..84a2f7a7fbf 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -1209,9 +1209,9 @@ /datum/seed/cocoa name = "cocoa" - seed_name = "cacao" - display_name = "cacao tree" - chems = list("plantmatter" = list(1,10), "coco" = list(4,5)) + seed_name = "cocoa" + display_name = "cocoa tree" + chems = list("plantmatter" = list(1,10), "cocoa" = list(4,5)) preset_icon = "cocoapod" /datum/seed/cocoa/New() diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm index 713672abb23..b0c0704cbb9 100644 --- a/code/modules/reagents/newchem/food.dm +++ b/code/modules/reagents/newchem/food.dm @@ -131,10 +131,12 @@ datum/reagent/honey/reaction_turf(var/turf/T, var/volume) id = "chocolate" description = "Chocolate is a delightful product derived from the seeds of the theobroma cacao tree." reagent_state = LIQUID + nutriment_factor = 5 * REAGENTS_METABOLISM //same as pure cocoa powder, because it makes no sense that chocolate won't fill you up and make you fat color = "#2E2418" /datum/reagent/chocolate/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom + M.nutrition += nutriment_factor M.reagents.add_reagent("sugar", 0.8) ..() return @@ -142,7 +144,7 @@ datum/reagent/honey/reaction_turf(var/turf/T, var/volume) /datum/reagent/chocolate/reaction_turf(var/turf/T, var/volume) src = null if(volume >= 5) - new /obj/item/weapon/reagent_containers/food/snacks/cocoa_pile(T) + new /obj/item/weapon/reagent_containers/food/snacks/choc_pile(T) return /datum/reagent/mugwort diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm index d56cdcf5644..683bd84337f 100644 --- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm +++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm @@ -1,590 +1,588 @@ -/datum/chemical_reaction/ - hot_coco - name = "Hot Coco" - id = "hot_coco" - result = "hot_coco" - required_reagents = list("water" = 5, "coco" = 1) - result_amount = 5 +/datum/chemical_reaction/hot_coco + name = "Hot Coco" + id = "hot_coco" + result = "hot_coco" + required_reagents = list("water" = 5, "cocoa" = 1) + result_amount = 5 - chocolate_milk - name = "Chocolate Milk" - id = "chocolate_milk" - result = "chocolate_milk" - required_reagents = list("chocolate" = 1, "milk" = 1) - result_amount = 2 - mix_message = "The mixture turns a nice brown color." +/datum/chemical_reaction/chocolate_milk + name = "Chocolate Milk" + id = "chocolate_milk" + result = "chocolate_milk" + required_reagents = list("chocolate" = 1, "milk" = 1) + result_amount = 2 + mix_message = "The mixture turns a nice brown color." - coffee - name = "Coffee" - id = "coffee" - result = "coffee" - required_reagents = list("coffeepowder" = 1, "water" = 5) - result_amount = 5 +/datum/chemical_reaction/coffee + name = "Coffee" + id = "coffee" + result = "coffee" + required_reagents = list("coffeepowder" = 1, "water" = 5) + result_amount = 5 - tea - name = "Tea" - id = "tea" - result = "tea" - required_reagents = list("teapowder" = 1, "water" = 5) - result_amount = 5 +/datum/chemical_reaction/tea + name = "Tea" + id = "tea" + result = "tea" + required_reagents = list("teapowder" = 1, "water" = 5) + result_amount = 5 +/datum/chemical_reaction/goldschlager + name = "Goldschlager" + id = "goldschlager" + result = "goldschlager" + required_reagents = list("vodka" = 10, "gold" = 1) + result_amount = 10 +/datum/chemical_reaction/patron + name = "Patron" + id = "patron" + result = "patron" + required_reagents = list("tequilla" = 10, "silver" = 1) + result_amount = 10 +/datum/chemical_reaction/bilk + name = "Bilk" + id = "bilk" + result = "bilk" + required_reagents = list("milk" = 1, "beer" = 1) + result_amount = 2 - goldschlager - name = "Goldschlager" - id = "goldschlager" - result = "goldschlager" - required_reagents = list("vodka" = 10, "gold" = 1) - result_amount = 10 +/datum/chemical_reaction/icetea + name = "Iced Tea" + id = "icetea" + result = "icetea" + required_reagents = list("ice" = 1, "tea" = 3) + result_amount = 4 - patron - name = "Patron" - id = "patron" - result = "patron" - required_reagents = list("tequilla" = 10, "silver" = 1) - result_amount = 10 +/datum/chemical_reaction/icecoffee + name = "Iced Coffee" + id = "icecoffee" + result = "icecoffee" + required_reagents = list("ice" = 1, "coffee" = 3) + result_amount = 4 - bilk - name = "Bilk" - id = "bilk" - result = "bilk" - required_reagents = list("milk" = 1, "beer" = 1) - result_amount = 2 +/datum/chemical_reaction/nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + result = "nuka_cola" + required_reagents = list("uranium" = 1, "cola" = 6) + result_amount = 6 - icetea - name = "Iced Tea" - id = "icetea" - result = "icetea" - required_reagents = list("ice" = 1, "tea" = 3) - result_amount = 4 +/datum/chemical_reaction/moonshine + name = "Moonshine" + id = "moonshine" + result = "moonshine" + required_reagents = list("nutriment" = 10) + required_catalysts = list("enzyme" = 5) + result_amount = 10 - icecoffee - name = "Iced Coffee" - id = "icecoffee" - result = "icecoffee" - required_reagents = list("ice" = 1, "coffee" = 3) - result_amount = 4 +/datum/chemical_reaction/wine + name = "Wine" + id = "wine" + result = "wine" + required_reagents = list("berryjuice" = 10) + required_catalysts = list("enzyme" = 5) + result_amount = 10 - nuka_cola - name = "Nuka Cola" - id = "nuka_cola" - result = "nuka_cola" - required_reagents = list("uranium" = 1, "cola" = 6) - result_amount = 6 +/datum/chemical_reaction/spacebeer + name = "Space Beer" + id = "spacebeer" + result = "beer" + required_reagents = list("cornoil" = 10) + required_catalysts = list("enzyme" = 5) + result_amount = 10 - moonshine - name = "Moonshine" - id = "moonshine" - result = "moonshine" - required_reagents = list("nutriment" = 10) - required_catalysts = list("enzyme" = 5) - result_amount = 10 +/datum/chemical_reaction/vodka + name = "Vodka" + id = "vodka" + result = "vodka" + required_reagents = list("potato" = 10) + required_catalysts = list("enzyme" = 5) + result_amount = 10 - wine - name = "Wine" - id = "wine" - result = "wine" - required_reagents = list("berryjuice" = 10) - required_catalysts = list("enzyme" = 5) - result_amount = 10 +/datum/chemical_reaction/sake + name = "Sake" + id = "sake" + result = "sake" + required_reagents = list("rice" = 10,"water" = 5) + required_catalysts = list("enzyme" = 5) + result_amount = 15 - spacebeer - name = "Space Beer" - id = "spacebeer" - result = "beer" - required_reagents = list("cornoil" = 10) - required_catalysts = list("enzyme" = 5) - result_amount = 10 +/datum/chemical_reaction/kahlua + name = "Kahlua" + id = "kahlua" + result = "kahlua" + required_reagents = list("coffee" = 5, "sugar" = 5, "rum" = 5) + required_catalysts = list("enzyme" = 5) + result_amount = 5 - vodka - name = "Vodka" - id = "vodka" - result = "vodka" - required_reagents = list("potato" = 10) - required_catalysts = list("enzyme" = 5) - result_amount = 10 - sake - name = "Sake" - id = "sake" - result = "sake" - required_reagents = list("rice" = 10,"water" = 5) - required_catalysts = list("enzyme" = 5) - result_amount = 15 +/datum/chemical_reaction/kahluaVodka + name = "KahluaVodka" + id = "kahlauVodka" + result = "kahlua" + required_reagents = list("coffee" = 5, "sugar" = 5, "vodka" = 5) + required_catalysts = list("enzyme" = 5) + result_amount = 5 - kahlua - name = "Kahlua" - id = "kahlua" - result = "kahlua" - required_reagents = list("coffee" = 5, "sugar" = 5, "rum" = 5) - required_catalysts = list("enzyme" = 5) - result_amount = 5 +/datum/chemical_reaction/gin_tonic + name = "Gin and Tonic" + id = "gintonic" + result = "gintonic" + required_reagents = list("gin" = 2, "tonic" = 1) + result_amount = 3 + mix_message = "The tonic water and gin mix together perfectly." - kahluaVodka - name = "KahluaVodka" - id = "kahlauVodka" - result = "kahlua" - required_reagents = list("coffee" = 5, "sugar" = 5, "vodka" = 5) - required_catalysts = list("enzyme" = 5) - result_amount = 5 - gin_tonic - name = "Gin and Tonic" - id = "gintonic" - result = "gintonic" - required_reagents = list("gin" = 2, "tonic" = 1) - result_amount = 3 - mix_message = "The tonic water and gin mix together perfectly." +/datum/chemical_reaction/cuba_libre + name = "Cuba Libre" + id = "cubalibre" + result = "cubalibre" + required_reagents = list("rum" = 2, "cola" = 1) + result_amount = 3 - cuba_libre - name = "Cuba Libre" - id = "cubalibre" - result = "cubalibre" - required_reagents = list("rum" = 2, "cola" = 1) - result_amount = 3 +/datum/chemical_reaction/mojito + name = "Mojito" + id = "mojito" + result = "mojito" + required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1) + result_amount = 4 - mojito - name = "Mojito" - id = "mojito" - result = "mojito" - required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1) - result_amount = 4 +/datum/chemical_reaction/martini + name = "Classic Martini" + id = "martini" + result = "martini" + required_reagents = list("gin" = 2, "vermouth" = 1) + result_amount = 3 - martini - name = "Classic Martini" - id = "martini" - result = "martini" - required_reagents = list("gin" = 2, "vermouth" = 1) - result_amount = 3 +/datum/chemical_reaction/vodkamartini + name = "Vodka Martini" + id = "vodkamartini" + result = "vodkamartini" + required_reagents = list("vodka" = 2, "vermouth" = 1) + result_amount = 3 - vodkamartini - name = "Vodka Martini" - id = "vodkamartini" - result = "vodkamartini" - required_reagents = list("vodka" = 2, "vermouth" = 1) - result_amount = 3 +/datum/chemical_reaction/white_russian + name = "White Russian" + id = "whiterussian" + result = "whiterussian" + required_reagents = list("blackrussian" = 3, "cream" = 2) + result_amount = 5 - white_russian - name = "White Russian" - id = "whiterussian" - result = "whiterussian" - required_reagents = list("blackrussian" = 3, "cream" = 2) - result_amount = 5 +/datum/chemical_reaction/whiskey_cola + name = "Whiskey Cola" + id = "whiskeycola" + result = "whiskeycola" + required_reagents = list("whiskey" = 2, "cola" = 1) + result_amount = 3 - whiskey_cola - name = "Whiskey Cola" - id = "whiskeycola" - result = "whiskeycola" - required_reagents = list("whiskey" = 2, "cola" = 1) - result_amount = 3 +/datum/chemical_reaction/screwdriver + name = "Screwdriver" + id = "screwdrivercocktail" + result = "screwdrivercocktail" + required_reagents = list("vodka" = 2, "orangejuice" = 1) + result_amount = 3 - screwdriver - name = "Screwdriver" - id = "screwdrivercocktail" - result = "screwdrivercocktail" - required_reagents = list("vodka" = 2, "orangejuice" = 1) - result_amount = 3 +/datum/chemical_reaction/bloody_mary + name = "Bloody Mary" + id = "bloodymary" + result = "bloodymary" + required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1) + result_amount = 4 - bloody_mary - name = "Bloody Mary" - id = "bloodymary" - result = "bloodymary" - required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1) - result_amount = 4 +/datum/chemical_reaction/gargle_blaster + name = "Pan-Galactic Gargle Blaster" + id = "gargleblaster" + result = "gargleblaster" + required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1) + result_amount = 5 - gargle_blaster - name = "Pan-Galactic Gargle Blaster" - id = "gargleblaster" - result = "gargleblaster" - required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1) - result_amount = 5 +/datum/chemical_reaction/brave_bull + name = "Brave Bull" + id = "bravebull" + result = "bravebull" + required_reagents = list("tequilla" = 2, "kahlua" = 1) + result_amount = 3 - brave_bull - name = "Brave Bull" - id = "bravebull" - result = "bravebull" - required_reagents = list("tequilla" = 2, "kahlua" = 1) - result_amount = 3 +/datum/chemical_reaction/tequilla_sunrise + name = "Tequilla Sunrise" + id = "tequillasunrise" + result = "tequillasunrise" + required_reagents = list("tequilla" = 2, "orangejuice" = 1) + result_amount = 3 - tequilla_sunrise - name = "Tequilla Sunrise" - id = "tequillasunrise" - result = "tequillasunrise" - required_reagents = list("tequilla" = 2, "orangejuice" = 1) - result_amount = 3 +/datum/chemical_reaction/toxins_special + name = "Toxins Special" + id = "toxinsspecial" + result = "toxinsspecial" + required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2) + result_amount = 5 - toxins_special - name = "Toxins Special" - id = "toxinsspecial" - result = "toxinsspecial" - required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2) - result_amount = 5 +/datum/chemical_reaction/beepsky_smash + name = "Beepksy Smash" + id = "beepksysmash" + result = "beepskysmash" + required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1) + result_amount = 4 - beepsky_smash - name = "Beepksy Smash" - id = "beepksysmash" - result = "beepskysmash" - required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1) - result_amount = 4 +/datum/chemical_reaction/doctor_delight + name = "The Doctor's Delight" + id = "doctordelight" + result = "doctorsdelight" + required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1) + result_amount = 5 - doctor_delight - name = "The Doctor's Delight" - id = "doctordelight" - result = "doctorsdelight" - required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1) - result_amount = 5 +/datum/chemical_reaction/irish_cream + name = "Irish Cream" + id = "irishcream" + result = "irishcream" + required_reagents = list("whiskey" = 2, "cream" = 1) + result_amount = 3 - irish_cream - name = "Irish Cream" - id = "irishcream" - result = "irishcream" - required_reagents = list("whiskey" = 2, "cream" = 1) - result_amount = 3 +/datum/chemical_reaction/manly_dorf + name = "The Manly Dorf" + id = "manlydorf" + result = "manlydorf" + required_reagents = list ("beer" = 1, "ale" = 2) + result_amount = 3 - manly_dorf - name = "The Manly Dorf" - id = "manlydorf" - result = "manlydorf" - required_reagents = list ("beer" = 1, "ale" = 2) - result_amount = 3 +/datum/chemical_reaction/suicider + name = "Suicider" + id = "suicider" + result = "suicider" + required_reagents = list ("vodka" = 1, "cider" = 1, "fuel" = 1, "epinephrine" = 1) + result_amount = 4 + mix_message = "The drinks and chemicals mix together, emitting a potent smell." - suicider - name = "Suicider" - id = "suicider" - result = "suicider" - required_reagents = list ("vodka" = 1, "cider" = 1, "fuel" = 1, "epinephrine" = 1) - result_amount = 4 - mix_message = "The drinks and chemicals mix together, emitting a potent smell." +/datum/chemical_reaction/irish_coffee + name = "Irish Coffee" + id = "irishcoffee" + result = "irishcoffee" + required_reagents = list("irishcream" = 1, "coffee" = 1) + result_amount = 2 - irish_coffee - name = "Irish Coffee" - id = "irishcoffee" - result = "irishcoffee" - required_reagents = list("irishcream" = 1, "coffee" = 1) - result_amount = 2 +/datum/chemical_reaction/b52 + name = "B-52" + id = "b52" + result = "b52" + required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1) + result_amount = 3 - b52 - name = "B-52" - id = "b52" - result = "b52" - required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1) - result_amount = 3 +/datum/chemical_reaction/atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + result = "atomicbomb" + required_reagents = list("b52" = 10, "uranium" = 1) + result_amount = 10 - atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" - result = "atomicbomb" - required_reagents = list("b52" = 10, "uranium" = 1) - result_amount = 10 +/datum/chemical_reaction/margarita + name = "Margarita" + id = "margarita" + result = "margarita" + required_reagents = list("tequilla" = 2, "limejuice" = 1) + result_amount = 3 - margarita - name = "Margarita" - id = "margarita" - result = "margarita" - required_reagents = list("tequilla" = 2, "limejuice" = 1) - result_amount = 3 +/datum/chemical_reaction/longislandicedtea + name = "Long Island Iced Tea" + id = "longislandicedtea" + result = "longislandicedtea" + required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1) + result_amount = 4 - longislandicedtea - name = "Long Island Iced Tea" - id = "longislandicedtea" - result = "longislandicedtea" - required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1) - result_amount = 4 +/datum/chemical_reaction/threemileisland + name = "Three Mile Island Iced Tea" + id = "threemileisland" + result = "threemileisland" + required_reagents = list("longislandicedtea" = 10, "uranium" = 1) + result_amount = 10 - threemileisland - name = "Three Mile Island Iced Tea" - id = "threemileisland" - result = "threemileisland" - required_reagents = list("longislandicedtea" = 10, "uranium" = 1) - result_amount = 10 +/datum/chemical_reaction/whiskeysoda + name = "Whiskey Soda" + id = "whiskeysoda" + result = "whiskeysoda" + required_reagents = list("whiskey" = 2, "sodawater" = 1) + result_amount = 3 - whiskeysoda - name = "Whiskey Soda" - id = "whiskeysoda" - result = "whiskeysoda" - required_reagents = list("whiskey" = 2, "sodawater" = 1) - result_amount = 3 +/datum/chemical_reaction/black_russian + name = "Black Russian" + id = "blackrussian" + result = "blackrussian" + required_reagents = list("vodka" = 3, "kahlua" = 2) + result_amount = 5 - black_russian - name = "Black Russian" - id = "blackrussian" - result = "blackrussian" - required_reagents = list("vodka" = 3, "kahlua" = 2) - result_amount = 5 +/datum/chemical_reaction/manhattan + name = "Manhattan" + id = "manhattan" + result = "manhattan" + required_reagents = list("whiskey" = 2, "vermouth" = 1) + result_amount = 3 - manhattan - name = "Manhattan" - id = "manhattan" - result = "manhattan" - required_reagents = list("whiskey" = 2, "vermouth" = 1) - result_amount = 3 +/datum/chemical_reaction/manhattan_proj + name = "Manhattan Project" + id = "manhattan_proj" + result = "manhattan_proj" + required_reagents = list("manhattan" = 10, "uranium" = 1) + result_amount = 10 - manhattan_proj - name = "Manhattan Project" - id = "manhattan_proj" - result = "manhattan_proj" - required_reagents = list("manhattan" = 10, "uranium" = 1) - result_amount = 10 +/datum/chemical_reaction/vodka_tonic + name = "Vodka and Tonic" + id = "vodkatonic" + result = "vodkatonic" + required_reagents = list("vodka" = 2, "tonic" = 1) + result_amount = 3 - vodka_tonic - name = "Vodka and Tonic" - id = "vodkatonic" - result = "vodkatonic" - required_reagents = list("vodka" = 2, "tonic" = 1) - result_amount = 3 +/datum/chemical_reaction/gin_fizz + name = "Gin Fizz" + id = "ginfizz" + result = "ginfizz" + required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1) + result_amount = 4 - gin_fizz - name = "Gin Fizz" - id = "ginfizz" - result = "ginfizz" - required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1) - result_amount = 4 +/datum/chemical_reaction/bahama_mama + name = "Bahama mama" + id = "bahama_mama" + result = "bahama_mama" + required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1) + result_amount = 6 - bahama_mama - name = "Bahama mama" - id = "bahama_mama" - result = "bahama_mama" - required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1) - result_amount = 6 +/datum/chemical_reaction/singulo + name = "Singulo" + id = "singulo" + result = "singulo" + required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5) + result_amount = 10 - singulo - name = "Singulo" - id = "singulo" - result = "singulo" - required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5) - result_amount = 10 +/datum/chemical_reaction/alliescocktail + name = "Allies Cocktail" + id = "alliescocktail" + result = "alliescocktail" + required_reagents = list("martini" = 1, "vodka" = 1) + result_amount = 2 - alliescocktail - name = "Allies Cocktail" - id = "alliescocktail" - result = "alliescocktail" - required_reagents = list("martini" = 1, "vodka" = 1) - result_amount = 2 +/datum/chemical_reaction/demonsblood + name = "Demons Blood" + id = "demonsblood" + result = "demonsblood" + required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1) + result_amount = 4 - demonsblood - name = "Demons Blood" - id = "demonsblood" - result = "demonsblood" - required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1) - result_amount = 4 +/datum/chemical_reaction/booger + name = "Booger" + id = "booger" + result = "booger" + required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1) + result_amount = 4 - booger - name = "Booger" - id = "booger" - result = "booger" - required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1) - result_amount = 4 +/datum/chemical_reaction/antifreeze + name = "Anti-freeze" + id = "antifreeze" + result = "antifreeze" + required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1) + result_amount = 4 - antifreeze - name = "Anti-freeze" - id = "antifreeze" - result = "antifreeze" - required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1) - result_amount = 4 - - barefoot - name = "Barefoot" - id = "barefoot" - result = "barefoot" - required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1) - result_amount = 3 +/datum/chemical_reaction/barefoot + name = "Barefoot" + id = "barefoot" + result = "barefoot" + required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1) + result_amount = 3 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri///// - sbiten - name = "Sbiten" - id = "sbiten" - result = "sbiten" - required_reagents = list("vodka" = 10, "capsaicin" = 1) - result_amount = 10 +/datum/chemical_reaction/sbiten + name = "Sbiten" + id = "sbiten" + result = "sbiten" + required_reagents = list("vodka" = 10, "capsaicin" = 1) + result_amount = 10 - red_mead - name = "Red Mead" - id = "red_mead" - result = "red_mead" - required_reagents = list("blood" = 1, "mead" = 1) - result_amount = 2 +/datum/chemical_reaction/red_mead + name = "Red Mead" + id = "red_mead" + result = "red_mead" + required_reagents = list("blood" = 1, "mead" = 1) + result_amount = 2 - mead - name = "Mead" - id = "mead" - result = "mead" - required_reagents = list("sugar" = 1, "water" = 1) - required_catalysts = list("enzyme" = 5) - result_amount = 2 +/datum/chemical_reaction/mead + name = "Mead" + id = "mead" + result = "mead" + required_reagents = list("sugar" = 1, "water" = 1) + required_catalysts = list("enzyme" = 5) + result_amount = 2 - iced_beer - name = "Iced Beer" - id = "iced_beer" - result = "iced_beer" - required_reagents = list("beer" = 10, "frostoil" = 1) - result_amount = 10 +/datum/chemical_reaction/iced_beer + name = "Iced Beer" + id = "iced_beer" + result = "iced_beer" + 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 +/datum/chemical_reaction/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" - result = "grog" - required_reagents = list("rum" = 1, "water" = 1) - result_amount = 2 +/datum/chemical_reaction/grog + name = "Grog" + id = "grog" + result = "grog" + required_reagents = list("rum" = 1, "water" = 1) + result_amount = 2 - soy_latte - name = "Soy Latte" - id = "soy_latte" - result = "soy_latte" - required_reagents = list("coffee" = 1, "soymilk" = 1) - result_amount = 2 +/datum/chemical_reaction/soy_latte + name = "Soy Latte" + id = "soy_latte" + result = "soy_latte" + required_reagents = list("coffee" = 1, "soymilk" = 1) + result_amount = 2 - cafe_latte - name = "Cafe Latte" - id = "cafe_latte" - result = "cafe_latte" - required_reagents = list("coffee" = 1, "milk" = 1) - result_amount = 2 +/datum/chemical_reaction/cafe_latte + name = "Cafe Latte" + id = "cafe_latte" + result = "cafe_latte" + required_reagents = list("coffee" = 1, "milk" = 1) + result_amount = 2 - acidspit - name = "Acid Spit" - id = "acidspit" - result = "acidspit" - required_reagents = list("sacid" = 1, "wine" = 5) - result_amount = 6 +/datum/chemical_reaction/acidspit + name = "Acid Spit" + id = "acidspit" + result = "acidspit" + required_reagents = list("sacid" = 1, "wine" = 5) + result_amount = 6 - amasec - name = "Amasec" - id = "amasec" - result = "amasec" - required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5) - result_amount = 10 +/datum/chemical_reaction/amasec + name = "Amasec" + id = "amasec" + result = "amasec" + required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5) + result_amount = 10 - changelingsting - name = "Changeling Sting" - id = "changelingsting" - result = "changelingsting" - required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1) - result_amount = 5 +/datum/chemical_reaction/changelingsting + name = "Changeling Sting" + id = "changelingsting" + result = "changelingsting" + required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1) + result_amount = 5 - aloe - name = "Aloe" - id = "aloe" - result = "aloe" - required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1) - result_amount = 2 +/datum/chemical_reaction/aloe + name = "Aloe" + id = "aloe" + result = "aloe" + required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1) + result_amount = 2 - andalusia - name = "Andalusia" - id = "andalusia" - result = "andalusia" - required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1) - result_amount = 3 +/datum/chemical_reaction/andalusia + name = "Andalusia" + id = "andalusia" + result = "andalusia" + required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1) + result_amount = 3 - neurotoxin - name = "Neurotoxin" - id = "neurotoxin" - result = "neurotoxin" - required_reagents = list("gargleblaster" = 1, "ether" = 1) - result_amount = 2 +/datum/chemical_reaction/neurotoxin + name = "Neurotoxin" + id = "neurotoxin" + result = "neurotoxin" + required_reagents = list("gargleblaster" = 1, "ether" = 1) + result_amount = 2 - snowwhite - name = "Snow White" - id = "snowwhite" - result = "snowwhite" - required_reagents = list("beer" = 1, "lemon_lime" = 1) - result_amount = 2 +/datum/chemical_reaction/snowwhite + name = "Snow White" + id = "snowwhite" + result = "snowwhite" + required_reagents = list("beer" = 1, "lemon_lime" = 1) + result_amount = 2 - irishcarbomb - name = "Irish Car Bomb" - id = "irishcarbomb" - result = "irishcarbomb" - required_reagents = list("ale" = 1, "irishcream" = 1) - result_amount = 2 +/datum/chemical_reaction/irishcarbomb + name = "Irish Car Bomb" + id = "irishcarbomb" + result = "irishcarbomb" + required_reagents = list("ale" = 1, "irishcream" = 1) + result_amount = 2 - syndicatebomb - name = "Syndicate Bomb" - id = "syndicatebomb" - result = "syndicatebomb" - required_reagents = list("beer" = 1, "whiskeycola" = 1) - result_amount = 2 +/datum/chemical_reaction/syndicatebomb + name = "Syndicate Bomb" + id = "syndicatebomb" + result = "syndicatebomb" + required_reagents = list("beer" = 1, "whiskeycola" = 1) + result_amount = 2 - erikasurprise - name = "Erika Surprise" - id = "erikasurprise" - result = "erikasurprise" - required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1) - result_amount = 5 +/datum/chemical_reaction/erikasurprise + name = "Erika Surprise" + id = "erikasurprise" + result = "erikasurprise" + required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1) + result_amount = 5 - devilskiss - name = "Devils Kiss" - id = "devilskiss" - result = "devilskiss" - required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1) - result_amount = 3 +/datum/chemical_reaction/devilskiss + name = "Devils Kiss" + id = "devilskiss" + result = "devilskiss" + required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1) + result_amount = 3 - hippiesdelight - name = "Hippies Delight" - id = "hippiesdelight" - result = "hippiesdelight" - required_reagents = list("psilocybin" = 1, "gargleblaster" = 1) - result_amount = 2 +/datum/chemical_reaction/hippiesdelight + name = "Hippies Delight" + id = "hippiesdelight" + result = "hippiesdelight" + required_reagents = list("psilocybin" = 1, "gargleblaster" = 1) + result_amount = 2 - bananahonk - name = "Banana Honk" - id = "bananahonk" - result = "bananahonk" - required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1) - result_amount = 3 +/datum/chemical_reaction/bananahonk + name = "Banana Honk" + id = "bananahonk" + result = "bananahonk" + required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1) + result_amount = 3 - silencer - name = "Silencer" - id = "silencer" - result = "silencer" - required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1) - result_amount = 3 +/datum/chemical_reaction/silencer + name = "Silencer" + id = "silencer" + result = "silencer" + required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1) + result_amount = 3 - driestmartini - name = "Driest Martini" - id = "driestmartini" - result = "driestmartini" - required_reagents = list("nothing" = 1, "gin" = 1) - result_amount = 2 +/datum/chemical_reaction/driestmartini + name = "Driest Martini" + id = "driestmartini" + result = "driestmartini" + required_reagents = list("nothing" = 1, "gin" = 1) + result_amount = 2 - lemonade - name = "Lemonade" - id = "lemonade" - result = "lemonade" - required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1) - result_amount = 3 +/datum/chemical_reaction/lemonade + name = "Lemonade" + id = "lemonade" + result = "lemonade" + required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1) + result_amount = 3 - kiraspecial - name = "Kira Special" - id = "kiraspecial" - result = "kiraspecial" - required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1) - result_amount = 2 +/datum/chemical_reaction/kiraspecial + name = "Kira Special" + id = "kiraspecial" + result = "kiraspecial" + required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1) + result_amount = 2 - brownstar - name = "Brown Star" - id = "brownstar" - result = "brownstar" - required_reagents = list("orangejuice" = 2, "cola" = 1) - result_amount = 2 +/datum/chemical_reaction/brownstar + name = "Brown Star" + id = "brownstar" + result = "brownstar" + required_reagents = list("orangejuice" = 2, "cola" = 1) + result_amount = 2 - milkshake - name = "Milkshake" - id = "milkshake" - result = "milkshake" - required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2) - result_amount = 5 +/datum/chemical_reaction/milkshake + name = "Milkshake" + id = "milkshake" + result = "milkshake" + required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2) + result_amount = 5 - rewriter - name = "Rewriter" - id = "rewriter" - result = "rewriter" - required_reagents = list("spacemountainwind" = 1, "coffee" = 1) - result_amount = 2 \ No newline at end of file +/datum/chemical_reaction/rewriter + name = "Rewriter" + id = "rewriter" + result = "rewriter" + required_reagents = list("spacemountainwind" = 1, "coffee" = 1) + result_amount = 2 \ No newline at end of file diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm index 698f27350bb..65b19133fa3 100644 --- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm +++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm @@ -1,121 +1,125 @@ -/datum/chemical_reaction/ - tofu - name = "Tofu" - id = "tofu" - result = null - required_reagents = list("soymilk" = 10) - required_catalysts = list("enzyme" = 5) - result_amount = 1 - on_reaction(var/datum/reagents/holder, var/created_volume) - var/location = get_turf(holder.my_atom) - for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/tofu(location) - return +/datum/chemical_reaction/tofu + name = "Tofu" + id = "tofu" + result = null + required_reagents = list("soymilk" = 10) + required_catalysts = list("enzyme" = 5) + result_amount = 1 - chocolate_bar - name = "Chocolate Bar" - id = "chocolate_bar" - result = null - required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2) - result_amount = 1 - on_reaction(var/datum/reagents/holder, var/created_volume) - var/location = get_turf(holder.my_atom) - for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) - return +/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/weapon/reagent_containers/food/snacks/tofu(location) + return - chocolate_bar2 - name = "Chocolate Bar" - id = "chocolate_bar" - result = null - required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2) - result_amount = 1 - on_reaction(var/datum/reagents/holder, var/created_volume) - var/location = get_turf(holder.my_atom) - for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) - return +/datum/chemical_reaction/chocolate_bar + name = "Chocolate Bar" + id = "chocolate_bar" + result = null + required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2) + result_amount = 1 +/datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) + return - soysauce - name = "Soy Sauce" - id = "soysauce" - result = "soysauce" - required_reagents = list("soymilk" = 1,"sodiumchloride" = 1, "water" = 8) - result_amount = 10 +/datum/chemical_reaction/chocolate_bar2 + name = "Chocolate Bar" + id = "chocolate_bar" + result = null + required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2) + result_amount = 1 - cheesewheel - name = "Cheesewheel" - id = "cheesewheel" - result = null - required_reagents = list("milk" = 40) - required_catalysts = list("enzyme" = 5) - 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/sliceable/cheesewheel(location) - return +/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) + return - syntiflesh - name = "Syntiflesh" - id = "syntiflesh" - result = null - required_reagents = list("blood" = 5, "cryoxadone" = 1) - 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) - return +/datum/chemical_reaction/soysauce + name = "Soy Sauce" + id = "soysauce" + result = "soysauce" + required_reagents = list("soymilk" = 1,"sodiumchloride" = 1, "water" = 8) + result_amount = 10 - hot_ramen - name = "Hot Ramen" - id = "hot_ramen" - result = "hot_ramen" - required_reagents = list("water" = 1, "dry_ramen" = 3) - result_amount = 3 +/datum/chemical_reaction/cheesewheel + name = "Cheesewheel" + id = "cheesewheel" + result = null + required_reagents = list("milk" = 40) + required_catalysts = list("enzyme" = 5) + result_amount = 1 - hell_ramen - name = "Hell Ramen" - id = "hell_ramen" - result = "hell_ramen" - required_reagents = list("capsaicin" = 1, "hot_ramen" = 6) - result_amount = 6 +/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume) + var/location = get_turf(holder.my_atom) + new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location) + return - doughball - name = "Ball of dough" - id = "dough_ball" - result = "dough_ball" - required_reagents = list("flour" = 15, "water" = 5) - required_catalysts = list("enzyme" = 5) +/datum/chemical_reaction/syntiflesh + name = "Syntiflesh" + id = "syntiflesh" + result = null + required_reagents = list("blood" = 5, "cryoxadone" = 1) + result_amount = 1 - sodiumchloride - name = "Sodium Chloride" - id = "sodiumchloride" - result = "sodiumchloride" - required_reagents = list("sodium" = 1, "chlorine" = 1, "water" = 1) - result_amount = 3 - mix_message = "The solution crystallizes with a brief flare of light." +/datum/chemical_reaction/syntiflesh/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) + return - ice - name = "Ice" - id = "ice" - result = "ice" - required_reagents = list("water" = 1) - result_amount = 1 - max_temp = 273 - mix_message = "Ice forms as the water freezes." - mix_sound = null +/datum/chemical_reaction/hot_ramen + name = "Hot Ramen" + id = "hot_ramen" + result = "hot_ramen" + required_reagents = list("water" = 1, "dry_ramen" = 3) + result_amount = 3 - dough - name = "Dough" - id = "dough" - result = null - required_reagents = list("water" = 10, "flour" = 15) - result_amount = 1 - mix_message = "The ingredients form a dough." +/datum/chemical_reaction/hell_ramen + name = "Hell Ramen" + id = "hell_ramen" + result = "hell_ramen" + required_reagents = list("capsaicin" = 1, "hot_ramen" = 6) + result_amount = 6 - on_reaction(datum/reagents/holder, created_volume) - var/location = get_turf(holder.my_atom) - for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/dough(location) \ No newline at end of file +/datum/chemical_reaction/doughball + name = "Ball of dough" + id = "dough_ball" + result = "dough_ball" + required_reagents = list("flour" = 15, "water" = 5) + required_catalysts = list("enzyme" = 5) + +/datum/chemical_reaction/sodiumchloride + name = "Sodium Chloride" + id = "sodiumchloride" + result = "sodiumchloride" + required_reagents = list("sodium" = 1, "chlorine" = 1, "water" = 1) + result_amount = 3 + mix_message = "The solution crystallizes with a brief flare of light." + +/datum/chemical_reaction/ice + name = "Ice" + id = "ice" + result = "ice" + required_reagents = list("water" = 1) + result_amount = 1 + max_temp = 273 + mix_message = "Ice forms as the water freezes." + mix_sound = null + +/datum/chemical_reaction/dough + name = "Dough" + id = "dough" + result = null + required_reagents = list("water" = 10, "flour" = 15) + result_amount = 1 + mix_message = "The ingredients form a dough." + +/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/weapon/reagent_containers/food/snacks/dough(location) + return diff --git a/code/modules/reagents/oldchem/reagents/reagents_food.dm b/code/modules/reagents/oldchem/reagents/reagents_food.dm index 70b8929832d..de7297a5f39 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_food.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_food.dm @@ -185,15 +185,15 @@ reagent_state = SOLID // no color (ie, black) -/datum/reagent/coco - name = "Coco Powder" - id = "coco" - description = "A fatty, bitter paste made from coco beans." +/datum/reagent/cocoa + name = "Cocoa Powder" + id = "cocoa" + description = "A fatty, bitter paste made from cocoa beans." reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 -/datum/reagent/coco/on_mob_life(var/mob/living/M as mob) +/datum/reagent/cocoa/on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor ..() return @@ -201,7 +201,7 @@ /datum/reagent/hot_coco name = "Hot Chocolate" id = "hot_coco" - description = "Made with love! And coco beans." + description = "Made with love! And cocoa beans." reagent_state = LIQUID nutriment_factor = 2 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 0b47df7c1c8..afda5ed237f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -397,13 +397,12 @@ New() ..() reagents.add_reagent("nutriment", 2) - reagents.add_reagent("chocolate",2) - reagents.add_reagent("coco", 2) + reagents.add_reagent("chocolate",4) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/cocoa_pile //for reagent chocolate being spilled on turfs - name = "Pile of Cocoa Powder" - desc = "A pile of pure cocoa powder." +/obj/item/weapon/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs + name = "Pile of Chocolate" + desc = "A pile of pure chocolate pieces." icon_state = "cocoa" filling_color = "#7D5F46" @@ -421,8 +420,7 @@ New() ..() reagents.add_reagent("nutriment", 3) - reagents.add_reagent("chocolate",2) - reagents.add_reagent("coco", 2) + reagents.add_reagent("chocolate",4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/donut @@ -477,7 +475,7 @@ if(5) reagents.add_reagent("plasma", 3) if(6) - reagents.add_reagent("coco", 3) + reagents.add_reagent("chocolate", 3) if(7) reagents.add_reagent("slimejelly", 3) if(8) diff --git a/code/modules/reagents/reagent_containers/food/snacks/candy.dm b/code/modules/reagents/reagent_containers/food/snacks/candy.dm index 8e067cef75f..9ddd19c7e2c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/candy.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/candy.dm @@ -7,12 +7,13 @@ //Candy / Candy Ingredients //Subclass so we can pass on values -/obj/item/weapon/reagent_containers/food/snacks/candy/ +/obj/item/weapon/reagent_containers/food/snacks/candy name = "generic candy" desc = "It's placeholder flavored. This shouldn't be seen." icon = 'icons/obj/food/candy.dmi' icon_state = "candy" - New() + +/obj/item/weapon/reagent_containers/food/snacks/candy/New() ..() // *********************************************************** @@ -25,12 +26,11 @@ icon_state = "chocolatebar" filling_color = "#7D5F46" - New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("chocolate",2) - reagents.add_reagent("coco", 2) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("chocolate",4) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy/caramel name = "Caramel" @@ -38,11 +38,11 @@ icon_state = "caramel" filling_color = "#DB944D" - New() - ..() - reagents.add_reagent("cream", 2) - reagents.add_reagent("sugar", 2) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/candy/caramel/New() + ..() + reagents.add_reagent("cream", 2) + reagents.add_reagent("sugar", 2) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy/toffee name = "Toffee" @@ -50,11 +50,11 @@ icon_state = "toffee" filling_color = "#7D5F46" - New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 3) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/candy/toffee/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sugar", 3) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy/nougat name = "Nougat" @@ -62,11 +62,11 @@ icon_state = "nougat" filling_color = "#7D5F46" - New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 3) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/candy/nougat/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sugar", 3) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy/taffy name = "Saltwater Taffy" @@ -74,12 +74,12 @@ icon_state = "candy1" filling_color = "#7D5F46" - New() - ..() - icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5") - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 3) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/candy/taffy/New() + ..() + icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5") + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sugar", 3) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy/fudge name = "Fudge" @@ -87,12 +87,11 @@ icon_state = "fudge" filling_color = "#7D5F46" - New() - ..() - reagents.add_reagent("cream", 3) - reagents.add_reagent("chocolate",3) - reagents.add_reagent("coco", 3) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/fudge/New() + ..() + reagents.add_reagent("cream", 3) + reagents.add_reagent("chocolate",6) + bitesize = 3 // *********************************************************** // Candy Products (Pre-existing) @@ -102,11 +101,12 @@ name = "Donor Candy" desc = "A little treat for blood donors." trash = /obj/item/trash/candy - New() - ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("sugar", 3) - bitesize = 5 + +/obj/item/weapon/reagent_containers/food/snacks/candy/donor/New() + ..() + reagents.add_reagent("nutriment", 10) + reagents.add_reagent("sugar", 3) + bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/candy_corn name = "candy corn" @@ -114,11 +114,11 @@ icon_state = "candy_corn" filling_color = "#FFFCB0" - New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sugar", 2) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("sugar", 2) + bitesize = 2 // *********************************************************** // Candy Products (plain / unflavored) @@ -131,10 +131,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#FFFFFF" - New() - ..() - reagents.add_reagent("sugar", 15) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/New() + ..() + reagents.add_reagent("sugar", 15) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/candybar name = "candy" @@ -143,11 +143,11 @@ trash = /obj/item/trash/candy filling_color = "#7D5F46" - New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("chocolate",5) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("chocolate",5) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/candycane name = "candy cane" @@ -155,11 +155,11 @@ icon_state = "candycane" filling_color = "#F2F2F2" - New() - ..() - reagents.add_reagent("minttoxin", 1) - reagents.add_reagent("sugar", 5) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/candy/candycane/New() + ..() + reagents.add_reagent("minttoxin", 1) + reagents.add_reagent("sugar", 5) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear name = "gummy bear" @@ -167,10 +167,10 @@ icon_state = "gbear" filling_color = "#FFFFFF" - New() - ..() - reagents.add_reagent("sugar", 10) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/New() + ..() + reagents.add_reagent("sugar", 10) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm name = "gummy worm" @@ -178,10 +178,10 @@ icon_state = "gworm" filling_color = "#FFFFFF" - New() - ..() - reagents.add_reagent("sugar", 10) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/New() + ..() + reagents.add_reagent("sugar", 10) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean name = "jelly bean" @@ -189,10 +189,10 @@ icon_state = "jbean" filling_color = "#FFFFFF" - New() - ..() - reagents.add_reagent("sugar", 10) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/New() + ..() + reagents.add_reagent("sugar", 10) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jawbreaker name = "jawbreaker" @@ -200,10 +200,10 @@ icon_state = "jawbreaker" filling_color = "#ED0758" - New() - ..() - reagents.add_reagent("sugar", 10) - bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift. +/obj/item/weapon/reagent_containers/food/snacks/candy/jawbreaker/New() + ..() + reagents.add_reagent("sugar", 10) + bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift. /obj/item/weapon/reagent_containers/food/snacks/candy/cash name = "candy cash" @@ -211,12 +211,11 @@ icon_state = "candy_cash" filling_color = "#302000" - New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sugar", 2) - reagents.add_reagent("coco", 2) - bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/candy/cash/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("chocolate", 4) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/candy/coin name = "chocolate coin" @@ -224,12 +223,11 @@ icon_state = "choc_coin" filling_color = "#302000" - New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("chocolate",2) - reagents.add_reagent("coco", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/coin/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("chocolate",4) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gum name = "bubblegum" @@ -238,10 +236,10 @@ trash = /obj/item/trash/gum filling_color = "#FF7495" - New() - ..() - reagents.add_reagent("sugar", 5) - bitesize = 0.2 +/obj/item/weapon/reagent_containers/food/snacks/candy/gum/New() + ..() + reagents.add_reagent("sugar", 5) + bitesize = 0.2 /obj/item/weapon/reagent_containers/food/snacks/candy/sucker name = "sucker" @@ -249,10 +247,10 @@ icon_state = "sucker" filling_color = "#FFFFFF" - New() - ..() - reagents.add_reagent("sugar", 10) - bitesize = 1 +/obj/item/weapon/reagent_containers/food/snacks/candy/sucker/New() + ..() + reagents.add_reagent("sugar", 10) + bitesize = 1 // *********************************************************** // Gummy Bear Flavors @@ -264,10 +262,10 @@ icon_state = "gbear_red" filling_color = "#801E28" - New() - ..() - reagents.add_reagent("cherryjelly", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/red/New() + ..() + reagents.add_reagent("cherryjelly", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue name = "gummy bear" @@ -275,10 +273,10 @@ icon_state = "gbear_blue" filling_color = "#863333" - New() - ..() - reagents.add_reagent("berryjuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue/New() + ..() + reagents.add_reagent("berryjuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison name = "gummy bear" @@ -286,13 +284,12 @@ icon_state = "gbear_blue" filling_color = "#863353" - New() - ..() - reagents.add_reagent("poisonberryjuice", 12) - reagents.del_reagent("sugar") - reagents.update_total() - bitesize = 3 - +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison/New() + ..() + reagents.add_reagent("poisonberryjuice", 12) + reagents.del_reagent("sugar") + reagents.update_total() + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green name = "gummy bear" @@ -300,10 +297,10 @@ icon_state = "gbear_green" filling_color = "#365E30" - New() - ..() - reagents.add_reagent("limejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green/New() + ..() + reagents.add_reagent("limejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow name = "gummy bear" @@ -311,10 +308,10 @@ icon_state = "gbear_yellow" filling_color = "#863333" - New() - ..() - reagents.add_reagent("lemonjuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow/New() + ..() + reagents.add_reagent("lemonjuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange name = "gummy bear" @@ -322,10 +319,10 @@ icon_state = "gbear_orange" filling_color = "#E78108" - New() - ..() - reagents.add_reagent("orangejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange/New() + ..() + reagents.add_reagent("orangejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple name = "gummy bear" @@ -333,10 +330,10 @@ icon_state = "gbear_purple" filling_color = "#993399" - New() - ..() - reagents.add_reagent("grapejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple/New() + ..() + reagents.add_reagent("grapejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf name = "gummy bear" @@ -344,11 +341,10 @@ icon_state = "gbear_wtf" filling_color = "#60A584" - New() - ..() - reagents.add_reagent("space_drugs", 2) - bitesize = 3 - +/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf/New() + ..() + reagents.add_reagent("space_drugs", 2) + bitesize = 3 // *********************************************************** // Gummy Worm Flavors @@ -360,10 +356,10 @@ icon_state = "gworm_red" filling_color = "#801E28" - New() - ..() - reagents.add_reagent("cherryjelly", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/red/New() + ..() + reagents.add_reagent("cherryjelly", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue name = "gummy worm" @@ -371,10 +367,10 @@ icon_state = "gworm_blue" filling_color = "#863333" - New() - ..() - reagents.add_reagent("berryjuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue/New() + ..() + reagents.add_reagent("berryjuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison name = "gummy worm" @@ -382,12 +378,12 @@ icon_state = "gworm_blue" filling_color = "#863353" - New() - ..() - reagents.add_reagent("poisonberryjuice", 12) - reagents.del_reagent("sugar") - reagents.update_total() - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison/New() + ..() + reagents.add_reagent("poisonberryjuice", 12) + reagents.del_reagent("sugar") + reagents.update_total() + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green name = "gummy worm" @@ -395,10 +391,10 @@ icon_state = "gworm_green" filling_color = "#365E30" - New() - ..() - reagents.add_reagent("limejuice", 10) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green/New() + ..() + reagents.add_reagent("limejuice", 10) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow name = "gummy worm" @@ -406,10 +402,10 @@ icon_state = "gworm_yellow" filling_color = "#863333" - New() - ..() - reagents.add_reagent("lemonjuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow/New() + ..() + reagents.add_reagent("lemonjuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange name = "gummy worm" @@ -417,10 +413,10 @@ icon_state = "gworm_orange" filling_color = "#E78108" - New() - ..() - reagents.add_reagent("orangejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange/New() + ..() + reagents.add_reagent("orangejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple name = "gummy worm" @@ -428,10 +424,10 @@ icon_state = "gworm_purple" filling_color = "#993399" - New() - ..() - reagents.add_reagent("grapejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple/New() + ..() + reagents.add_reagent("grapejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf name = "gummy worm" @@ -439,11 +435,10 @@ icon_state = "gworm_wtf" filling_color = "#60A584" - New() - ..() - reagents.add_reagent("space_drugs", 2) - bitesize = 3 - +/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf/New() + ..() + reagents.add_reagent("space_drugs", 2) + bitesize = 3 // *********************************************************** // Jelly Bean Flavors @@ -455,10 +450,10 @@ icon_state = "jbean_red" filling_color = "#801E28" - New() - ..() - reagents.add_reagent("cherryjelly", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/red/New() + ..() + reagents.add_reagent("cherryjelly", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue name = "jelly bean" @@ -466,10 +461,10 @@ icon_state = "jbean_blue" filling_color = "#863333" - New() - ..() - reagents.add_reagent("berryjuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue/New() + ..() + reagents.add_reagent("berryjuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison name = "jelly bean" @@ -477,12 +472,12 @@ icon_state = "jbean_blue" filling_color = "#863353" - New() - ..() - reagents.add_reagent("poisonberryjuice", 12) - reagents.del_reagent("sugar") - reagents.update_total() - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison/New() + ..() + reagents.add_reagent("poisonberryjuice", 12) + reagents.del_reagent("sugar") + reagents.update_total() + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green name = "jelly bean" @@ -490,10 +485,10 @@ icon_state = "jbean_green" filling_color = "#365E30" - New() - ..() - reagents.add_reagent("limejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green/New() + ..() + reagents.add_reagent("limejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow name = "jelly bean" @@ -501,10 +496,10 @@ icon_state = "jbean_yellow" filling_color = "#863333" - New() - ..() - reagents.add_reagent("lemonjuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow/New() + ..() + reagents.add_reagent("lemonjuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange name = "jelly bean" @@ -512,10 +507,10 @@ icon_state = "jbean_orange" filling_color = "#E78108" - New() - ..() - reagents.add_reagent("orangejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange/New() + ..() + reagents.add_reagent("orangejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple name = "jelly bean" @@ -523,10 +518,10 @@ icon_state = "jbean_purple" filling_color = "#993399" - New() - ..() - reagents.add_reagent("grapejuice", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple/New() + ..() + reagents.add_reagent("grapejuice", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate name = "jelly bean" @@ -534,10 +529,10 @@ icon_state = "jbean_choc" filling_color = "#302000" - New() - ..() - reagents.add_reagent("chocolate",2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate/New() + ..() + reagents.add_reagent("chocolate",2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn name = "jelly bean" @@ -545,10 +540,10 @@ icon_state = "jbean_popcorn" filling_color = "#664330" - New() - ..() - reagents.add_reagent("nutriment", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn/New() + ..() + reagents.add_reagent("nutriment", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola name = "jelly bean" @@ -556,10 +551,10 @@ icon_state = "jbean_cola" filling_color = "#102000" - New() - ..() - reagents.add_reagent("cola", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola/New() + ..() + reagents.add_reagent("cola", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/drgibb name = "jelly bean" @@ -567,10 +562,10 @@ icon_state = "jbean_cola" filling_color = "#102000" - New() - ..() - reagents.add_reagent("dr_gibb", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/drgibb/New() + ..() + reagents.add_reagent("dr_gibb", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/coffee name = "jelly bean" @@ -578,10 +573,10 @@ icon_state = "jbean_choc" filling_color = "#482000" - New() - ..() - reagents.add_reagent("coffee", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/coffee/New() + ..() + reagents.add_reagent("coffee", 2) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf name = "jelly bean" @@ -589,10 +584,10 @@ icon_state = "jbean_wtf" filling_color = "#60A584" - New() - ..() - reagents.add_reagent("space_drugs", 2) - bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf/New() + ..() + reagents.add_reagent("space_drugs", 2) + bitesize = 3 // *********************************************************** // Cotton Candy Flavors @@ -605,10 +600,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#801E28" - New() - ..() - reagents.add_reagent("cherryjelly", 5) - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/red/New() + ..() + reagents.add_reagent("cherryjelly", 5) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/blue name = "cotton candy" @@ -617,10 +612,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#863333" - New() - ..() - reagents.add_reagent("berryjuice", 5) - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/blue/New() + ..() + reagents.add_reagent("berryjuice", 5) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison name = "cotton candy" @@ -629,12 +624,12 @@ trash = /obj/item/weapon/c_tube filling_color = "#863353" - New() - ..() - reagents.add_reagent("poisonberryjuice", 20) - reagents.del_reagent("sugar") - reagents.update_total() - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison/New() + ..() + reagents.add_reagent("poisonberryjuice", 20) + reagents.del_reagent("sugar") + reagents.update_total() + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green name = "cotton candy" @@ -643,10 +638,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#365E30" - New() - ..() - reagents.add_reagent("limejuice", 5) - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green/New() + ..() + reagents.add_reagent("limejuice", 5) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/yellow name = "cotton candy" @@ -655,10 +650,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#863333" - New() - ..() - reagents.add_reagent("lemonjuice", 5) - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/yellow/New() + ..() + reagents.add_reagent("lemonjuice", 5) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/orange name = "cotton candy" @@ -667,10 +662,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#E78108" - New() - ..() - reagents.add_reagent("orangejuice", 5) - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/orange/New() + ..() + reagents.add_reagent("orangejuice", 5) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/purple name = "cotton candy" @@ -679,10 +674,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#993399" - New() - ..() - reagents.add_reagent("grapejuice", 5) - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/purple/New() + ..() + reagents.add_reagent("grapejuice", 5) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/pink name = "cotton candy" @@ -691,10 +686,10 @@ trash = /obj/item/weapon/c_tube filling_color = "#863333" - New() - ..() - reagents.add_reagent("watermelonjuice", 5) - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/pink/New() + ..() + reagents.add_reagent("watermelonjuice", 5) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow name = "cotton candy" @@ -703,12 +698,12 @@ trash = /obj/item/weapon/c_tube filling_color = "#C8A5DC" - New() - ..() - reagents.add_reagent("omnizine", 20) - reagents.del_reagent("sugar") - reagents.update_total() - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow/New() + ..() + reagents.add_reagent("omnizine", 20) + reagents.del_reagent("sugar") + reagents.update_total() + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow name = "cotton candy" @@ -717,12 +712,12 @@ trash = /obj/item/weapon/c_tube filling_color = "#32127A" - New() - ..() - reagents.add_reagent("sulfonal", 20) - reagents.del_reagent("sugar") - reagents.update_total() - bitesize = 4 +/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow/New() + ..() + reagents.add_reagent("sulfonal", 20) + reagents.del_reagent("sugar") + reagents.update_total() + bitesize = 4 // *********************************************************** // Candybar Flavors @@ -735,41 +730,26 @@ trash = /obj/item/trash/candy filling_color = "#7D5F46" - New() - ..() - /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/toffee name = "Yum-baton Bar" desc = "Chocolate and toffee in the shape of a baton. Security sure knows how to pound these down!" icon_state = "yumbaton" filling_color = "#7D5F46" - New() - ..() - /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel name = "Malper Bar" desc = "A chocolate syringe filled with a caramel injection. Just what the doctor ordered!" icon_state = "malper" filling_color = "#7D5F46" - New() - ..() - /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel_nougat name = "Toxins Test Bar" desc = "An explosive combination of chocolate, caramel, and nougat. Research has never been so tasty!" icon_state = "toxinstest" filling_color = "#7D5F46" - New() - ..() - /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/nougat name = "Tool-erone Bar" desc = "Chocolate-covered nougat, shaped like a wrench. Great for an engineer on the go!" icon_state = "toolerone" filling_color = "#7D5F46" - - New() - ..() \ No newline at end of file