Merge pull request #1710 from Yoshax/fitnessvendor

Adds a new vending machine that vends fitness related products

code/game/machinery/vending.dm

@@ -1047,3 +1047,24 @@
 					/obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5)
 	//everything after the power cell had no amounts, I improvised.  -Sayu
 
+/obj/machinery/vending/fitness
+	name = "SweatMAX"
+	desc = "Fueled by your inner inadequacy!"
+	icon_state = "fitness"
+	products = list(/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton = 8,
+					/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate = 8,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake = 8,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask = 8,
+					/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 8,
+					/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8,
+					/obj/item/weapon/reagent_containers/pill/diet = 8)
+
+	prices = list(/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton = 3,
+					/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate = 3,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake = 20,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask = 5,
+					/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5,
+					/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5,
+					/obj/item/weapon/reagent_containers/pill/diet = 25)
+
+	contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4)

code/game/objects/items/trash.dm

@@ -9,11 +9,15 @@
 
 /obj/item/trash/raisins
 	name = "\improper 4no raisins"
-	icon_state= "4no_raisins"
+	icon_state = "4no_raisins"
 
 /obj/item/trash/candy
 	name = "candy"
-	icon_state= "candy"
+	icon_state = "candy"
+
+/obj/item/trash/candy/proteinbar
+	name = "protein bar"
+	icon_state = "proteinbar"
 
 /obj/item/trash/cheesie
 	name = "\improper Cheesie Honkers"

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

@@ -548,6 +548,16 @@
 	cup_name = "cup of milk"
 	cup_desc = "White and nutritious goodness!"
 
+/datum/reagent/drink/milk/chocolate
+	name =  "Chocolate Milk"
+	id = "chocolate_milk"
+	description = "A delicious mixture of perfectly healthy mix and terrible chocolate."
+	color = "#74533b"
+
+	glass_icon_state = "glass_brown"
+	cup_name = "cup of chocolate milk"
+	cup_desc = "Deliciously fattening!"
+
 /datum/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
 	if(alien == IS_DIONA)

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -123,6 +123,23 @@
 	..()
 	reagents.add_reagent("soymilk", 50)
 
+/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton
+	name = "Small Carton of Milk"
+	volume = 30
+	icon_state = "mini-milk"
+/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/New()
+	..()
+	reagents.add_reagent("milk", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate
+	name = "Small Carton of Chocolate Milk"
+	desc = "It's milk! This one is in delicious chocolate flavour."
+
+/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate/New()
+	..()
+	reagents.add_reagent("chocolate_milk", 30)
+
+
 /obj/item/weapon/reagent_containers/food/drinks/coffee
 	name = "Robust Coffee"
 	desc = "Careful, the beverage you're about to enjoy is extremely hot."

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -133,3 +133,46 @@
 		name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
 	else
 		name = "shot glass"
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask
+	name = "fitness shaker"
+	desc = "Big enough to contain enough protein to get perfectly swole. Don't mind the bits."
+	icon_state = "fitness-cup_black"
+	volume = 100
+	matter = list("plastic" = 2000)
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/New()
+	..()
+	icon_state = pick("fitness-cup_black", "fitness-cup_red", "fitness-cup_black")
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/on_reagent_change()
+	overlays.Cut()
+
+	if(reagents.total_volume)
+		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "fitness-cup10")
+
+		switch(reagents.total_volume)
+			if(0 to 10)			filling.icon_state = "fitness-cup10"
+			if(11 to 20)		filling.icon_state = "fitness-cup20"
+			if(21 to 29)		filling.icon_state = "fitness-cup30"
+			if(30 to 39)		filling.icon_state = "fitness-cup40"
+			if(40 to 49)		filling.icon_state = "fitness-cup50"
+			if(50 to 59)		filling.icon_state = "fitness-cup60"
+			if(60 to 69)		filling.icon_state = "fitness-cup70"
+			if(70 to 79)		filling.icon_state = "fitness-cup80"
+			if(80 to 89)		filling.icon_state = "fitness-cup90"
+			if(90 to INFINITY)	filling.icon_state = "fitness-cup100"
+
+		filling.color += reagents.get_color()
+		overlays += filling
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake
+	name = "protein shake"
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake/New()
+	..()
+	reagents.add_reagent("nutriment", 30)
+	reagents.add_reagent("iron", 10)
+	reagents.add_reagent("protein", 15)
+	reagents.add_reagent("water", 45)
+	on_reagent_change()

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -273,6 +273,19 @@
 	reagents.add_reagent("sugar", 3)
 	bitesize = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar
+	name = "protein bar"
+	desc = "SwoleMAX brand protein bars, guaranteed to get you feeling perfectly overconfident."
+	icon_state = "proteinbar"
+	trash = /obj/item/trash/candy/proteinbar
+
+/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar/New()
+	..()
+	reagents.add_reagent("nutriment", 9)
+	reagents.add_reagent("protein", 4)
+	reagents.add_reagent("sugar", 4)
+	bitesize = 6
+
 /obj/item/weapon/reagent_containers/food/snacks/candy/donor
 	name = "Donor Candy"
 	desc = "A little treat for blood donors."

code/modules/reagents/reagent_containers/pill.dm

@@ -294,3 +294,12 @@
 /obj/item/weapon/reagent_containers/pill/spaceacillin/New()
 	..()
 	reagents.add_reagent("spaceacillin", 15)
+
+/obj/item/weapon/reagent_containers/pill/diet
+	name = "diet pill"
+	desc = "Guaranteed to get you slim!"
+	icon_state = "pill9"
+
+/obj/item/weapon/reagent_containers/pill/diet/New()
+	..()
+	reagents.add_reagent("lipozine", 2)

code/modules/reagents/reagent_containers/syringes.dm

@@ -344,3 +344,12 @@
 	reagents.add_reagent("chloralhydrate", 50)
 	mode = SYRINGE_INJECT
 	update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/steroid
+	name = "Syringe (anabolic steroids)"
+	desc = "Contains drugs for muscle growth."
+
+/obj/item/weapon/reagent_containers/syringe/steroid/New()
+	..()
+	reagents.add_reagent("adrenaline",5)
+	reagents.add_reagent("hyperzine",10)