Merge pull request #1891 from CHOMPStationBot/upstream-merge-10234

[MIRROR] Bringing Back the Bepsi

code/game/machinery/vending_machines_vr.dm

@@ -3282,3 +3282,36 @@
 /obj/machinery/vending/cola/soft
 	icon = 'icons/obj/vending_vr.dmi'
 	icon_state = "Cola_Machine"
+
+//////////////////////Bepis Drinks (04/29/2021)//////////////////////
+
+/obj/machinery/vending/bepis
+	name = "Bepis Softdrinks"
+	desc = "A strange softdrink vendor that isn't owned by NanoTrasen... Why (and how) is it here?"
+	icon = 'icons/obj/vending_vr.dmi'
+	icon_state = "bepis"
+	product_slogans = "Refreshing!;Have a sip, you won't believe the taste!;Puts the 'B' in Best Soda!"
+	product_ads = "Refreshing!;Hope you're thirsty!;Please, have a drink!;Drink up!"
+	products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/bepis = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/buzz = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/shambler = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 10)
+
+	prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/bepis = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/buzz = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/shambler = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 1)
+	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
+	vending_sound = "machines/vending/vending_cans.ogg"

code/modules/food/food/cans_vr.dm

@@ -0,0 +1,75 @@
+//////////////////////Bepis Drinks (04/29/2021)//////////////////////
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bepis
+	name = "\improper Bepis"
+	desc = "It has a smell of 'off-brand' whenever you open it..."
+	description_fluff = "Puts the 'B' in Best Soda! Bepis is the number one competitor to \
+	Space Cola and has vendors scattered across the frontier. While the drink is not as \
+	popular as Space Cola, many people across known space enjoy the sweet beverage."
+	icon = 'icons/obj/drinks_vr.dmi'
+	icon_state = "bepis"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bepis/Initialize()
+	. = ..()
+	reagents.add_reagent("bepis", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew
+	name = "\improper Astro Dew Spring Water"
+	desc = "A can of refreshing 'spring' water! Or so the can claims."
+	icon = 'icons/obj/drinks_vr.dmi'
+	icon_state = "watercan"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/astrodew/Initialize()
+	. = ..()
+	reagents.add_reagent("water", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee
+	name = "\improper Caf<61> Del Consumir"
+	desc = "A can of deliciously sweet iced coffee that originates from Earth."
+	description_fluff = "Caf<61> Del Consumir originates from a small coffee brewery in M<>xico \
+	that still opperates to this day. Caf<61> Del Consumir prides itself on being true to form \
+	and retaining its original recipe. They've been producing and selling thier product across \
+	the galaxy for decades without fail. NanoTrasen has attempted to by out the small company for \
+	years now, howerver all attempts they've made have failed."
+	icon = 'icons/obj/drinks_vr.dmi'
+	icon_state = "coffeecan"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee/Initialize()
+	. = ..()
+	reagents.add_reagent("icecoffee", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/buzz
+	name = "\improper Buzz Fuzz"
+	desc = "Uses real honey, making it a sweet tooth's dream drink."
+	icon = 'icons/obj/drinks_vr.dmi'
+	icon_state = "buzzfuzz"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/buzz/Initialize()
+	. = ..()
+	reagents.add_reagent("buzz_fuzz", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/shambler
+	name = "\improper Shambler's Juice"
+	desc = "~Shake me up some of that Shambler's Juice!~"
+	icon = 'icons/obj/drinks_vr.dmi'
+	icon_state = "shambler"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/shambler/Initialize()
+	. = ..()
+	reagents.add_reagent("shamblers", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry
+	name = "\improper Sprited Cranberry"
+	desc = "A delicious blend of fresh cranberry juice and various spices, the perfect drink."
+	icon = 'icons/obj/drinks_vr.dmi'
+	icon_state = "cranberry"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/cranberry/Initialize()
+	. = ..()
+	reagents.add_reagent("sprited_cranberry", 30)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm

@@ -457,4 +457,62 @@
 		M.adjustToxLoss(removed)  //Equivalent to half as much protein, since it's half protein.
 	if(M.species.organic_food_coeff)
 		if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein
-			M.nutrition += (alt_nutriment_factor * removed)
+			M.nutrition += (alt_nutriment_factor * removed)
+
+//////////////////////Bepis Drinks (04/29/2021)//////////////////////
+
+/datum/reagent/drink/soda/bepis_cola
+	name = "Bepis"
+	id = "bepis"
+	description = "A weird cola-like beverage."
+	taste_description = "bepsi"
+	reagent_state = LIQUID
+	color = "#100800"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Bepis Cola"
+	glass_desc = "A glass of weird cola beverage."
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/soda/buzz_fuzz
+	name = "Buzz Fuzz"
+	id = "buzz_fuzz"
+	description = "A delicious frontier beverage that's simply a Hive of Flavour!"
+	taste_description = "carbonated honey and pollen"
+	reagent_state = LIQUID
+	color = "#8CFF00"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Buzz Fuzz"
+	glass_desc = "A glass that's stinging with flavour."
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/soda/sprited_cranberry
+	name = "Sprited Cranberry"
+	id = "sprited_cranberry"
+	description = "A winter spiced cranberry drink. Perfect for year-round consumption."
+	taste_description = "sweet spiced cranberry"
+	reagent_state = LIQUID
+	color = "#fffafa"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Sprited Cranberry"
+	glass_desc = "A glass of sprited cranberry"
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/soda/shamblers
+	name = "Shambler's Juice"
+	id = "shamblers"
+	description = "A strange off-brand beverage that's bursting with flavor."
+	taste_description = "carbonated metallic soda"
+	reagent_state = LIQUID
+	color = "#f00060"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Shambler's Juice"
+	glass_desc = "A glass of something shambly"
+	glass_special = list(DRINK_FIZZ)

vorestation.dme

@@ -2313,6 +2313,7 @@
 #include "code\modules\food\drinkingglass\shaker_vr.dm"
 #include "code\modules\food\food\cans.dm"
 #include "code\modules\food\food\cans_ch.dm"
+#include "code\modules\food\food\cans_vr.dm"
 #include "code\modules\food\food\condiment.dm"
 #include "code\modules\food\food\drinks.dm"
 #include "code\modules\food\food\lunch.dm"