diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f3cfc9bcff0..bb0fc377345 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -796,6 +796,28 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 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. +/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/glass2/fitnessflask/proteinshake = 8, + /obj/item/weapon/reagent_containers/food/drinks/glass2/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/glass2/fitnessflask/proteinshake = 20, + /obj/item/weapon/reagent_containers/food/drinks/glass2/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) + //This one's from bay12 /obj/machinery/vending/cart name = "PTech" @@ -1052,25 +1074,3 @@ /obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, /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) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index e0bca7f3f9c..55a50bc925e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -542,13 +542,14 @@ description = "A delicious mixture of perfectly healthy mix and terrible chocolate." color = "#74533b" - glass_name = "glass of chocolate milk" - glass_desc = "Delciously fattening!" - cup_icon_state = "cup_brown" cup_name = "cup of chocolate milk" cup_desc = "Deliciously fattening!" + glass_name = "chocolate milk" + glass_desc = "Deliciously fattening!" + + /datum/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien == IS_DIONA) diff --git a/code/modules/reagents/reagent_containers/drinkingglass/extras.dm b/code/modules/reagents/reagent_containers/drinkingglass/extras.dm index 513c1b87caa..5a92b61c889 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/extras.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/extras.dm @@ -12,6 +12,9 @@ else user << "There's no space to put \the [GE] on \the [src]!" else if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/fruit_slice)) + if(!rim_pos) + user << "There's no space to put \the [I] on \the [src]!" + return var/obj/item/weapon/reagent_containers/food/snacks/fruit_slice/FS = I extras += FS user.remove_from_mob(FS) diff --git a/code/modules/reagents/reagent_containers/drinkingglass/shaker.dm b/code/modules/reagents/reagent_containers/drinkingglass/shaker.dm new file mode 100644 index 00000000000..b653f14c603 --- /dev/null +++ b/code/modules/reagents/reagent_containers/drinkingglass/shaker.dm @@ -0,0 +1,31 @@ +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask + name = "fitness shaker" + base_name = "shaker" + desc = "Big enough to contain enough protein to get perfectly swole. Don't mind the bits." + icon_state = "fitness-cup_black" + base_icon = "fitness-cup" + volume = 100 + matter = list("plastic" = 2000) + filling_states = list(10,20,30,40,50,60,70,80,90,100) + possible_transfer_amounts = list(5, 10, 15, 25) + rim_pos = null // no fruit slices + var/lid_color = "black" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/New() + ..() + lid_color = pick("black", "red", "blue") + update_icon() + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/update_icon() + ..() + icon_state = "[base_icon]_[lid_color]" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake + name = "protein shake" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/New() + ..() + reagents.add_reagent("nutriment", 30) + reagents.add_reagent("iron", 10) + reagents.add_reagent("protein", 35) + reagents.add_reagent("water", 25) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index dea0da4180f..b28c16691f6 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -102,7 +102,7 @@ // Formatting is the same as food. /obj/item/weapon/reagent_containers/food/drinks/milk - name = "Space Milk" + name = "milk carton" desc = "It's milk. White and nutritious goodness!" icon_state = "milk" item_state = "carton" @@ -113,7 +113,7 @@ reagents.add_reagent("milk", 50) /obj/item/weapon/reagent_containers/food/drinks/soymilk - name = "SoyMilk" + name = "soymilk carton" desc = "It's soy milk. White and nutritious goodness!" icon_state = "soymilk" item_state = "carton" @@ -123,7 +123,7 @@ reagents.add_reagent("soymilk", 50) /obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton - name = "Small Carton of Milk" + name = "small chocolate milk carton" volume = 30 icon_state = "mini-milk" /obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/New() @@ -140,7 +140,7 @@ /obj/item/weapon/reagent_containers/food/drinks/coffee - name = "Robust Coffee" + name = "\improper Robust Coffee" desc = "Careful, the beverage you're about to enjoy is extremely hot." icon_state = "coffee" center_of_mass = list("x"=15, "y"=10) @@ -149,7 +149,7 @@ reagents.add_reagent("coffee", 30) /obj/item/weapon/reagent_containers/food/drinks/tea - name = "Duke Purple Tea" + name = "cup of 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 = "teacup" item_state = "coffee" @@ -160,7 +160,7 @@ reagents.add_reagent("tea", 30) /obj/item/weapon/reagent_containers/food/drinks/ice - name = "Ice Cup" + name = "cup of ice" desc = "Careful, cold ice, do not chew." icon_state = "coffee" center_of_mass = list("x"=15, "y"=10) @@ -169,7 +169,7 @@ reagents.add_reagent("ice", 30) /obj/item/weapon/reagent_containers/food/drinks/h_chocolate - name = "Dutch Hot Coco" + name = "cup of Dutch hot coco" desc = "Made in Space South America." icon_state = "hot_coco" item_state = "coffee" @@ -189,7 +189,7 @@ reagents.add_reagent("dry_ramen", 30) /obj/item/weapon/reagent_containers/food/drinks/sillycup - name = "Paper Cup" + name = "paper cup" desc = "A paper water cup." icon_state = "water_cup_e" possible_transfer_amounts = null @@ -211,7 +211,7 @@ // icon states. /obj/item/weapon/reagent_containers/food/drinks/shaker - name = "Shaker" + name = "shaker" desc = "A metal shaker to mix drinks in." icon_state = "shaker" amount_per_transfer_from_this = 10 @@ -228,7 +228,7 @@ center_of_mass = list("x"=17, "y"=7) /obj/item/weapon/reagent_containers/food/drinks/flask - name = "Captain's Flask" + name = "\improper Captain's flask" desc = "A metal flask belonging to the captain" icon_state = "flask" volume = 60 @@ -245,7 +245,7 @@ icon_state = "lithiumflask" /obj/item/weapon/reagent_containers/food/drinks/flask/detflask - name = "Detective's Flask" + name = "\improper Detective's flask" desc = "A metal flask with a leather band and golden badge belonging to the detective." icon_state = "detflask" volume = 60 diff --git a/icons/pdrink.dmi b/icons/pdrink.dmi index c1d49bc91cf..dbbed71d511 100644 Binary files a/icons/pdrink.dmi and b/icons/pdrink.dmi differ diff --git a/polaris.dme b/polaris.dme index 437d9e4f4a1..04264abf061 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1726,6 +1726,7 @@ #include "code\modules\reagents\reagent_containers\drinkingglass\extras.dm" #include "code\modules\reagents\reagent_containers\drinkingglass\glass_boxes.dm" #include "code\modules\reagents\reagent_containers\drinkingglass\glass_types.dm" +#include "code\modules\reagents\reagent_containers\drinkingglass\shaker.dm" #include "code\modules\reagents\reagent_containers\food\cans.dm" #include "code\modules\reagents\reagent_containers\food\condiment.dm" #include "code\modules\reagents\reagent_containers\food\drinks.dm"