diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 007fc2f5f7e..e6bf09f19af 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -788,16 +788,16 @@ /obj/machinery/vending/snack name = "Getmore Chocolate Corp" desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" - product_slogans = "Try our new nougat bar!;Twice the calories for half the price!;Now featuring Discount Dan's food line!" + product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" icon_state = "snack" products = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candybar = 6,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/weapon/reagent_containers/food/snacks/chips =6, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6, - /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6,/obj/item/weapon/reagent_containers/food/drinks/dansoup/random = 20,/obj/item/weapon/reagent_containers/food/snacks/danburrito/random = 20) + /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candybar = 20,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 30, /obj/item/weapon/reagent_containers/food/snacks/chips =25,/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 30,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 20, - /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 30,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 25,/obj/item/weapon/reagent_containers/food/drinks/dansoup/random = 10,/obj/item/weapon/reagent_containers/food/snacks/danburrito/random = 12) + /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 30,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 25) refill_canister = /obj/item/weapon/vending_refill/snack /obj/machinery/vending/snack/New() @@ -845,20 +845,6 @@ component_parts += new /obj/item/weapon/vending_refill/cola(0) component_parts += new /obj/item/weapon/vending_refill/cola(0) -//New Cola Machine -/obj/machinery/vending/soda - name = "Donk Co. Cola" - desc = "A cola vendor provided by Donk Company, Inc." - icon_state = "soda" - product_slogans = "Donk Co. Cola: Refreshing, delicious, and robust!" - product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." - products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/robust = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/pubber = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/grifeo = 10, - /obj/item/weapon/reagent_containers/food/drinks/cans/grones = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/runoff = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/horror = 10, - /obj/item/weapon/reagent_containers/food/drinks/cans/orangeaid = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/limeaid = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/decirprevo = 10) - prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/robust = 35, /obj/item/weapon/reagent_containers/food/drinks/cans/pubber = 35, /obj/item/weapon/reagent_containers/food/drinks/cans/grifeo = 35, - /obj/item/weapon/reagent_containers/food/drinks/cans/grones = 35, /obj/item/weapon/reagent_containers/food/drinks/cans/runoff = 35, /obj/item/weapon/reagent_containers/food/drinks/cans/horror = 35, - /obj/item/weapon/reagent_containers/food/drinks/cans/orangeaid = 50, /obj/item/weapon/reagent_containers/food/drinks/cans/limeaid = 50, /obj/item/weapon/reagent_containers/food/drinks/cans/decirprevo = 60) - //This one's from bay12 /obj/machinery/vending/cart diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 898d3c18e8a..cc265f9b1fe 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -317,97 +317,4 @@ icon_state = "sodawater" New() ..() - reagents.add_reagent("sodawater", 50) - -//Donk Co. Cola// - -/obj/item/weapon/reagent_containers/food/drinks/cans/pubber - name = "Dr. Pubber" - desc = "The beverage of an original crowd. Tastes like an industrial tranquilizer." - icon_state = "dr_gibb" - New() - ..() - reagents.add_reagent("haloperidol", 4) - reagents.add_reagent("morphine", 4) - reagents.add_reagent("vhfcs", 10) - reagents.add_reagent("cola", 12) - -/obj/item/weapon/reagent_containers/food/drinks/cans/robust - name = "Robust-Eeze" - desc = "A carbonated robustness tonic. It has quite a kick." - icon_state = "cola" - New() - ..() - reagents.add_reagent("methamphetamine", 3) - reagents.add_reagent("vhfcs", 10) - reagents.add_reagent("cola", 17) - -/obj/item/weapon/reagent_containers/food/drinks/cans/grifeo - name = "Grife-O" - desc = "The carbonated beverage of a space generation. Contains actual space dust!" - icon_state = "griefo" - New() - ..() - reagents.add_reagent("radium", 3) - reagents.add_reagent("ephedrine", 6) - reagents.add_reagent("vhfcs", 10) - reagents.add_reagent("cola", 11) - -/obj/item/weapon/reagent_containers/food/drinks/cans/orangeaid - name = "Orange-Aid" - desc = "A vitamin tonic that promotes good eyesight and health." - icon_state = "starkist" - New() - ..() - reagents.add_reagent("orangejuice", 20) - reagents.add_reagent("oculine", 20) - -/obj/item/weapon/reagent_containers/food/drinks/cans/limeaid - name = "Lime-Aid" - desc = "Antihol mixed with lime juice. A well-known cure for hangovers." - icon_state = "space-up" - New() - ..() - reagents.add_reagent("limejuice", 20) - reagents.add_reagent("antihol", 20) - -/obj/item/weapon/reagent_containers/food/drinks/cans/runoff - name = "Spooky Dan's Runoffa Cola" - desc = "A spoooky cola for Halloween! Rumors that Runoff Cola contains actual industrial runoff are unsubstantiated." - icon_state = "purple_can" - New() - ..() - reagents.add_reagent("chlorine", 5) - reagents.add_reagent("phosphorus", 5) - reagents.add_reagent("mercury", 5) - reagents.add_reagent("vhfcs", 10) - reagents.add_reagent("cola", 15) - -/obj/item/weapon/reagent_containers/food/drinks/cans/horror - name = "Spooky Dan's Horrortastic Cola" - desc = "A terrifying Halloween soda. It's especially frightening if you're diabetic." - icon_state = "glowingbeer" - New() - ..() - reagents.add_reagent("ectoplasm", 10) - reagents.add_reagent("sulfur", 5) - reagents.add_reagent("vhfcs", 5) - reagents.add_reagent("cola", 20) - -/obj/item/weapon/reagent_containers/food/drinks/cans/grones - name = "Grones Soda" - desc = "Bursting with 10 different flavors!" - icon_state = "grones" - New() - ..() - reagents.add_reagent("cola", 20) - reagents.add_reagent(pick("atropine","serotrotium","lithium","mercury","charcoal","diphenhydramine","spaceacillin","hairgrownium","ephedrine","capsaicin"), 10) - -/obj/item/weapon/reagent_containers/food/drinks/cans/decirprevo - name = "Decirprevo Bottled Water" - desc = "Bottled from our cool natural springs on Europa." - icon_state = "waterbottle" - New() - ..() - reagents.add_reagent("water", 45) - reagents.add_reagent("iodine", 5) \ No newline at end of file + reagents.add_reagent("sodawater", 50) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 9d52b6e701e..b2e6c9d7970 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -365,211 +365,3 @@ desc = "A cup with the british flag emblazoned on it." icon_state = "britcup" volume = 30 - -////Stinkeye/// Holy buns don't ever drink this -Fox - -/obj/item/weapon/reagent_containers/food/drinks/stinkeye - name = "Stinkeye's Special Reserve" - desc = "An old bottle labelled 'The Good Stuff'. This probably has enough kick to knock an elephant on its ass." - icon_state = "whiskeybottle" - volume = 250 - New() - ..() - reagents.add_reagent("beer", 30) - reagents.add_reagent("wine", 30) - reagents.add_reagent("cider", 30) - reagents.add_reagent("vodka", 30) - reagents.add_reagent("ethanol", 30) - reagents.add_reagent("eyenewt", 30) - -////Discount Dan's Soup////// May God have mercy on your souls---and stomachs. -Fox - - -/obj/item/weapon/reagent_containers/food/drinks/dansoup - name = "Discount Dan's Quik-Noodles" - desc = "A self-heating cup of noodles. There's enough sodium in these to put the Dead Sea to shame." - icon_state = "dansoup" - volume = 65 - var/selfheat = 0 - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/attack_self(mob/user as mob) //self-heating action! - if(selfheat) - return - else - selfheat = 1 - user << "You twist the bottom of the cup. The cup emits a soft clack as the heater triggers." - reagents.add_reagent("pyrosium", 2) - reagents.add_reagent("oxygen", 2) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/random - New() - ..() - var/list/list = typesof(/obj/item/weapon/reagent_containers/food/drinks/dansoup) - list(/obj/item/weapon/reagent_containers/food/drinks/dansoup,/obj/item/weapon/reagent_containers/food/drinks/dansoup/random) - var/T = pick(list) - new T(loc) - spawn(0) - del src - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/bbq - name = "Devil Dan's Quik-Noodles - Brimstone BBQ Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("sulfur", 5) - reagents.add_reagent("beff", 5) -// reagents.add_reagent("ghostchili", 5) uncomment once ghost chili juice is added - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/macaroni - name = "Discount Dan's Quik-Noodles - Macaroni and Imitation Processed Cheese Product Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 9) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("fake_cheese", 2) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/beef - name = "Comrade Dan's Quik-Noodles - Beef Perestroikanoff Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("milk", 3) - reagents.add_reagent("enzyme", 3) - reagents.add_reagent("beff", 4) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/teriyaki - name = "Discount Deng's Quik-Noodles - Teriyaki TVP Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("hydrogenated_soybeanoil", 1) - reagents.add_reagent("msg", 14) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("synthflesh", 5) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/gamer - name = "Dan's Quik-Noodles - Gamer Grubs Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("????", 10) - reagents.add_reagent("potassium", 5) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/mushroom - name = "Frycook Dan's Quik-Noodles - Mushroom-Swiss Burger-Bake Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("beff", 2) - reagents.add_reagent("weird_cheese", 2) - reagents.add_reagent("psilocybin", 6) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/ketchup - name = "Frycook Dan's Quik-Noodles - Curly Fry Ketchup Hoedown Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("hydrogenated_soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("tomatojuice", 4) - reagents.add_reagent("mugwort", 3) - reagents.add_reagent("capsaicin", 3) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/sundae - name = "Dessert Dan's Quik-Noodles - Sweet Sundae Noodle Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("vhfcs", 10) - reagents.add_reagent("chocolate", 2) - reagents.add_reagent("cream", 2) - reagents.add_reagent("chocolate_milk", 6) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/tuna - name = "Descuento Danito's Quik-Noodles - Tuna Melt Taco Fiesta Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("fake_cheese", 3) - reagents.add_reagent("mercury", 3) - reagents.add_reagent("capsaicin", 4) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/lomein - name = "Discount Deng's Quik-Noodles - Sweet and Sour Lo Mein Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("sacid", 3) - reagents.add_reagent("vhfcs", 7) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/crab - name = "Pirate Dan's Quik-Noodles - Spicy Imitation Crab Meat Paste Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("synthflesh", 3) - reagents.add_reagent("saltpetre", 3) - reagents.add_reagent("capsaicin", 14) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/sausage - name = "Morning Dan's Quik-Noodles - Mechanically Reclaimed Sausage Biscuit Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("hydrogenated_soybeanoil", 4) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("ammonia", 3) - reagents.add_reagent("gravy", 4) - reagents.add_reagent("coffee", 3) - -/obj/item/weapon/reagent_containers/food/drinks/dansoup/italian - name = "Sconto Danilo's Quik-Noodles - Italian Strozzapreti Lunare Flavor" - New() - ..() - reagents.add_reagent("chicken_soup", 10) - reagents.add_reagent("soybeanoil", 1) - reagents.add_reagent("msg", 9) - reagents.add_reagent("sodiumchloride", 10) - reagents.add_reagent("nicotine", 8) - reagents.add_reagent("tomatojuice", 4) - reagents.add_reagent("wine", 2) - reagents.add_reagent("water", 2) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 8ffb4c7b0fd..8cc0229c548 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3381,119 +3381,4 @@ icon_state = "ectoplasm" New() ..() - reagents.add_reagent("ectoplasm", 10) - -////Discount Dan's Burritos////// May God have mercy on your souls---and stomachs. -Fox - -/obj/item/weapon/reagent_containers/food/snacks/danburrito - name = "Discount Dan's Burrito" - desc = "Quite possibly the worst burrito in all of space." - icon_state = "danburrito" - bitesize = 10 - var/selfheat = 0 - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/attack_self(mob/user as mob) //self-heating action! - if(selfheat) - return - else - selfheat = 1 - user << "You crack the burrito like a glow stick, activating the heater mechanism." - reagents.add_reagent("pyrosium", 2) - reagents.add_reagent("oxygen", 2) - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/random - New() - ..() - var/list/list = typesof(/obj/item/weapon/reagent_containers/food/snacks/danburrito) - list(/obj/item/weapon/reagent_containers/food/snacks/danburrito,/obj/item/weapon/reagent_containers/food/snacks/danburrito/random) - var/T = pick(list) - new T(loc) - spawn(0) - del src - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/pizza - name = "Sconto Danilo's Burritos - 50% Real Mozzarella Pepperoni Pizza Party Flavor" - desc = "A self-heating pizza burrito." - New() - ..() - reagents.add_reagent("soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("fake_cheese", 3) - reagents.add_reagent("cheese", 3) - reagents.add_reagent("pepperoni", 3) - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/pancake - name = "Descuento Danito's Burritos - Pancake Sausage Brunch Flavor" - desc = "A self-heating breakfast burrito with a buttermilk pancake in lieu of a tortilla. A little frightening." - New() - ..() - reagents.add_reagent("hydrogenated_soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("porktonium", 4) - reagents.add_reagent("vhfcs", 2) - reagents.add_reagent("coffee", 4) - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/beans - name = "Descuento Danito's Burritos - Spicy Beans and Wieners Ole! Flavor" - desc = "A self-heating convenience reinterpretation of Mexican cuisine. The exact mechanism used to heat it is probably best left to speculation." - New() - ..() - reagents.add_reagent("soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("lithium", 4) - reagents.add_reagent("capsaicin", 6) - reagents.add_reagent("beans", 10) - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/homestyle - name = "Descuento Danito's Burritos - Homestyle Comfort Flavor" - desc = "A self-heating burrito just like Mom used to make, if your mother was a souless, automated burrito production line." - New() - ..() - reagents.add_reagent("soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("mashedpotatoes", 5) - reagents.add_reagent("gravy", 3) - reagents.add_reagent("diethylamine", 2) - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/texas - name = "Spooky Dan's BOO-ritos - Texas Toast Chainsaw Massacre Flavor" - desc = "A self-heating burrito. Isn't that concept scary enough on its own?" - New() - ..() - reagents.add_reagent("soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("fake_cheese", 3) - reagents.add_reagent("space_drugs", 3) -// reagents.add_reagent("cblood", 4) uncomment once actual changeling blood is added - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/beff - name = "Descuento Danito's Burritos - Beff and Bean Flavor" - desc = "A self-heating convenience reinterpretation of Mexican cuisine. The exact mechanism used to heat it is probably best left to speculation." - New() - ..() - reagents.add_reagent("hydrogenated_soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("uranium", 2) - reagents.add_reagent("beff", 4) - reagents.add_reagent("fake_cheese", 4) - reagents.add_reagent("beans", 10) - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/nightmare - name = "Spooky Dan's BOO-ritos - Nightmare on Elm Meat Flavor" - desc = "A self-heating burrito that purports to contain elm-smoked meat. Of some sort. Probably from an animal." - New() - ..() - reagents.add_reagent("soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("beff", 3) - reagents.add_reagent("synthflesh", 2) - reagents.add_reagent("tonguedog", 9) - -/obj/item/weapon/reagent_containers/food/snacks/danburrito/strawberry - name = "Descuento Danito's Burritos - Strawberrito Churro Flavor" - desc = "There is no way anyone could possibly justify this." - New() - ..() - reagents.add_reagent("soybeanoil", 3) - reagents.add_reagent("msg", 9) - reagents.add_reagent("vhfcs", 8) - reagents.add_reagent("oil", 2) \ No newline at end of file + reagents.add_reagent("ectoplasm", 10) \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 28d5636923e..1e9e95508ef 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index d60299f846d..df9b971041a 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ