diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index 4f2750c0c06..16a2d522a6c 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -36,7 +36,7 @@ /datum/recipe var/list/reagents // example: = list("berryjuice" = 5) // do not list same reagent twice var/list/items // example: =list(/obj/item/weapon/crowbar, /obj/item/weapon/welder) // place /foo/bar before /foo - var/result //example: = /obj/item/weapon/reagent_containers/food/snacks/donut/normal + var/result //example: = /obj/item/weapon/reagent_containers/food/snacks/donut var/time = 100 // 1/10 part of second diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 4efa040e6c5..7f2c6744342 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -809,7 +809,7 @@ icon_deny = "sec-deny" req_access_txt = "1" products = list(/obj/item/weapon/restraints/handcuffs = 8,/obj/item/weapon/restraints/handcuffs/cable/zipties = 10,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash/handheld = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6,/obj/item/device/flashlight/seclite = 4) + /obj/item/weapon/reagent_containers/food/snacks/donut = 12,/obj/item/weapon/storage/box/evidence = 6,/obj/item/device/flashlight/seclite = 4) contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/fancy/donut_box = 2) /obj/machinery/vending/hydronutrients @@ -906,8 +906,8 @@ desc = "Old sweet water vending machine" icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/soda = 30) - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/cola = 20) + products = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/soda = 30) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola = 20) /obj/machinery/vending/tool name = "\improper YouTool" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index ca983cbc845..91552bcf42e 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -90,7 +90,7 @@ /obj/item/clothing/glasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_box, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal, + /obj/item/weapon/reagent_containers/food/snacks/donut, /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, /obj/item/device/flashlight/seclite, /obj/item/weapon/melee/classic_baton/telescopic diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 06b694b6d78..c84ec21f623 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -49,7 +49,7 @@ /obj/item/weapon/storage/fancy/donut_box/New() ..() for(var/i=1; i <= storage_slots; i++) - new /obj/item/weapon/reagent_containers/food/snacks/donut/normal(src) + new /obj/item/weapon/reagent_containers/food/snacks/donut(src) return /* diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index f2dbb503bf9..9715c0405b8 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -11,6 +11,11 @@ possible_transfer_amounts = list(5,10,25) volume = 50 +/obj/item/weapon/reagent_containers/food/drinks/New() + ..() + pixel_x = rand(-5, 5) + pixel_y = rand(-5, 5) + /obj/item/weapon/reagent_containers/food/drinks/on_reagent_change() if (gulp_size < 5) gulp_size = 5 else gulp_size = max(round(reagents.total_volume / 5), 5) @@ -120,12 +125,7 @@ desc = "It's milk. White and nutritious goodness!" icon_state = "milk" item_state = "carton" - -/obj/item/weapon/reagent_containers/food/drinks/milk/New() - ..() - reagents.add_reagent("milk", 50) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("milk" = 50) /obj/item/weapon/reagent_containers/food/drinks/flour name = "flour sack" @@ -133,105 +133,59 @@ icon = 'icons/obj/food.dmi' icon_state = "flour" item_state = "flour" - -/obj/item/weapon/reagent_containers/food/drinks/flour/New() - ..() - reagents.add_reagent("flour", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("flour" = 30) /obj/item/weapon/reagent_containers/food/drinks/soymilk name = "SoyMilk" desc = "It's soy milk. White and nutritious goodness!" icon_state = "soymilk" item_state = "carton" - -/obj/item/weapon/reagent_containers/food/drinks/soymilk/New() - ..() - reagents.add_reagent("soymilk", 50) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("soymilk" = 50) /obj/item/weapon/reagent_containers/food/drinks/coffee name = "Robust Coffee" desc = "Careful, the beverage you're about to enjoy is extremely hot." icon_state = "coffee" - -/obj/item/weapon/reagent_containers/food/drinks/coffee/New() - ..() - reagents.add_reagent("coffee", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("coffee" = 30) /obj/item/weapon/reagent_containers/food/drinks/tea name = "Duke Purple Tea" desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." icon_state = "tea" item_state = "coffee" - -/obj/item/weapon/reagent_containers/food/drinks/tea/New() - ..() - reagents.add_reagent("tea", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("tea" = 30) /obj/item/weapon/reagent_containers/food/drinks/ice name = "Ice Cup" desc = "Careful, cold ice, do not chew." icon_state = "coffee" - -/obj/item/weapon/reagent_containers/food/drinks/ice/New() - ..() - reagents.add_reagent("ice", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("ice" = 30) /obj/item/weapon/reagent_containers/food/drinks/h_chocolate name = "Dutch Hot Coco" desc = "Made in Space South America." icon_state = "tea" item_state = "coffee" - -/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/New() - ..() - reagents.add_reagent("hot_coco", 30) - reagents.add_reagent("sugar", 5) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("hot_coco" = 30, "sugar", 5) /obj/item/weapon/reagent_containers/food/drinks/dry_ramen name = "Cup Ramen" desc = "Just add 10ml water, self heats! A taste that reminds you of your school years." icon_state = "ramen" - -/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/New() - ..() - reagents.add_reagent("dry_ramen", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("dry_ramen" = 30) /obj/item/weapon/reagent_containers/food/drinks/beer name = "Space Beer" desc = "Beer. In space." icon_state = "beer" - -/obj/item/weapon/reagent_containers/food/drinks/beer/New() - ..() - reagents.add_reagent("beer", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("beer" = 30) /obj/item/weapon/reagent_containers/food/drinks/ale name = "Magm-Ale" desc = "A true dorf's drink of choice." icon_state = "alebottle" item_state = "beer" - -/obj/item/weapon/reagent_containers/food/drinks/ale/New() - ..() - reagents.add_reagent("ale", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("ale" = 30) /obj/item/weapon/reagent_containers/food/drinks/sillycup name = "Paper Cup" @@ -240,11 +194,6 @@ possible_transfer_amounts = null volume = 10 -/obj/item/weapon/reagent_containers/food/drinks/sillycup/New() - ..() - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) - /obj/item/weapon/reagent_containers/food/drinks/sillycup/on_reagent_change() if(reagents.total_volume) icon_state = "water_cup" @@ -273,9 +222,7 @@ name = "detective's flask" desc = "The detective's only true friend." icon_state = "detflask" - New() - ..() - reagents.add_reagent("whiskey", 30) + list_reagents = list("whiskey" = 30) /obj/item/weapon/reagent_containers/food/drinks/britcup name = "cup" @@ -299,96 +246,56 @@ name = "Space Cola" desc = "Cola. in space." icon_state = "cola" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola/New() - ..() - reagents.add_reagent("cola", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("cola" = 30) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic name = "T-Borg's Tonic Water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." icon_state = "tonic" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic/New() - ..() - reagents.add_reagent("tonic", 50) + list_reagents = list("tonic" = 50) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater name = "Soda Water" desc = "A can of soda water. Why not make a scotch and soda?" icon_state = "sodawater" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater/New() - ..() - reagents.add_reagent("sodawater", 50) + list_reagents = list("sodawater" = 50) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime name = "Orange Soda" desc = "You wanted ORANGE. It gave you Lemon Lime." icon_state = "lemon-lime" + list_reagents = list("lemon_lime" = 30) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime/New() ..() name = "Lemon-Lime Soda" - reagents.add_reagent("lemon_lime", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up name = "Space-Up" desc = "Tastes like a hull breach in your mouth." icon_state = "space-up" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up/New() - ..() - reagents.add_reagent("space_up", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("space_up" = 30) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist name = "Star-kist" desc = "The taste of a star in liquid form. And, a bit of tuna...?" icon_state = "starkist" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist/New() - ..() - reagents.add_reagent("cola", 15) - reagents.add_reagent("orangejuice", 15) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("cola" = 15, "orangejuice" = 15) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind name = "Space Mountain Wind" desc = "Blows right through you like a space wind." icon_state = "space_mountain_wind" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind/New() - ..() - reagents.add_reagent("spacemountainwind", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("spacemountainwind" = 30) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko name = "Thirteen Loko" desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably." icon_state = "thirteen_loko" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko/New() - ..() - reagents.add_reagent("thirteenloko", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) + list_reagents = list("thirteenloko" = 30) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb name = "Dr. Gibb" desc = "A delicious mixture of 42 different flavors." icon_state = "dr_gibb" - -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb/New() - ..() - reagents.add_reagent("dr_gibb", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) - + list_reagents = list("dr_gibb" = 30) diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm index 5b63c23a921..fc5ef2e522b 100644 --- a/code/modules/food&drinks/drinks/drinks/bottle.dm +++ b/code/modules/food&drinks/drinks/drinks/bottle.dm @@ -129,118 +129,79 @@ name = "Griffeater Gin" desc = "A bottle of high quality gin, produced in the New London Space Station." icon_state = "ginbottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin/New() - ..() - reagents.add_reagent("gin", 100) + list_reagents = list("gin" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey name = "Uncle Git's Special Reserve" desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." icon_state = "whiskeybottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey/New() - ..() - reagents.add_reagent("whiskey", 100) + list_reagents = list("whiskey" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka name = "Tunguska Triple Distilled" desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." icon_state = "vodkabottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/New() - ..() - reagents.add_reagent("vodka", 100) + list_reagents = list("vodka" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla name = "Caccavo Guaranteed Quality Tequilla" desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" icon_state = "tequillabottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla/New() - ..() - reagents.add_reagent("tequilla", 100) + list_reagents = list("tequilla" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing name = "Bottle of Nothing" desc = "A bottle filled with nothing" icon_state = "bottleofnothing" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing/New() - ..() - reagents.add_reagent("nothing", 100) + list_reagents = list("nothing" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste Patron" desc = "Silver laced tequilla, served in space night clubs across the galaxy." icon_state = "patronbottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/patron/New() - ..() - reagents.add_reagent("patron", 100) + list_reagents = list("patron" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/rum name = "Captain Pete's Cuban Spiced Rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." icon_state = "rumbottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum/New() - ..() - reagents.add_reagent("rum", 100) + list_reagents = list("rum" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater name = "Flask of Holy Water" desc = "A flask of the chaplain's holy water." icon_state = "holyflask" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/New() - ..() - reagents.add_reagent("holywater", 100) + list_reagents = list("holywater" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth name = "Goldeneye Vermouth" desc = "Sweet, sweet dryness~" icon_state = "vermouthbottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth/New() - ..() - reagents.add_reagent("vermouth", 100) + list_reagents = list("vermouth" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua name = "Robert Robust's Coffee Liqueur" desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK" icon_state = "kahluabottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua/New() - ..() - reagents.add_reagent("kahlua", 100) + list_reagents = list("kahlua" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager name = "College Girl Goldschlager" desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." icon_state = "goldschlagerbottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager/New() - ..() - reagents.add_reagent("goldschlager", 100) + list_reagents = list("goldschlager" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac name = "Chateau De Baton Premium Cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac/New() - ..() - reagents.add_reagent("cognac", 100) + list_reagents = list("cognac" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/wine name = "Doublebeard Bearded Special Wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" - -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine/New() - ..() - reagents.add_reagent("wine", 100) + list_reagents = list("wine" = 100) //////////////////////////JUICES AND STUFF /////////////////////// @@ -250,10 +211,7 @@ icon_state = "orangejuice" item_state = "carton" isGlass = 0 - -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice/New() - ..() - reagents.add_reagent("orangejuice", 100) + list_reagents = list("orangejuice" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/cream name = "Milk Cream" @@ -261,10 +219,7 @@ icon_state = "cream" item_state = "carton" isGlass = 0 - -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream/New() - ..() - reagents.add_reagent("cream", 100) + list_reagents = list("cream" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice name = "Tomato Juice" @@ -272,10 +227,7 @@ icon_state = "tomatojuice" item_state = "carton" isGlass = 0 - -/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice/New() - ..() - reagents.add_reagent("tomatojuice", 100) + list_reagents = list("tomatojuice" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice name = "Lime Juice" @@ -283,7 +235,4 @@ icon_state = "limejuice" item_state = "carton" isGlass = 0 - -/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice/New() - ..() - reagents.add_reagent("limejuice", 100) + list_reagents = list("limejuice" = 100) diff --git a/code/modules/food&drinks/drinks/drinks/bottle/robot.dm b/code/modules/food&drinks/drinks/drinks/bottle/robot.dm deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index 6fb536af8db..a7f38510bc0 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -453,14 +453,12 @@ return // for /obj/machinery/vending/sovietsoda -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/soda - New() - ..() - reagents.add_reagent("sodawater", 50) - on_reagent_change() +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/New() + ..() + on_reagent_change() -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/cola - New() - ..() - reagents.add_reagent("cola", 50) - on_reagent_change() +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/soda + list_reagents = list("sodawater" = 50) + +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola + list_reagents = list("cola" = 50) diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm index 948445dc33b..c42a75ae08e 100644 --- a/code/modules/food&drinks/food/condiment.dm +++ b/code/modules/food&drinks/food/condiment.dm @@ -127,16 +127,10 @@ name = "universal enzyme" desc = "Used in cooking various dishes." icon_state = "enzyme" - -/obj/item/weapon/reagent_containers/food/condiment/enzyme/New() - ..() - reagents.add_reagent("enzyme", 50) + list_reagents = list("enzyme" = 50) /obj/item/weapon/reagent_containers/food/condiment/sugar - -/obj/item/weapon/reagent_containers/food/condiment/sugar/New() - ..() - reagents.add_reagent("sugar", 50) + list_reagents = list("SUGAR" = 50) /obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then name = "salt shaker" // a large one. @@ -145,10 +139,7 @@ possible_transfer_amounts = list(1,20) //for clown turning the lid off amount_per_transfer_from_this = 1 volume = 20 - -/obj/item/weapon/reagent_containers/food/condiment/saltshaker/New() - ..() - reagents.add_reagent("sodiumchloride", 20) + list_reagents = list("sodiumchloride" = 20) /obj/item/weapon/reagent_containers/food/condiment/peppermill name = "pepper mill" @@ -157,10 +148,7 @@ possible_transfer_amounts = list(1,20) //for clown turning the lid off amount_per_transfer_from_this = 1 volume = 20 - -/obj/item/weapon/reagent_containers/food/condiment/peppermill/New() - ..() - reagents.add_reagent("blackpepper", 20) + list_reagents = list("blackpepper" = 20) //Food packs. To easily apply deadly toxi... delicious sauces to your food! /obj/item/weapon/reagent_containers/food/condiment/pack @@ -173,11 +161,6 @@ possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!")) var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters. -/obj/item/weapon/reagent_containers/food/condiment/pack/New() - ..() - pixel_x = rand(-7, 7) - pixel_y = rand(-7, 7) - /obj/item/weapon/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly. return @@ -217,16 +200,10 @@ /obj/item/weapon/reagent_containers/food/condiment/pack/ketchup name = "ketchup pack" originalname = "ketchup" - -/obj/item/weapon/reagent_containers/food/condiment/pack/ketchup/New() - ..() - reagents.add_reagent("ketchup", 10) + list_reagents = list("ketchup" = 10) //Hot sauce /obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce name = "hotsauce pack" originalname = "hotsauce" - -/obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce/New() - ..() - reagents.add_reagent("capsaicin", 10) + list_reagents = list("capsaicin" = 10) diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index 5a1d222bda7..0dec7349a08 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -3,7 +3,7 @@ desc = "yummy" icon = 'icons/obj/food.dmi' icon_state = null - var/bitesize = 1 + var/bitesize = 2 var/bitecount = 0 var/trash = null var/slice_path @@ -255,21 +255,15 @@ icon_state = "cheesewheel" slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesewedge slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) + list_reagents = list("nutriment" = 20, "vitamin" = 5) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/cheesewedge name = "cheese wedge" desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." icon_state = "cheesewedge" - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/watermelonslice name = "watermelon slice" desc = "A slice of watery goodness." icon_state = "watermelonslice" - bitesize = 2 \ No newline at end of file diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm index 9397cd6b40f..60de17df242 100644 --- a/code/modules/food&drinks/food/snacks/meat.dm +++ b/code/modules/food&drinks/food/snacks/meat.dm @@ -3,12 +3,8 @@ desc = "A slab of meat" icon_state = "meat" dried_type = /obj/item/weapon/reagent_containers/food/snacks/sosjerky - -/obj/item/weapon/reagent_containers/food/snacks/meat/New() - ..() - reagents.add_reagent("nutriment", 3) - src.bitesize = 3 - + bitesize = 3 + list_reagents = list("nutriment" = 3) /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh name = "synthetic meat" @@ -22,16 +18,12 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime icon_state = "slimemeat" desc = "Because jello wasn't offensive enough to vegans" - New() - ..() - reagents.add_reagent("slimejelly", 3) + list_reagents = list("nutriment" = 3, "slimejelly" = 3) /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem icon_state = "golemmeat" desc = "Edible rocks, welcome to the future" - New() - ..() - reagents.add_reagent("iron", 3) + list_reagents = list("nutriment" = 3, "iron" = 3) /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem/adamantine icon_state = "agolemmeat" @@ -52,9 +44,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/fly icon_state = "flymeat" desc = "Nothing says tasty like maggot filled radioactive mutant flesh" - New() - ..() - reagents.add_reagent("uranium", 3) + list_reagents = list("nutriment" = 3, "uranium" = 3) /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/skeleton name = "-bone" diff --git a/code/modules/food&drinks/food/snacks_bread.dm b/code/modules/food&drinks/food/snacks_bread.dm index 62d53a71605..c61a5f5324a 100644 --- a/code/modules/food&drinks/food/snacks_bread.dm +++ b/code/modules/food&drinks/food/snacks_bread.dm @@ -5,19 +5,15 @@ icon_state = "meatbread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice slices_num = 5 + list_reagents = list("nutriment" = 30, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/meatbread/New() - ..() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("vitamin", 5) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice name = "meatbread slice" desc = "A slice of delicious meatbread." icon_state = "meatbreadslice" trash = /obj/item/trash/plate - bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/xenomeatbread name = "xenomeatbread loaf" @@ -25,19 +21,15 @@ icon_state = "xenomeatbread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice slices_num = 5 + list_reagents = list("nutriment" = 30, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/xenomeatbread/New() - ..() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("vitamin", 5) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice name = "xenomeatbread slice" desc = "A slice of delicious meatbread. Extra Heretical." icon_state = "xenobreadslice" trash = /obj/item/trash/plate - bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/spidermeatbread name = "spider meat loaf" @@ -45,24 +37,16 @@ icon_state = "spidermeatbread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice slices_num = 5 + list_reagents = list("nutriment" = 30, "toxin" = 15, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/spidermeatbread/New() - ..() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("toxin", 15) - reagents.add_reagent("vitamin", 5) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice name = "spider meat bread slice" desc = "A slice of meatloaf made from an animal that most likely still wants you dead." icon_state = "xenobreadslice" trash = /obj/item/trash/plate - bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice/New() - ..() - reagents.add_reagent("toxin", 2) + list_reagents = list("toxin" = 2) /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bananabread name = "banana-nut bread" @@ -70,19 +54,15 @@ icon_state = "bananabread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice slices_num = 5 + list_reagents = list("nutriment" = 30, "banana" = 20) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bananabread/New() - ..() - reagents.add_reagent("banana", 20) - reagents.add_reagent("nutriment", 20) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice name = "banana-nut bread slice" desc = "A slice of delicious banana bread." icon_state = "bananabreadslice" trash = /obj/item/trash/plate - bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/tofubread name = "Tofubread" @@ -90,19 +70,15 @@ icon_state = "tofubread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice slices_num = 5 + list_reagents = list("nutriment" = 30, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/tofubread/New() - ..() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("vitamin", 5) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice name = "tofubread slice" desc = "A slice of delicious tofubread." icon_state = "tofubreadslice" trash = /obj/item/trash/plate - bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bread name = "bread" @@ -110,18 +86,14 @@ icon_state = "bread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice slices_num = 5 + list_reagents = list("nutriment" = 6, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bread/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/breadslice name = "bread slice" desc = "A slice of home." icon_state = "breadslice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/creamcheesebread @@ -130,29 +102,19 @@ icon_state = "creamcheesebread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice slices_num = 5 + list_reagents = list("nutriment" = 20, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/creamcheesebread/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice name = "cream cheese bread slice" desc = "A slice of yum!" icon_state = "creamcheesebreadslice" trash = /obj/item/trash/plate - bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/baguette name = "baguette" desc = "Bon appetit!" icon_state = "baguette" - -/obj/item/weapon/reagent_containers/food/snacks/baguette/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("vitamin", 1) + list_reagents = list("nutriment" = 60, "blackpepper" = 1, "sodiumchloride" = 1, "vitamin" = 1) bitesize = 3 diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm index d44f466a7d5..5a8e8d5f539 100644 --- a/code/modules/food&drinks/food/snacks_burgers.dm +++ b/code/modules/food&drinks/food/snacks_burgers.dm @@ -2,12 +2,8 @@ name = "burger" desc = "The cornerstone of every nutritious breakfast." icon_state = "hburger" - -/obj/item/weapon/reagent_containers/food/snacks/burger/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 6, "vitamin" = 1) + bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/burger/human var/hname = "" @@ -24,12 +20,7 @@ name = "fillet -o- carp sandwich" desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp." icon_state = "fishburger" - -/obj/item/weapon/reagent_containers/food/snacks/burger/fish/New() - ..() - reagents.add_reagent("carpotoxin", 3) - reagents.add_reagent("vitamin", 3) - bitesize = 3 + list_reagents = list("nutriment" = 6, "carpotoxin" = 3, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/tofu name = "tofu burger" @@ -40,33 +31,20 @@ name = "roburger" desc = "The lettuce is the only organic component. Beep." icon_state = "roburger" - -/obj/item/weapon/reagent_containers/food/snacks/burger/roburger/New() - ..() - reagents.add_reagent("nanites", 2) - reagents.add_reagent("vitamin", 5) + list_reagents = list("nutriment" = 6, "nanites" = 2, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig name = "roburger" desc = "This massive patty looks like poison. Beep." icon_state = "roburger" - volume = 106 - -/obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig/New() - ..() - reagents.add_reagent("nanites", 100) - reagents.add_reagent("vitamin", 20) - bitesize = 0.1 + volume = 120 + list_reagents = list("nutriment" = 20, "nanites" = 80, "vitamin" = 20) /obj/item/weapon/reagent_containers/food/snacks/burger/xeno name = "xenoburger" desc = "Smells caustic. Tastes like heresy." icon_state = "xburger" -/obj/item/weapon/reagent_containers/food/snacks/burger/xeno/New() - ..() - reagents.add_reagent("nutriment", 2) - /obj/item/weapon/reagent_containers/food/snacks/burger/clown name = "clown burger" desc = "This tastes funny..." @@ -81,11 +59,7 @@ name = "brainburger" desc = "A strange looking burger. It looks almost sentient." icon_state = "brainburger" - -/obj/item/weapon/reagent_containers/food/snacks/burger/brain/New() - ..() - reagents.add_reagent("alkysine", 6) - reagents.add_reagent("vitamin", 3) + list_reagents = list("nutriment" = 6, "alkysine" = 6, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/ghost name = "ghost burger" @@ -97,66 +71,42 @@ desc = "Perfect for hiding the fact it's burnt to a crisp." icon_state = "cburger" color = "#DA0000FF" - -/obj/item/weapon/reagent_containers/food/snacks/burger/red/New() - ..() - reagents.add_reagent("redcrayonpowder", 10) - bitesize = 3 + list_reagents = list("nutriment" = 6, "redcrayonpowder" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/orange name = "orange burger" desc = "Contains 0% juice." icon_state = "cburger" color = "#FF9300FF" - -/obj/item/weapon/reagent_containers/food/snacks/burger/orange/New() - ..() - reagents.add_reagent("orangecrayonpowder", 10) - bitesize = 3 + list_reagents = list("nutriment" = 6, "orangecrayonpowder" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/yellow name = "yellow burger" desc = "Bright to the last bite." icon_state = "cburger" color = "#FFF200FF" - -/obj/item/weapon/reagent_containers/food/snacks/burger/yellow/New() - ..() - reagents.add_reagent("yellowcrayonpowder", 10) - bitesize = 3 + list_reagents = list("nutriment" = 6, "yellowcrayonpowder" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/green name = "green burger" desc = "It's not tainted meat, it's painted meat!" icon_state = "cburger" color = "#A8E61DFF" - -/obj/item/weapon/reagent_containers/food/snacks/burger/green/New() - ..() - reagents.add_reagent("greencrayonpowder", 10) - bitesize = 3 + list_reagents = list("nutriment" = 6, "greencrayonpowder" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/blue name = "blue burger" desc = "Is this blue rare?" icon_state = "cburger" color = "#00B7EFFF" - -/obj/item/weapon/reagent_containers/food/snacks/burger/blue/New() - ..() - reagents.add_reagent("bluecrayonpowder", 10) - bitesize = 3 + list_reagents = list("nutriment" = 6, "bluecrayonpowder" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/purple name = "purple burger" desc = "Regal and low class at the same time." icon_state = "cburger" color = "#DA00FFFF" - -/obj/item/weapon/reagent_containers/food/snacks/burger/purple/New() - ..() - reagents.add_reagent("purplecrayonpowder", 10) - bitesize = 3 + list_reagents = list("nutriment" = 6, "purplecrayonpowder" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/spell name = "spell burger" @@ -167,33 +117,21 @@ name = "big bite burger" desc = "Forget the Big Mac. THIS is the future!" icon_state = "bigbiteburger" - -/obj/item/weapon/reagent_containers/food/snacks/burger/bigbite/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 3 + list_reagents = list("nutriment" = 14, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/jelly name = "jelly burger" desc = "Culinary delight..?" icon_state = "jellyburger" -/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime/New() - ..() - reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("vitamin", 3) +/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime + list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry/New() - ..() - reagents.add_reagent("cherryjelly", 5) - reagents.add_reagent("vitamin", 3) +/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry + list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/burger/superbite name = "super bite burger" desc = "This is a mountain of a burger. FOOD!" icon_state = "superbiteburger" - -/obj/item/weapon/reagent_containers/food/snacks/burger/superbite/New() - ..() - reagents.add_reagent("nutriment", 40) - bitesize = 10 + list_reagents = list("nutriment" = 46, "vitamin" = 5) diff --git a/code/modules/food&drinks/food/snacks_cake.dm b/code/modules/food&drinks/food/snacks_cake.dm index d72dec3a3f3..23eb7834a55 100644 --- a/code/modules/food&drinks/food/snacks_cake.dm +++ b/code/modules/food&drinks/food/snacks_cake.dm @@ -5,20 +5,13 @@ icon_state = "carrotcake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/carrotcake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("oculine", 10) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice name = "carrot cake slice" desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." icon_state = "carrotcake_slice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/braincake name = "brain cake" @@ -26,20 +19,13 @@ icon_state = "braincake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/braincake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("alkysine", 10) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 20, "alkysine" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/braincakeslice name = "brain cake slice" desc = "Lemme tell you something about prions. THEY'RE DELICIOUS." icon_state = "braincakeslice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/cheesecake name = "cheese cake" @@ -47,19 +33,13 @@ icon_state = "cheesecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/cheesecake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 20, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice name = "cheese cake slice" desc = "Slice of pure cheestisfaction." icon_state = "cheesecake_slice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/plaincake name = "vanilla cake" @@ -67,18 +47,13 @@ icon_state = "plaincake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/plaincake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) + list_reagents = list("nutriment" = 20, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice name = "vanilla cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "plaincake_slice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/orangecake name = "orange cake" @@ -86,18 +61,13 @@ icon_state = "orangecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/orangecake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) + list_reagents = list("nutriment" = 20, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice name = "orange cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "orangecake_slice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/limecake name = "lime cake" @@ -105,18 +75,12 @@ icon_state = "limecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/limecake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) - + list_reagents = list("nutriment" = 20, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/limecakeslice name = "lime cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "limecake_slice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/lemoncake name = "lemon cake" @@ -124,18 +88,13 @@ icon_state = "lemoncake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/lemoncake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) + list_reagents = list("nutriment" = 20, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice name = "lemon cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "lemoncake_slice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/chocolatecake name = "chocolate cake" @@ -143,18 +102,13 @@ icon_state = "chocolatecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/chocolatecake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) + list_reagents = list("nutriment" = 20, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice name = "chocolate cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "chocolatecake_slice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/birthdaycake name = "birthday cake" @@ -162,20 +116,13 @@ icon_state = "birthdaycake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/birthdaycake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("sprinkles", 10) - reagents.add_reagent("vitamin", 5) - bitesize = 3 + list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice name = "birthday cake slice" desc = "A slice of your birthday." icon_state = "birthdaycakeslice" trash = /obj/item/trash/plate - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/applecake name = "apple cake" @@ -183,15 +130,10 @@ icon_state = "applecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/applecakeslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/applecake/New() - ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent("vitamin", 5) + list_reagents = list("nutriment" = 20, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/applecakeslice name = "apple cake slice" desc = "A slice of heavenly cake." icon_state = "applecakeslice" trash = /obj/item/trash/plate - bitesize = 2 diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm index 00a9825d034..ee277292cac 100644 --- a/code/modules/food&drinks/food/snacks_egg.dm +++ b/code/modules/food&drinks/food/snacks_egg.dm @@ -5,23 +5,13 @@ name = "chocolate egg" desc = "Such, sweet, fattening food." icon_state = "chocolateegg" - -/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sugar", 2) - reagents.add_reagent("coco", 2) - bitesize = 2 + list_reagents = list("nutriment" = 4, "sugar" = 2, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/egg name = "egg" desc = "An egg!" icon_state = "egg" - -/obj/item/weapon/reagent_containers/food/snacks/egg/New() - ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("vitamin", 1) + list_reagents = list("nutriment" = 1, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom) ..() @@ -80,32 +70,21 @@ name = "fried egg" desc = "A fried egg, with a touch of salt and pepper." icon_state = "friedegg" - -/obj/item/weapon/reagent_containers/food/snacks/friedegg/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("blackpepper", 1) + list_reagents = list("nutriment" = 2, "sodiumchloride" = 1, "blackpepper" = 1, "vitamin" = 1) bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/boiledegg name = "boiled egg" desc = "A hard boiled egg." icon_state = "egg" - -/obj/item/weapon/reagent_containers/food/snacks/boiledegg/New() - ..() - reagents.add_reagent("nutriment", 2) + list_reagents = list("nutriment" = 2, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS name = "omelette du fromage" desc = "That's all you can say!" icon_state = "omelette" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/omelette/New() - ..() - reagents.add_reagent("nutriment", 8) + list_reagents = list("nutriment" = 7, "vitamin" = 2) bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user) @@ -128,9 +107,4 @@ name = "eggs benedict" desc = "There is only one egg on this, how rude." icon_state = "benedict" - -/obj/item/weapon/reagent_containers/food/snacks/benedict/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 4) - bitesize = 3 + list_reagents = list("nutriment" = 6, "vitamin" = 4) diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm index 191739db7da..3620ce27943 100644 --- a/code/modules/food&drinks/food/snacks_meat.dm +++ b/code/modules/food&drinks/food/snacks_meat.dm @@ -8,25 +8,18 @@ desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" icon_state = "cubancarp" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("capsaicin", 3) + list_reagents = list("nutriment" = 6, "vitamin" = 3) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/carpmeat name = "carp fillet" desc = "A fillet of spess carp meat." icon_state = "fishfillet" + list_reagents = list("nutriment" = 2, "carpotoxin" = 2, "vitamin" = 2) + bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/carpmeat/New() - ..() eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("carpotoxin", 2) - reagents.add_reagent("vitamin", 2) - bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation name = "imitation carp fillet" @@ -36,21 +29,14 @@ name = "fish fingers" desc = "A finger of fish." icon_state = "fishfingers" - -/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New() - ..() - reagents.add_reagent("nutriment", 4) - bitesize = 3 + list_reagents = list("nutriment" = 4) + bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/fishandchips name = "fish and chips" desc = "I do say so myself chap." icon_state = "fishandchips" - -/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 3 + list_reagents = list("nutriment" = 6) ////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// @@ -58,162 +44,95 @@ name = "tofu" desc = "We all love tofu." icon_state = "tofu" - -/obj/item/weapon/reagent_containers/food/snacks/tofu/New() - ..() - reagents.add_reagent("nutriment", 3) - bitesize = 3 - + list_reagents = list("nutriment" = 2) /obj/item/weapon/reagent_containers/food/snacks/tomatomeat name = "tomato slice" desc = "A slice from a huge tomato." icon_state = "tomatomeat" - -/obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New() - ..() - reagents.add_reagent("nutriment", 3) - src.bitesize = 3 + list_reagents = list("nutriment" = 2) /obj/item/weapon/reagent_containers/food/snacks/bearmeat name = "bear meat" desc = "A very manly slab of meat." icon_state = "bearmeat" - -/obj/item/weapon/reagent_containers/food/snacks/bearmeat/New() - ..() - reagents.add_reagent("nutriment", 12) - reagents.add_reagent("morphine", 5) - reagents.add_reagent("vitamin", 2) - src.bitesize = 3 + list_reagents = list("nutriment" = 12, "morphine" = 5, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/xenomeat name = "meat" desc = "A slab of meat" icon_state = "xenomeat" - -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("vitamin", 1) - src.bitesize = 3 + list_reagents = list("nutriment" = 3, "vitamin" = 1) + bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/spidermeat name = "spider meat" desc = "A slab of spider meat." icon_state = "spidermeat" - -/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("toxin", 3) - reagents.add_reagent("vitamin", 1) - bitesize = 3 + list_reagents = list("nutriment" = 3, "toxin" = 3, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/spiderleg name = "spider leg" desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?" icon_state = "spiderleg" - -/obj/item/weapon/reagent_containers/food/snacks/spiderleg/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("toxin", 2) - bitesize = 2 + list_reagents = list("nutriment" = 2, "toxin" = 2) /obj/item/weapon/reagent_containers/food/snacks/cornedbeef name = "corned beef and cabbage" desc = "Now you can feel like a real tourist vacationing in Ireland." icon_state = "cornedbeef" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/cornedbeef/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 3 + list_reagents = list("nutriment" = 6) /obj/item/weapon/reagent_containers/food/snacks/faggot name = "faggot" desc = "A great meal all round. Not a cord of wood." icon_state = "faggot" - -/obj/item/weapon/reagent_containers/food/snacks/faggot/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 1, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/sausage name = "sausage" desc = "A piece of mixed, long meat." icon_state = "sausage" + list_reagents = list("nutriment" = 5, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/sausage/New() - ..() eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 1) - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/wingfangchu name = "wing fang chu" desc = "A savory dish of alien wing wang in soy." icon_state = "wingfangchu" trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 2) - bitesize = 2 + list_reagents = list("nutriment" = 6, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/human/kebab name = "-kebab" icon_state = "kebab" desc = "A human meat, on a stick." trash = /obj/item/stack/rods - -/obj/item/weapon/reagent_containers/food/snacks/human/kebab/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 + list_reagents = list("nutriment" = 8) /obj/item/weapon/reagent_containers/food/snacks/monkeykebab name = "meat-kebab" icon_state = "kebab" desc = "Delicious meat, on a stick." trash = /obj/item/stack/rods - -/obj/item/weapon/reagent_containers/food/snacks/monkeykebab/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 + list_reagents = list("nutriment" = 8) /obj/item/weapon/reagent_containers/food/snacks/tofukebab name = "tofu-kebab" icon_state = "kebab" desc = "Vegan meat, on a stick." trash = /obj/item/stack/rods - -/obj/item/weapon/reagent_containers/food/snacks/tofukebab/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 + list_reagents = list("nutriment" = 8) /obj/item/weapon/reagent_containers/food/snacks/meatsteak name = "meat steak" desc = "A piece of hot spicy meat." icon_state = "meatsteak" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("vitamin", 1) - bitesize = 3 + list_reagents = list("nutriment" = 8, "sodiumchloride" = 1, "blackpepper" = 1, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/monkeycube name = "monkey cube" @@ -221,10 +140,7 @@ icon_state = "monkeycube" bitesize = 12 wrapped = 0 - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New() - ..() - reagents.add_reagent("nutriment",10) + list_reagents = list("nutriment" = 10) /obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user,proximity) if(!proximity) return @@ -250,7 +166,6 @@ user << "You unwrap the cube." wrapped = 0 - /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped desc = "Still wrapped in some paper." icon_state = "monkeycubewrap" @@ -260,11 +175,7 @@ name = "enchiladas" desc = "Viva La Mexico!" icon_state = "enchiladas" - -/obj/item/weapon/reagent_containers/food/snacks/enchiladas/New() - ..() - reagents.add_reagent("nutriment",8) - reagents.add_reagent("capsaicin", 6) + list_reagents = list("nutriment" = 8, "capsaicin" = 6) bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/stew @@ -272,80 +183,39 @@ desc = "A nice and warm stew. Healthy and strong." icon_state = "stew" trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 10, "tomatojuice" = 5, "oculine" = 5, "water" = 5) + bitesize = 10 /obj/item/weapon/reagent_containers/food/snacks/stew/New() - ..() eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("oculine", 5) - reagents.add_reagent("water", 5) - bitesize = 10 /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat name = "stewed soy meat" desc = "Even non-vegetarians will LOVE this!" icon_state = "stewedsoymeat" trash = /obj/item/trash/plate + list_reagents = list("nutriment" = 8) /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New() - ..() eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 8) - bitesize = 2 - - -/* No more of this -/obj/item/weapon/reagent_containers/food/snacks/telebacon - name = "tele bacon" - desc = "It tastes a little odd but it is still delicious." - icon_state = "bacon" - var/obj/item/device/radio/beacon/bacon/baconbeacon - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/telebacon/New() - ..() - reagents.add_reagent("nutriment", 4) - baconbeacon = new /obj/item/device/radio/beacon/bacon(src) -/obj/item/weapon/reagent_containers/food/snacks/telebacon/On_Consume() - if(!reagents.total_volume) - baconbeacon.loc = usr - baconbeacon.digest_delay() -*/ - /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg name = "boiled spider leg" desc = "A giant spider's leg that's still twitching after being cooked. Gross!" icon_state = "spiderlegcooked" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("toxin", 2) - bitesize = 3 + list_reagents = list("nutriment" = 2, "capsaicin" = 2) /obj/item/weapon/reagent_containers/food/snacks/spidereggsham name = "green eggs and ham" desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" icon_state = "spidereggsham" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/spidereggsham/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("toxin", 3) + list_reagents = list("nutriment" = 6, "sodiumchloride" = 1, "toxin" = 3) bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/sashimi name = "carp sashimi" desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself." icon_state = "sashimi" - -/obj/item/weapon/reagent_containers/food/snacks/sashimi/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("toxin", 5) - bitesize = 3 + list_reagents = list("nutriment" = 6, "capsaicin" = 4) diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm index f8b392e0e61..c84c31f88e3 100644 --- a/code/modules/food&drinks/food/snacks_other.dm +++ b/code/modules/food&drinks/food/snacks_other.dm @@ -5,26 +5,14 @@ name = "candy corn" desc = "It's a handful of candy corn. Can be stored in a detective's hat." icon_state = "candy_corn" - -/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sugar", 2) - bitesize = 2 + list_reagents = list("nutriment" = 4, "sugar" = 2) /obj/item/weapon/reagent_containers/food/snacks/chocolatebar name = "chocolate bar" desc = "Such, sweet, fattening food." icon_state = "chocolatebarunwrapped" wrapped = 0 - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 2) - reagents.add_reagent("coco", 2) - reagents.add_reagent("vitamin", 1) + list_reagents = list("nutriment" = 4, "sugar" = 2, "coco" = 2, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user) if(wrapped) @@ -48,209 +36,115 @@ name = "huge mushroom slice" desc = "A slice from a huge mushroom." icon_state = "hugemushroomslice" - -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("vitamin", 1) - src.bitesize = 3 - + list_reagents = list("nutriment" = 3, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/popcorn name = "popcorn" desc = "Now let's find some cinema." icon_state = "popcorn" trash = /obj/item/trash/popcorn - var/unpopped = 0 - -/obj/item/weapon/reagent_containers/food/snacks/popcorn/New() - ..() - eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp") - unpopped = rand(1,10) - reagents.add_reagent("nutriment", 2) + list_reagents = list("nutriment" = 2) bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 -/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume() - if(prob(unpopped)) //lol ...what's the point? << AINT SO POINTLESS NO MORE - usr << "You bite down on an un-popped kernel, and it hurts your teeth!" - unpopped = max(0, unpopped-1) - reagents.add_reagent("sacid",0.1) //only a little tingle. - ..() +/obj/item/weapon/reagent_containers/food/snacks/popcorn/New() + eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp") /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato name = "loaded baked potato" desc = "Totally baked." icon_state = "loadedbakedpotato" - -/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 + list_reagents = list("nutriment" = 6) /obj/item/weapon/reagent_containers/food/snacks/fries name = "space fries" desc = "AKA: French Fries, Freedom Fries, etc." icon_state = "fries" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/fries/New() - ..() - reagents.add_reagent("nutriment", 4) - bitesize = 2 + list_reagents = list("nutriment" = 4) /obj/item/weapon/reagent_containers/food/snacks/soydope name = "soy dope" desc = "Dope from a soy." icon_state = "soydope" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/soydope/New() - ..() - reagents.add_reagent("nutriment", 2) - bitesize = 2 + list_reagents = list("nutriment" = 2) /obj/item/weapon/reagent_containers/food/snacks/cheesyfries name = "cheesy fries" desc = "Fries. Covered in cheese. Duh." icon_state = "cheesyfries" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 + list_reagents = list("nutriment" = 6) /obj/item/weapon/reagent_containers/food/snacks/badrecipe name = "burned mess" desc = "Someone should be demoted from cook for this." icon_state = "badrecipe" - -/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New() - ..() - eatverb = pick("choke down","nibble","gnaw","chomp") - reagents.add_reagent("????", 30) - bitesize = 2 + list_reagents = list("????" = 30) /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff name = "spacy liberty duff" desc = "Jello gelatin, from Alfred Hubbard's cookbook." icon_state = "spacylibertyduff" trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("mushroomhallucinogen", 6) bitesize = 3 + list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 6) /obj/item/weapon/reagent_containers/food/snacks/amanitajelly name = "amanita jelly" desc = "Looks curiously toxic." icon_state = "amanitajelly" trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("amatoxin", 6) - reagents.add_reagent("mushroomhallucinogen", 3) bitesize = 3 + list_reagents = list("nutriment" = 6, "amatoxin" = 6, "mushroomhallucinogen" = 6) /obj/item/weapon/reagent_containers/food/snacks/carrotfries name = "carrot fries" desc = "Tasty fries from fresh Carrots." icon_state = "carrotfries" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/carrotfries/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("oculine", 3) - reagents.add_reagent("vitamin", 2) - bitesize = 2 + list_reagents = list("nutriment" = 3, "oculine" = 3, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/candiedapple name = "candied apple" desc = "An apple coated in sugary sweetness." icon_state = "candiedapple" - -/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 3) bitesize = 3 + list_reagents = list("nutriment" = 3, "sugar" = 3) -/* -/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore - name = "Boiled slime Core" - desc = "A boiled red thing." - icon_state = "boiledslimecore" - -/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/New() - ..() - reagents.add_reagent("slimejelly", 5) - bitesize = 3 -*/ /obj/item/weapon/reagent_containers/food/snacks/mint name = "mint" desc = "it is only wafer thin." icon_state = "mint" - -/obj/item/weapon/reagent_containers/food/snacks/mint/New() - ..() - reagents.add_reagent("minttoxin", 1) bitesize = 1 + list_reagents = list("minttoxin" = 1) /obj/item/weapon/reagent_containers/food/snacks/wrap name = "egg wrap" desc = "The precursor to Pigs in a Blanket." icon_state = "wrap" - -/obj/item/weapon/reagent_containers/food/snacks/wrap/New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 2 + list_reagents = list("nutriment" = 5) /obj/item/weapon/reagent_containers/food/snacks/beans name = "tin of beans" desc = "Musical fruit in a slightly less musical container." icon_state = "beans" - -/obj/item/weapon/reagent_containers/food/snacks/beans/New() - ..() - reagents.add_reagent("nutriment", 10) - bitesize = 2 + list_reagents = list("nutriment" = 10) /obj/item/weapon/reagent_containers/food/snacks/spidereggs name = "spider eggs" desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health." icon_state = "spidereggs" - -/obj/item/weapon/reagent_containers/food/snacks/spidereggs/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("toxin", 3) - bitesize = 2 + list_reagents = list("nutriment" = 2, "toxin" = 2) /obj/item/weapon/reagent_containers/food/snacks/chococoin name = "chocolate coin" desc = "A completely edible but nonflippable festive coin." icon_state = "chococoin" - -/obj/item/weapon/reagent_containers/food/snacks/chococoin/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 2) - reagents.add_reagent("coco", 2) - bitesize = 2 + list_reagents = list("nutriment" = 2, "sugar" = 2, "coco" = 2) /obj/item/weapon/reagent_containers/food/snacks/chocoorange name = "chocolate orange" desc = "A festive chocolate orange" icon_state = "chocoorange" - -/obj/item/weapon/reagent_containers/food/snacks/chocoorange/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sugar", 2) - reagents.add_reagent("coco", 2) + list_reagents = list("nutriment" = 4, "sugar" = 2, "coco" = 2) diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm index 85b5231cf78..8c440f39d7f 100644 --- a/code/modules/food&drinks/food/snacks_pastry.dm +++ b/code/modules/food&drinks/food/snacks_pastry.dm @@ -1,115 +1,62 @@ //Pastry is a food that is made from dough which is made from wheat or rye flour. //This file contains pastries that don't fit any existing categories. - ////////////////////////////////////////////DONUTS//////////////////////////////////////////// /obj/item/weapon/reagent_containers/food/snacks/donut name = "donut" - icon_state = "donut1" - -/obj/item/weapon/reagent_containers/food/snacks/donut/normal desc = "Goes great with Robust Coffee." + icon_state = "donut1" + bitesize = 5 + list_reagents = list("nutriment" = 3, "sprinkles" = 1, "sugar" = 1) + var/extra_reagent = null -/obj/item/weapon/reagent_containers/food/snacks/donut/normal/New() +/obj/item/weapon/reagent_containers/food/snacks/donut/New() ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("sugar", 2) - src.bitesize = 3 if(prob(30)) - src.icon_state = "donut2" - src.name = "frosted donut" - reagents.add_reagent("sprinkles", 2) + icon_state = "donut2" + name = "frosted donut" + list_reagents.Add(, "sprinkles" = 2) /obj/item/weapon/reagent_containers/food/snacks/donut/chaos name = "chaos donut" desc = "Like life, it never quite tastes the same." + bitesize = 10 /obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("sugar", 1) - bitesize = 10 - switch(rand(1,10)) - if(1) - reagents.add_reagent("nutriment", 3) - if(2) - reagents.add_reagent("capsaicin", 3) - if(3) - reagents.add_reagent("frostoil", 3) - if(4) - reagents.add_reagent("sprinkles", 3) - if(5) - reagents.add_reagent("plasma", 3) - if(6) - reagents.add_reagent("coco", 3) - if(7) - reagents.add_reagent("slimejelly", 3) - if(8) - reagents.add_reagent("banana", 3) - if(9) - reagents.add_reagent("berryjuice", 3) - if(10) - reagents.add_reagent("omnizine", 3) + extra_reagent = pick("nutriment", "capsaicin", "frostoil", "sprinkles", "plasma", "coco", "slimejelly", "banana", "berryjuice", "omnizine") + list_reagents.Add(, extra_reagent = 3) if(prob(30)) icon_state = "donut2" name = "frosted chaos donut" - reagents.add_reagent("sprinkles", 2) - + list_reagents.Add(, "sprinkles" = 2) + ..() /obj/item/weapon/reagent_containers/food/snacks/donut/jelly name = "jelly donut" desc = "You jelly?" icon_state = "jdonut1" - bitesize = 5 + list_reagents = list("nutriment" = 3, "sprinkles" = 1, "sugar" = 1) + extra_reagent = "berryjuice" /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New() ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("berryjuice", 5) - reagents.add_reagent("vitamin", 1) + list_reagents.Add(, extra_reagent = 5) if(prob(30)) icon_state = "jdonut2" - name = "Frosted Jelly Donut" + name = "frosted jelly Donut" reagents.add_reagent("sprinkles", 2) -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly +/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly name = "jelly donut" desc = "You jelly?" icon_state = "jdonut1" - bitesize = 5 + extra_reagent = "slimejelly" -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("vitamin", 1) - bitesize = 5 - if(prob(30)) - icon_state = "jdonut2" - name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) - -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly +/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly name = "jelly donut" desc = "You jelly?" icon_state = "jdonut1" - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("cherryjelly", 5) - reagents.add_reagent("vitamin", 1) - if(prob(30)) - icon_state = "jdonut2" - name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) - + extra_reagent = "cherryjelly" ////////////////////////////////////////////MUFFINS//////////////////////////////////////////// @@ -117,11 +64,7 @@ name = "muffin" desc = "A delicious and spongy little cake." icon_state = "muffin" - -/obj/item/weapon/reagent_containers/food/snacks/muffin/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 + list_reagents = list("nutriment" = 6) /obj/item/weapon/reagent_containers/food/snacks/muffin/berry name = "berry muffin" @@ -139,11 +82,8 @@ desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat." icon_state = "chawanmushi" trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 6) -/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 1 ////////////////////////////////////////////WAFFLES//////////////////////////////////////////// /obj/item/weapon/reagent_containers/food/snacks/waffles @@ -151,49 +91,29 @@ desc = "Mmm, waffles." icon_state = "waffles" trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/waffles/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 7, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/soylentgreen name = "\improper Soylent Green" desc = "Not made of people. Honest." //Totally people. icon_state = "soylent_green" trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New() - ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 9, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/soylenviridians name = "\improper Soylent Virdians" desc = "Not made of people. Honest." //Actually honest for once. icon_state = "soylent_yellow" trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New() - ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 9, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles name = "roffle waffles" desc = "Waffles from Roffle. Co." icon_state = "rofflewaffles" trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("mushroomhallucinogen", 8) - reagents.add_reagent("vitamin", 2) bitesize = 4 + list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 8, "vitamin" = 2) ////////////////////////////////////////////OTHER//////////////////////////////////////////// @@ -201,122 +121,75 @@ name = "cookie" desc = "COOKIE!!!" icon_state = "COOKIE!!!" - -/obj/item/weapon/reagent_containers/food/snacks/cookie/New() - ..() - reagents.add_reagent("nutriment", 5) bitesize = 1 + list_reagents = list("nutriment" = 5) /obj/item/weapon/reagent_containers/food/snacks/donkpocket name = "\improper Donk-pocket" desc = "The food of choice for the seasoned traitor." icon_state = "donkpocket" - -/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New() - ..() - reagents.add_reagent("nutriment", 4) + list_reagents = list("nutriment" = 4) /obj/item/weapon/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" desc = "A true prophecy in each cookie!" icon_state = "fortune_cookie" - -/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New() - ..() - reagents.add_reagent("nutriment", 3) - bitesize = 2 + list_reagents = list("nutriment" = 3) /obj/item/weapon/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" desc = "It's all twisted up!" icon_state = "poppypretzel" - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 2 - + list_reagents = list("nutriment" = 5) /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." icon_state = "phelmbiscuit" - + list_reagents = list("nutriment" = 5, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New() ..() if(prob(10)) name = "exceptional plump helmet biscuit" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("omnizine", 5) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents.Add(, "omnizine" = 5) /obj/item/weapon/reagent_containers/food/snacks/appletart name = "golden apple streusel tart" desc = "A tasty dessert that won't make it through a metal detector." icon_state = "gappletart" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/appletart/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("gold", 5) - reagents.add_reagent("vitamin", 4) bitesize = 3 + list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4) /obj/item/weapon/reagent_containers/food/snacks/cracker name = "cracker" desc = "It's a salted cracker." icon_state = "cracker" - -/obj/item/weapon/reagent_containers/food/snacks/cracker/New() - ..() - reagents.add_reagent("nutriment", 1) + bitesize = 1 + list_reagents = list("nutriment" = 1) /obj/item/weapon/reagent_containers/food/snacks/hotdog name = "hotdog" desc = "Fresh footlong ready to go down on." icon_state = "hotdog" - -/obj/item/weapon/reagent_containers/food/snacks/hotdog/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("ketchup", 3) - reagents.add_reagent("vitamin", 3) bitesize = 3 + list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3) /obj/item/weapon/reagent_containers/food/snacks/meatbun name = "meat bun" desc = "Has the potential to not be Dog." icon_state = "meatbun" - -/obj/item/weapon/reagent_containers/food/snacks/meatbun/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 2) - bitesize = 6 + list_reagents = list("nutriment" = 4, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/sugarcookie name = "sugar cookie" desc = "Just like your little sister used to make." icon_state = "sugarcookie" - -/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 3) - bitesize = 2 + list_reagents = list("nutriment" = 3, "sugar" = 3) /obj/item/weapon/reagent_containers/food/snacks/chococornet/ name = "chocolate cornet" desc = "Which side's the head, the fat end or the thin end?" icon_state = "chococornet" - -/obj/item/weapon/reagent_containers/food/snacks/chococornet/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("vitamin", 1) \ No newline at end of file + list_reagents = list("nutriment" = 6, "sodiumchloride" = 1, "vitamin" = 1) diff --git a/code/modules/food&drinks/food/snacks_pie.dm b/code/modules/food&drinks/food/snacks_pie.dm index 2937ee70a55..706d267a252 100644 --- a/code/modules/food&drinks/food/snacks_pie.dm +++ b/code/modules/food&drinks/food/snacks_pie.dm @@ -4,13 +4,7 @@ desc = "Just like back home, on clown planet! HONK!" icon_state = "pie" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/pie/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("banana",5) - reagents.add_reagent("vitamin", 2) - bitesize = 3 + list_reagents = list("nutriment" = 4, "banana" = 5, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom) ..() @@ -23,100 +17,59 @@ desc = "No black birds, this is a good sign." icon_state = "berryclafoutis" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("berryjuice", 5) - reagents.add_reagent("vitamin", 2) - bitesize = 3 + list_reagents = list("nutriment" = 4, "berryjuice" = 5, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/meatpie name = "meat-pie" icon_state = "meatpie" desc = "An old barber recipe, very delicious!" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/meatpie/New() - ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/tofupie name = "tofu-pie" icon_state = "meatpie" desc = "A delicious tofu pie." trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/tofupie/New() - ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("vitamin", 2) - bitesize = 2 + list_reagents = list("nutriment" = 10, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/amanita_pie name = "amanita pie" desc = "Sweet and tasty poison pie." icon_state = "amanita_pie" - -/obj/item/weapon/reagent_containers/food/snacks/amanita_pie/New() - ..() - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("amatoxin", 3) - reagents.add_reagent("mushroomhallucinogen", 1) - reagents.add_reagent("vitamin", 4) bitesize = 4 + list_reagents = list("nutriment" = 5, "amatoxin" = 3, "mushroomhallucinogen" = 1, "vitamin" = 4) /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" - + list_reagents = list("nutriment" = 8, "vitamin" = 4) /obj/item/weapon/reagent_containers/food/snacks/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("omnizine", 5) - - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 4) - bitesize = 2 + list_reagents.Add(, "omnizine" = 5) /obj/item/weapon/reagent_containers/food/snacks/xemeatpie name = "xeno-pie" icon_state = "xenomeatpie" desc = "A delicious meatpie. Probably heretical." trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/xemeatpie/New() - ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 10, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/applepie name = "apple pie" desc = "A pie containing sweet sweet love...or apple." icon_state = "applepie" - -/obj/item/weapon/reagent_containers/food/snacks/applepie/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("vitamin", 2) - bitesize = 3 + list_reagents = list("nutriment" = 4, "vitamin" = 3) /obj/item/weapon/reagent_containers/food/snacks/cherrypie name = "cherry pie" desc = "Taste so good, make a grown man cry." icon_state = "cherrypie" - -/obj/item/weapon/reagent_containers/food/snacks/cherrypie/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("vitamin", 2) - bitesize = 3 + list_reagents = list("nutriment" = 4, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie name = "pumpkin pie" @@ -124,15 +77,11 @@ icon_state = "pumpkinpie" slice_path = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice slices_num = 5 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie/New() - ..() - reagents.add_reagent("nutriment", 15) - reagents.add_reagent("vitamin", 3) + list_reagents = list("nutriment" = 15, "vitamin" = 3) /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice name = "pumpkin pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate - bitesize = 2 + diff --git a/code/modules/food&drinks/food/snacks_pizza.dm b/code/modules/food&drinks/food/snacks_pizza.dm index 6b370d5dcb2..1767faa7aca 100644 --- a/code/modules/food&drinks/food/snacks_pizza.dm +++ b/code/modules/food&drinks/food/snacks_pizza.dm @@ -10,19 +10,12 @@ icon_state = "pizzamargherita" slice_path = /obj/item/weapon/reagent_containers/food/snacks/margheritaslice slices_num = 6 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita/New() - ..() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("tomatojuice", 6) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/margheritaslice name = "margherita slice" desc = "A slice of the most cheezy pizza in galaxy." icon_state = "pizzamargheritaslice" - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza name = "meatpizza" @@ -30,19 +23,12 @@ icon_state = "meatpizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice slices_num = 6 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza/New() - ..() - reagents.add_reagent("nutriment", 40) - reagents.add_reagent("tomatojuice", 6) - reagents.add_reagent("vitamin", 8) - bitesize = 2 + list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 8) /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice name = "meatpizza slice" desc = "A nutritious slice of meatpizza." icon_state = "meatpizzaslice" - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza name = "mushroom pizza" @@ -50,18 +36,12 @@ icon_state = "mushroompizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice slices_num = 6 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/New() - ..() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 30, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice name = "mushroom pizza slice" desc = "Maybe it is the last slice of pizza in your life." icon_state = "mushroompizzaslice" - bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza name = "vegetable pizza" @@ -69,20 +49,12 @@ icon_state = "vegetablepizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice slices_num = 6 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/New() - ..() - reagents.add_reagent("nutriment", 25) - reagents.add_reagent("tomatojuice", 6) - reagents.add_reagent("oculine", 12) - reagents.add_reagent("vitamin", 5) - bitesize = 2 + list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5) /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice 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/pizzabox name = "pizza box" diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/food&drinks/food/snacks_salad.dm index 35d5a0f66ac..25fac8df5c8 100644 --- a/code/modules/food&drinks/food/snacks_salad.dm +++ b/code/modules/food&drinks/food/snacks_salad.dm @@ -1,41 +1,26 @@ //this category is very little but I think that it has great potential to grow ////////////////////////////////////////////SALAD//////////////////////////////////////////// +/obj/item/weapon/reagent_containers/food/snacks/salad + trash = /obj/item/trash/snack_bowl + bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/aesirsalad +/obj/item/weapon/reagent_containers/food/snacks/salad/New() + eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") + +/obj/item/weapon/reagent_containers/food/snacks/salad/aesirsalad name = "\improper Aesir salad" desc = "Probably too incredible for mortal men to fully enjoy." icon_state = "aesirsalad" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "tomatojuice" = 8, "vitamin" = 6) -/obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New() - ..() - eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("omnizine", 8) - reagents.add_reagent("vitamin", 6) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/herbsalad +/obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad name = "herb salad" desc = "A tasty salad with apples on top." icon_state = "herbsalad" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "vitamin" = 2) -/obj/item/weapon/reagent_containers/food/snacks/herbsalad/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 2) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/validsalad +/obj/item/weapon/reagent_containers/food/snacks/salad/validsalad name = "valid salad" desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." icon_state = "validsalad" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/validsalad/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("doctorsdelight", 5) - reagents.add_reagent("vitamin", 2) - bitesize = 3 \ No newline at end of file + list_reagents = list("nutriment" = 8, "doctorsdelight" = 5, "vitamin" = 2) diff --git a/code/modules/food&drinks/food/snacks_sandwichtoast.dm b/code/modules/food&drinks/food/snacks_sandwichtoast.dm index 3b086bf6194..fb507194f10 100644 --- a/code/modules/food&drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food&drinks/food/snacks_sandwichtoast.dm @@ -4,109 +4,62 @@ desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." icon_state = "sandwich" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/sandwich/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 6, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich name = "toasted sandwich" desc = "Now if you only had a pepper bar." icon_state = "toastedsandwich" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("carbon", 2) - bitesize = 2 + list_reagents = list("nutriment" = 6, "carbon" = 2) /obj/item/weapon/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" desc = "Goes great with Tomato soup!" icon_state = "toastedsandwich" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese/New() - ..() - reagents.add_reagent("nutriment", 7) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 7, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/jellysandwich name = "jelly sandwich" desc = "You wish you had some peanut butter to go with this..." icon_state = "jellysandwich" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/New() - ..() - reagents.add_reagent("nutriment", 2) bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime/New() - ..() - reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("vitamin", 2) - -/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry/New() - ..() - reagents.add_reagent("cherryjelly", 5) - reagents.add_reagent("vitamin", 2) +/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime + list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2) +/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry + list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich name = "icecream sandwich" desc = "Portable Ice-cream in it's own packaging." icon_state = "icecreamsandwich" - -/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("ice", 2) - bitesize = 2 + list_reagents = list("nutriment" = 2, "ice" = 2) /obj/item/weapon/reagent_containers/food/snacks/notasandwich name = "not-a-sandwich" desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." icon_state = "notasandwich" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/notasandwich/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 6) - bitesize = 2 + list_reagents = list("nutriment" = 6, "vitamin" = 6) /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast name = "jellied toast" desc = "A slice of bread covered with delicious jam." icon_state = "jellytoast" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/New() - ..() - reagents.add_reagent("nutriment", 1) bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry/New() - ..() - reagents.add_reagent("cherryjelly", 5) - reagents.add_reagent("vitamin", 2) +/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry + list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2) -/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime/New() - ..() - reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("vitamin", 2) +/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime + list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/twobread name = "two bread" desc = "This seems awfully bitter." icon_state = "twobread" - -/obj/item/weapon/reagent_containers/food/snacks/twobread/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("vitamin", 2) - bitesize = 3 + list_reagents = list("nutriment" = 2, "vitamin" = 2) diff --git a/code/modules/food&drinks/food/snacks_soup.dm b/code/modules/food&drinks/food/snacks_soup.dm index 92fbe50250b..11e94bc0347 100644 --- a/code/modules/food&drinks/food/snacks_soup.dm +++ b/code/modules/food&drinks/food/snacks_soup.dm @@ -1,247 +1,111 @@ +/obj/item/weapon/reagent_containers/food/snacks/soup + bitesize = 5 + trash = /obj/item/trash/snack_bowl -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup +/obj/item/weapon/reagent_containers/food/snacks/soup/New() + ..() + eatverb = pick("slurp","sip","suck","inhale","drink") + +/obj/item/weapon/reagent_containers/food/snacks/soup/meatballsoup name = "meatball soup" desc = "You've got balls kid, BALLS!" icon_state = "meatballsoup" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("water", 5) - reagents.add_reagent("vitamin", 4) - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/slimesoup +/obj/item/weapon/reagent_containers/food/snacks/soup/slimesoup name = "slime soup" desc = "If no water is available, you may substitute tears." icon_state = "slimesoup" + list_reagents = list("nutriment" = 2, "slimejelly" = 5, "water" = 10, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/slimesoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("water", 10) - reagents.add_reagent("vitamin", 5) - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/bloodsoup +/obj/item/weapon/reagent_containers/food/snacks/soup/bloodsoup name = "tomato soup" desc = "Smells like copper." icon_state = "tomatosoup" + list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 6) -/obj/item/weapon/reagent_containers/food/snacks/bloodsoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("blood", 10) - reagents.add_reagent("water", 5) - reagents.add_reagent("vitamin", 5) - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/clownstears +/obj/item/weapon/reagent_containers/food/snacks/soup/clownstears name = "clown's tears" desc = "Not very funny." icon_state = "clownstears" + list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 10, "vitamin" = 8) -/obj/item/weapon/reagent_containers/food/snacks/clownstears/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("banana", 5) - reagents.add_reagent("water", 10) - reagents.add_reagent("vitamin", 8) - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup +/obj/item/weapon/reagent_containers/food/snacks/soup/vegetablesoup name = "vegetable soup" desc = "A true vegan meal." icon_state = "vegetablesoup" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4) -/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("water", 5) - reagents.add_reagent("vitamin", 5) - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/nettlesoup +/obj/item/weapon/reagent_containers/food/snacks/soup/nettlesoup name = "nettle soup" desc = "To think, the botanist would've beat you to death with one of these." icon_state = "nettlesoup" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "omnizine" = 5, "water" = 6, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/nettlesoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("water", 5) - reagents.add_reagent("omnizine", 5) - reagents.add_reagent("vitamin", 5) - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/mysterysoup +/obj/item/weapon/reagent_containers/food/snacks/soup/mysterysoup name = "mystery soup" desc = "The mystery is, why aren't you eating it?" icon_state = "mysterysoup" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/mysterysoup/New() + list_reagents = list("nutriment" = 6, "tomatojuice" = 2) + var/extra_reagent = null +/obj/item/weapon/reagent_containers/food/snacks/soup/mysterysoup/New() + extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine") + list_reagents.Add(, extra_reagent = 5) ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - switch(rand(1,10)) - if(1) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("capsaicin", 3) - reagents.add_reagent("tomatojuice", 2) - if(2) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("frostoil", 3) - reagents.add_reagent("tomatojuice", 2) - if(3) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("water", 5) - reagents.add_reagent("omnizine", 5) - if(4) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("water", 10) - if(5) - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("banana", 10) - if(6) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("blood", 10) - if(7) - reagents.add_reagent("slimejelly", 10) - reagents.add_reagent("water", 10) - if(8) - reagents.add_reagent("carbon", 10) - reagents.add_reagent("toxin", 10) - if(9) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("tomatojuice", 10) - if(10) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("oculine", 5) - bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/wishsoup +/obj/item/weapon/reagent_containers/food/snacks/soup/wishsoup name = "wish soup" desc = "I wish this was soup." icon_state = "wishsoup" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/wishsoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("water", 10) - bitesize = 5 +/obj/item/weapon/reagent_containers/food/snacks/soup/wishsoup/New() if(prob(25)) desc = "A wish come true!" - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 1) + list_reagents = list("nutriment" = 9, "vitamin" = 1) + else + list_reagents = list("water" = 10) + ..() -/obj/item/weapon/reagent_containers/food/snacks/hotchili +/obj/item/weapon/reagent_containers/food/snacks/soup/hotchili name = "hot chili" desc = "A five alarm Texan Chili!" icon_state = "hotchili" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2) -/obj/item/weapon/reagent_containers/food/snacks/hotchili/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("capsaicin", 1) - reagents.add_reagent("tomatojuice", 2) - reagents.add_reagent("vitamin", 2) - bitesize = 5 - - -/obj/item/weapon/reagent_containers/food/snacks/coldchili +/obj/item/weapon/reagent_containers/food/snacks/soup/coldchili name = "cold chili" desc = "This slush is barely a liquid!" icon_state = "coldchili" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2) -/obj/item/weapon/reagent_containers/food/snacks/coldchili/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("frostoil", 1) - reagents.add_reagent("tomatojuice", 2) - reagents.add_reagent("vitamin", 2) - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight +/obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight name = "monkey's delight" desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas." icon_state = "monkeysdelight" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 10, "banana" = 5, "blackpepper" = 1, "sodiumchloride" = 1, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight/New() - ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("banana", 5) - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("vitamin", 5) - bitesize = 4 - -/obj/item/weapon/reagent_containers/food/snacks/tomatosoup +/obj/item/weapon/reagent_containers/food/snacks/soup/tomatosoup name = "tomato soup" desc = "Drinking this feels like being a vampire! A tomato vampire..." icon_state = "tomatosoup" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "tomatojuice" = 10, "vitamin" = 3) -/obj/item/weapon/reagent_containers/food/snacks/tomatosoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("tomatojuice", 10) - reagents.add_reagent("vitamin", 3) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/milosoup +/obj/item/weapon/reagent_containers/food/snacks/soup/milosoup name = "milosoup" desc = "The universes best soup! Yum!!!" icon_state = "milosoup" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 3) -/obj/item/weapon/reagent_containers/food/snacks/milosoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("water", 5) - reagents.add_reagent("vitamin", 3) - bitesize = 4 - -/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup +/obj/item/weapon/reagent_containers/food/snacks/soup/mushroomsoup name = "chantrelle soup" desc = "A delicious and hearty mushroom soup." icon_state = "mushroomsoup" - trash = /obj/item/trash/snack_bowl + list_reagents = list("nutriment" = 8, "vitamin" = 5) -/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 4) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/beetsoup +/obj/item/weapon/reagent_containers/food/snacks/soup/beetsoup name = "beet soup" desc = "Wait, how do you spell it again..?" icon_state = "beetsoup" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/beetsoup/New() + list_reagents = list("nutriment" = 8,"vitamin" = 5) +/obj/item/weapon/reagent_containers/food/snacks/soup/beetsoup/New() ..() - eatverb = pick("slurp","sip","suck","inhale","drink") name = pick("borsch","bortsch","borstch","borsh","borshch","borscht") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 4) - bitesize = 2 diff --git a/code/modules/food&drinks/food/snacks_spaghetti.dm b/code/modules/food&drinks/food/snacks_spaghetti.dm index 0d6224a080c..da698fae091 100644 --- a/code/modules/food&drinks/food/snacks_spaghetti.dm +++ b/code/modules/food&drinks/food/snacks_spaghetti.dm @@ -3,82 +3,47 @@ name = "spaghetti" desc = "Now that's a nic'e pasta!" icon_state = "spaghetti" - -/obj/item/weapon/reagent_containers/food/snacks/spaghetti/New() - ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("vitamin", 1) - bitesize = 1 + list_reagents = list("nutriment" = 1, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti name = "boiled spaghetti" desc = "A plain dish of noodles, this sucks." icon_state = "spaghettiboiled" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("vitamin", 1) - bitesize = 2 + list_reagents = list("nutriment" = 2, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/pastatomato name = "spaghetti" desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!" icon_state = "pastatomato" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/pastatomato/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("tomatojuice", 10) - reagents.add_reagent("vitamin", 4) bitesize = 4 + list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4) /obj/item/weapon/reagent_containers/food/snacks/copypasta name = "copypasta" desc = "You probably shouldn't try this, you always hear people talking about how bad it is..." icon_state = "copypasta" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/copypasta/New() - ..() - reagents.add_reagent("nutriment", 12) - reagents.add_reagent("tomatojuice", 20) - reagents.add_reagent("vitamin", 8) bitesize = 4 + list_reagents = list("nutriment" = 12, "tomatojuice" = 20, "vitamin" = 8) /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti name = "spaghetti and meatballs" desc = "Now that's a nic'e meatball!" icon_state = "meatballspaghetti" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 4) - bitesize = 3 + list_reagents = list("nutriment" = 8, "vitamin" = 4) /obj/item/weapon/reagent_containers/food/snacks/spesslaw name = "spesslaw" desc = "A lawyers favourite." icon_state = "spesslaw" - -/obj/item/weapon/reagent_containers/food/snacks/spesslaw/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("vitamin", 6) - bitesize = 3 + list_reagents = list("nutriment" = 8, "vitamin" = 6) /obj/item/weapon/reagent_containers/food/snacks/eggplantparm name = "eggplant parmigiana" desc = "The only good recipe for eggplant." icon_state = "eggplantparm" trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/eggplantparm/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("vitamin", 2) - bitesize = 2 + list_reagents = list("nutriment" = 6, "vitamin" = 3) diff --git a/code/modules/food&drinks/food/snacks_vend.dm b/code/modules/food&drinks/food/snacks_vend.dm index 404d9eeae3b..e04cb0d575b 100644 --- a/code/modules/food&drinks/food/snacks_vend.dm +++ b/code/modules/food&drinks/food/snacks_vend.dm @@ -7,79 +7,46 @@ desc = "Nougat love it or hate it." icon_state = "candy" trash = /obj/item/trash/candy - -/obj/item/weapon/reagent_containers/food/snacks/candy/New() - ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("sugar", 3) - bitesize = 2 + list_reagents = list("nutriment" = 1, "sugar" = 3) /obj/item/weapon/reagent_containers/food/snacks/sosjerky name = "\improper Scaredy's Private Reserve Beef Jerky" icon_state = "sosjerky" desc = "Beef jerky made from the finest space cows." trash = /obj/item/trash/sosjerky - -/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New() - ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("sugar", 3) - bitesize = 2 + list_reagents = list("nutriment" = 1, "sugar" = 3) /obj/item/weapon/reagent_containers/food/snacks/chips name = "chips" desc = "Commander Riker's What-The-Crisps" icon_state = "chips" trash = /obj/item/trash/chips - -/obj/item/weapon/reagent_containers/food/snacks/chips/New() - ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("sugar", 3) bitesize = 1 + list_reagents = list("nutriment" = 1, "sugar" = 3) /obj/item/weapon/reagent_containers/food/snacks/no_raisin name = "4no raisins" icon_state = "4no_raisins" desc = "Best raisins in the universe. Not sure why." trash = /obj/item/trash/raisins - -/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sugar", 4) + list_reagents = list("nutriment" = 2, "sugar" = 4) /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie name = "space twinkie" icon_state = "space_twinkie" desc = "Guaranteed to survive longer than you will." - -/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie/New() - ..() - reagents.add_reagent("sugar", 4) - bitesize = 2 + list_reagents = list("sugar" = 4) /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers name = "cheesie honkers" desc = "Bite sized cheesie snacks that will honk all over your mouth." icon_state = "cheesie_honkers" trash = /obj/item/trash/cheesie - -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New() - ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("sugar", 3) - bitesize = 2 + list_reagents = list("nutriment" = 1, "sugar" = 3) /obj/item/weapon/reagent_containers/food/snacks/syndicake name = "syndi-cakes" icon_state = "syndi_cakes" desc = "An extremely moist snack cake that tastes just as good after being nuked." trash = /obj/item/trash/syndi_cakes - -/obj/item/weapon/reagent_containers/food/snacks/syndicake/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("doctorsdelight", 5) - bitesize = 3 - + list_reagents = list("nutriment" = 4, "doctorsdelight" = 5) diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm index 96a202c12ac..ca6374da728 100644 --- a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm +++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm @@ -6,7 +6,7 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/egg ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal + result = /obj/item/weapon/reagent_containers/food/snacks/donut /datum/recipe/donut/jelly reagents = list("berryjuice" = 5, "flour" = 5) @@ -17,11 +17,11 @@ /datum/recipe/donut/jelly/slime reagents = list("slimejelly" = 5, "flour" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly /datum/recipe/donut/jelly/cherry reagents = list("cherryjelly" = 5, "flour" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly /datum/recipe/chaosdonut reagents = list("frostoil" = 5, "capsaicin" = 5, "flour" = 5) diff --git a/code/modules/food&drinks/recipes/microwave/recipes_salad.dm b/code/modules/food&drinks/recipes/microwave/recipes_salad.dm index 2ad41f702e8..dbb60ad54bd 100644 --- a/code/modules/food&drinks/recipes/microwave/recipes_salad.dm +++ b/code/modules/food&drinks/recipes/microwave/recipes_salad.dm @@ -7,9 +7,9 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, ) - result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad + result = /obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..(container) + var/obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad/being_cooked = ..(container) being_cooked.reagents.del_reagent("toxin") return being_cooked @@ -20,7 +20,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold, ) - result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad + result = /obj/item/weapon/reagent_containers/food/snacks/salad/aesirsalad /datum/recipe/salad/valid items = list( @@ -30,8 +30,8 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/potato, /obj/item/weapon/reagent_containers/food/snacks/faggot, ) - result = /obj/item/weapon/reagent_containers/food/snacks/validsalad + result = /obj/item/weapon/reagent_containers/food/snacks/salad/validsalad make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container) + var/obj/item/weapon/reagent_containers/food/snacks/salad/validsalad/being_cooked = ..(container) being_cooked.reagents.del_reagent("toxin") return being_cooked \ No newline at end of file diff --git a/code/modules/food&drinks/recipes/microwave/recipes_soup.dm b/code/modules/food&drinks/recipes/microwave/recipes_soup.dm index c5b717f3822..d7ce9e26bb9 100644 --- a/code/modules/food&drinks/recipes/microwave/recipes_soup.dm +++ b/code/modules/food&drinks/recipes/microwave/recipes_soup.dm @@ -10,7 +10,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/potato, ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatballsoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/meatballsoup /datum/recipe/soup/vegetable reagents = list("water" = 10) @@ -20,7 +20,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, /obj/item/weapon/reagent_containers/food/snacks/grown/potato, ) - result = /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/vegetablesoup /datum/recipe/soup/nettle reagents = list("water" = 10) @@ -29,11 +29,11 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/potato, /obj/item/weapon/reagent_containers/food/snacks/egg, ) - result = /obj/item/weapon/reagent_containers/food/snacks/nettlesoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/nettlesoup /datum/recipe/soup/wish reagents = list("water" = 20) - result= /obj/item/weapon/reagent_containers/food/snacks/wishsoup + result= /obj/item/weapon/reagent_containers/food/snacks/soup/wishsoup /datum/recipe/soup/hotchili items = list( @@ -41,7 +41,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) - result = /obj/item/weapon/reagent_containers/food/snacks/hotchili + result = /obj/item/weapon/reagent_containers/food/snacks/soup/hotchili /datum/recipe/soup/coldchili items = list( @@ -49,7 +49,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) - result = /obj/item/weapon/reagent_containers/food/snacks/coldchili + result = /obj/item/weapon/reagent_containers/food/snacks/soup/coldchili /datum/recipe/soup/tomato reagents = list("water" = 10) @@ -57,7 +57,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, ) - result = /obj/item/weapon/reagent_containers/food/snacks/tomatosoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomatosoup /datum/recipe/soup/milo reagents = list("water" = 10) @@ -67,7 +67,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tofu, /obj/item/weapon/reagent_containers/food/snacks/tofu, ) - result = /obj/item/weapon/reagent_containers/food/snacks/milosoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/milosoup /datum/recipe/soup/blood reagents = list("blood" = 10) @@ -75,13 +75,13 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood, ) - result = /obj/item/weapon/reagent_containers/food/snacks/bloodsoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/bloodsoup /datum/recipe/soup/slime reagents = list("water" = 10, "slimejelly" = 5) items = list( ) - result = /obj/item/weapon/reagent_containers/food/snacks/slimesoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/slimesoup /datum/recipe/soup/clownstears reagents = list("water" = 10) @@ -89,7 +89,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/banana, /obj/item/weapon/ore/bananium, ) - result = /obj/item/weapon/reagent_containers/food/snacks/clownstears + result = /obj/item/weapon/reagent_containers/food/snacks/soup/clownstears /datum/recipe/soup/mystery reagents = list("water" = 10) @@ -99,14 +99,14 @@ /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) - result = /obj/item/weapon/reagent_containers/food/snacks/mysterysoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/mysterysoup /datum/recipe/soup/mushroom reagents = list("water" = 5, "milk" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle, ) - result = /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/mushroomsoup /datum/recipe/soup/beet reagents = list("water" = 10) @@ -114,7 +114,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet, /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, ) - result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup + result = /obj/item/weapon/reagent_containers/food/snacks/soup/beetsoup /datum/recipe/soup/monkeysdelight reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 5) @@ -122,4 +122,4 @@ /obj/item/weapon/reagent_containers/food/snacks/monkeycube, /obj/item/weapon/reagent_containers/food/snacks/grown/banana, ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight + result = /obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 80d825eb1f1..ac7987afa5b 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -24,7 +24,7 @@ /obj/item/weapon/reagent_containers/pill/patch/styptic name = "styptic powder patch" desc = "Helps with brute injuries." - list_reagents = list("stpytic_powder" = 25) + list_reagents = list("styptic_powder" = 25) /obj/item/weapon/reagent_containers/pill/patch/silver_sulf name = "silver sulfadiazine patch" diff --git a/tgstation.dme b/tgstation.dme index 0d147d3ca6a..feeddd14159 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -929,7 +929,6 @@ #include "code\modules\food&drinks\drinks\drinks.dm" #include "code\modules\food&drinks\drinks\drinks\bottle.dm" #include "code\modules\food&drinks\drinks\drinks\drinkingglass.dm" -#include "code\modules\food&drinks\drinks\drinks\bottle\robot.dm" #include "code\modules\food&drinks\food\condiment.dm" #include "code\modules\food&drinks\food\snacks.dm" #include "code\modules\food&drinks\food\snacks_bread.dm"