From 3537646c1016c2ad40a940d46f2a221e38d609de Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 2 Dec 2019 11:43:27 -0500 Subject: [PATCH] Dragor Vendor Changes - Hot drinks reduced to 2 thalers - Ramen reduced to 2 thalers - Skrellsnax reduced to 2 thalers - Protein Shake reduced to 15 thalers - Towel reduced to 20 thalers - Protein container (Empty) reduced to 1 thaler - Number of protein shakes per vendor increased to 16 - Liquidprotein cost reduced to 5 thaler --- code/game/machinery/vending.dm | 22 +++++++++++++--------- code/game/machinery/vending_vr.dm | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 48f9e3c4f23..e58568e35c7 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -752,7 +752,7 @@ vend_power_usage = 85000 //85 kJ to heat a 250 mL cup of coffee products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10) - prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 3, /obj/item/weapon/reagent_containers/food/drinks/tea = 3, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 3) + prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 2, /obj/item/weapon/reagent_containers/food/drinks/tea = 2, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2) //VOREStation Edit /obj/machinery/vending/snack name = "Getmore Chocolate Corp" @@ -764,10 +764,12 @@ /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/snacks/tastybread = 6, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 3) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,/obj/item/weapon/reagent_containers/food/snacks/unajerky = 6,) - prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,/obj/item/weapon/reagent_containers/food/snacks/chips = 1, + //VOREStation Edit Start + prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 2,/obj/item/weapon/reagent_containers/food/snacks/chips = 1, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1, - /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 4) - + /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 2) + //VOREStation Edit End + /obj/machinery/vending/cola name = "Robust Softdrinks" desc = "A softdrink vendor provided by Robust Industries, LLC." @@ -794,7 +796,7 @@ icon_state = "fitness" products = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 8, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 8, - /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 8, + /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 16, //VOREStation Edit, /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, @@ -802,15 +804,17 @@ ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, /obj/item/weapon/towel/random = 8) + //VOREStation Edit Start prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 3, - /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 40, //VOREStation Edit, - /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 5, + /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 15, + /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 1, /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, - ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, - /obj/item/weapon/towel/random = 40) + ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, + /obj/item/weapon/towel/random = 20) + //VOREStation Edit End contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4) diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index f96cd830295..8ccc64bdaf8 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -129,7 +129,7 @@ /obj/machinery/vending/fitness/New() products += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 8) - prices += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 10) + prices += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 5) ..() /obj/machinery/vending/blood