diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 788ee12ba20..a3c040d4aa0 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -85,7 +85,8 @@ prob(5);/obj/machinery/vending/sovietvend, prob(5);/obj/machinery/vending/radren, prob(3);/obj/machinery/vending/altevian, - prob(5);/obj/machinery/vending/desatti) //VOREStation Edit End + prob(5);/obj/machinery/vending/desatti, + prob(5);/obj/machinery/vending/nukie) //VOREStation Edit End /obj/random/vendorfood //Random food vendors for station use name = "random snack vending machine" @@ -114,7 +115,8 @@ /obj/machinery/vending/cola/soft, /obj/machinery/vending/bepis, /obj/machinery/vending/sovietsoda, - /obj/machinery/vending/radren) + /obj/machinery/vending/radren, + /obj/machinery/vending/nukie) //VOREStation Edit End /obj/random/obstruction //Large objects to block things off in maintenance diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 4e0f4cb746d..e121f8af349 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -3570,3 +3570,31 @@ /obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg = 10, /obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie = 10 ) + +/obj/machinery/vending/nukie + name = "Nukies Energy Drinks" + desc = "A vending machine stocked full of the most potent energy drinks on the market." + icon = 'icons/obj/vending_vr.dmi' + icon_state = "nukie" + product_slogans = "Contains one gram of caffeine!;Keep going, go on forever!;It'll blow you away!;Nukies is not responsible for any deaths occurred in a period of 24 hours after consuming our products!" + product_ads = "Get your peach blasted!;Pop your cherry here!;Dare you swallow the bursting banana?;Try our limited edition flavour!" + products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_peach = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_pear = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_cherry = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_melon = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_banana = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_rose = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_lemon = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_fruit = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_special = 1) + + prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_peach = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_pear = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_cherry = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_melon = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_banana = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_rose = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_lemon = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_fruit = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_special = 100 + ) diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index fa25fc7f606..7e52a15d5c8 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -448,3 +448,104 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/alecan/Initialize() . = ..() reagents.add_reagent("ale", 30) + +/////////////////////////ENERGY DRINKS///////////////////////// + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_peach + name = "\improper Nukies - Peach Blaster" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_peach" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_peach/Initialize() + . = ..() + reagents.add_reagent("nukie_peach", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_pear + name = "\improper Nukies - Great Pear" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_pear" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_pear/Initialize() + . = ..() + reagents.add_reagent("nukie_pear", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_cherry + name = "\improper Nukies - Popping Cherry" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_cherry" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_cherry/Initialize() + . = ..() + reagents.add_reagent("nukie_cherry", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_melon + name = "\improper Nukies - Melon Squirter" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_melon" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_melon/Initialize() + . = ..() + reagents.add_reagent("nukie_melon", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_banana + name = "\improper Nukies - Bursting Banana" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_banana" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_banana/Initialize() + . = ..() + reagents.add_reagent("nukie_banana", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_rose + name = "\improper Nukies - Insatiable Rose" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_rose" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_rose/Initialize() + . = ..() + reagents.add_reagent("nukie_rose", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_lemon + name = "\improper Nukies - Citrus Got Real" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_lemon" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_lemon/Initialize() + . = ..() + reagents.add_reagent("nukie_lemon", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_fruit + name = "\improper Nukies - Swelling Fruit" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_fruit" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_fruit/Initialize() + . = ..() + reagents.add_reagent("nukie_fruit", 60) + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_special + name = "\improper Nukies - Limited Edition" + desc = "Harness the power of the atom with this over-caffinated energy drink." + icon_state = "nukie_special" + center_of_mass = list("x"=16, "y"=8) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_special/Initialize() + . = ..() + reagents.add_reagent("nukie_special", 60) diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm index 5879a8e95ac..3a2527af234 100644 --- a/code/modules/food/food/lunch.dm +++ b/code/modules/food/food/lunch.dm @@ -25,7 +25,11 @@ var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/sna /obj/item/weapon/reagent_containers/food/snacks/locust_cooked, /obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun, /obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose) + /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, + /obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll, + /obj/item/weapon/reagent_containers/food/snacks/packaged/pasty, + /obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg, + /obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie) var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, @@ -74,7 +78,11 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac /obj/item/weapon/reagent_containers/food/snacks/packaged/lunacake, /obj/item/weapon/reagent_containers/food/snacks/packaged/darklunacake, /obj/item/weapon/reagent_containers/food/snacks/packaged/mochicake, - /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie + /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie, + /obj/item/weapon/storage/box/jaffacake, + /obj/item/weapon/storage/box/winegum, + /obj/item/weapon/storage/box/custardcream, + /obj/item/weapon/storage/box/bourbon ) var/list/lunchables_drinks_ = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola, @@ -96,7 +104,15 @@ var/list/lunchables_drinks_ = list(/obj/item/weapon/reagent_containers/food/drin /obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla, /obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola, /obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola, - /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola + /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_peach, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_pear, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_cherry, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_melon, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_banana, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_rose, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_lemon, + /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_fruit ) // This default list is a bit different, it contains items we don't want diff --git a/code/modules/reagents/reagents/food_drinks_vr.dm b/code/modules/reagents/reagents/food_drinks_vr.dm index 985a223d94a..8b83c192d85 100644 --- a/code/modules/reagents/reagents/food_drinks_vr.dm +++ b/code/modules/reagents/reagents/food_drinks_vr.dm @@ -697,3 +697,76 @@ taste_description = "spicy, sour tofu" color = "#5f1b06" allergen_type = ALLERGEN_BEANS|ALLERGEN_VEGETABLE|ALLERGEN_FUNGI //tofu is soy-based, ergo, beans. base recipe also uses cabbage and mushroom. + +/////////Energy Drinks///////// + +/datum/reagent/drink/coffee/nukie + + name = "Nukie" + id = "nukie" + description = "An extremely concentrated caffinated drink." + color = "#102838" + adj_temp = 0 + adj_dizzy = 0 + adj_drowsy = -5 + adj_sleepy = -10 + + glass_name = "nukie" + glass_desc = "A drink to perk you up and refresh you!" + overdose = 30 + + taste_description = "flavourless energy" + +/datum/reagent/drink/coffee/nukie/peach + name = "Nukie Peach" + id = "nukie_peach" + color = "#ffc76e" + taste_description = "battery acid with a hint of artificial peach" + +/datum/reagent/drink/coffee/nukie/pear + name = "Nukie Pear" + id = "nukie_pear" + color = "#d4c03d" + taste_description = "electrostimulation with a hint of artificial pear" + +/datum/reagent/drink/coffee/nukie/cherry + name = "Nukie Cherry" + id = "nukie_cherry" + color = "#b00707" + taste_description = "the rapid acceleration of tooth decay with a hint of artificial cherry" + +/datum/reagent/drink/coffee/nukie/melon + name = "Nukie Melon" + id = "nukie_melon" + color = "#00bf06" + taste_description = "something is crawling under your skin with a hint of artificial melon" + +/datum/reagent/drink/coffee/nukie/banana + name = "Nukie Banana" + id = "nukie_banana" + color = "#ffee00" + taste_description = "imminent cardiac arrest with a hint of something that doesn't really taste like banana at all but is clearly intending to be banana" + +/datum/reagent/drink/coffee/nukie/rose + name = "Nukie Rose" + id = "nukie_rose" + color = "#ff7df4" + taste_description = "paint stripper, space cleaner and some sort of cheap perfume" + +/datum/reagent/drink/coffee/nukie/lemon + name = "Nukie Lemon" + id = "nukie_lemon" + color = "#c3ff00" + taste_description = "something that once resembled lemon mixed thoroughly with literal toxic waste" + +/datum/reagent/drink/coffee/nukie/fruit + name = "Nukie Fruit" + id = "nukie_fruit" + color = "#b300ff" + taste_description = "the colour purple" + +/datum/reagent/drink/coffee/nukie/special + name = "Nukie Limited Edition" + id = "nukie_special" + color = "#ffffff" + taste_description = "sitting in your college dorm one week before your exams start, staring at a screen without anything particularly interesting on, knowing that you should really be studying, but you can put it off for another day right? Plus your friends are gonna be getting on soon and there's an event starting that you need to prep for" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index be1c3a81727..b93b37da2f4 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/vending_vr.dmi b/icons/obj/vending_vr.dmi index 961483a8d22..62dbd8d72f8 100644 Binary files a/icons/obj/vending_vr.dmi and b/icons/obj/vending_vr.dmi differ