From 9d9720ed216b60cfd204121a818f23f255bdf993 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 22 Mar 2020 15:30:29 -0400 Subject: [PATCH] QoL Vendor Reorganisation Moves Bowls and Glasses to top of vendors. --- code/modules/vending/boozeomat.dm | 6 +++--- code/modules/vending/drinnerware.dm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 6f42cefd41..5a6380c322 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -3,7 +3,9 @@ desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." icon_state = "boozeomat" icon_deny = "boozeomat-deny" - products = list(/obj/item/reagent_containers/food/drinks/bottle/gin = 5, + products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 30, + /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12, + /obj/item/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, /obj/item/reagent_containers/food/drinks/bottle/tequila = 5, /obj/item/reagent_containers/food/drinks/bottle/vodka = 5, @@ -27,9 +29,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 8, - /obj/item/reagent_containers/food/drinks/drinkingglass = 30, /obj/item/reagent_containers/food/drinks/ice = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12, /obj/item/reagent_containers/food/drinks/flask = 3, /obj/item/reagent_containers/food/drinks/beer = 6) contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12, diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index be74cc675b..8f257d07ec 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -3,7 +3,8 @@ desc = "A kitchen and restaurant equipment vendor." product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." icon_state = "dinnerware" - products = list(/obj/item/storage/bag/tray = 8, + products = list(/obj/item/reagent_containers/glass/bowl = 30, + /obj/item/storage/bag/tray = 8, /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, /obj/item/kitchen/rollingpin = 4, @@ -17,8 +18,7 @@ /obj/item/reagent_containers/food/condiment/pack/bbqsauce = 5, /obj/item/reagent_containers/food/condiment/pack/soysauce = 5, /obj/item/reagent_containers/food/condiment/saltshaker = 5, - /obj/item/reagent_containers/food/condiment/peppermill = 5, - /obj/item/reagent_containers/glass/bowl = 30) + /obj/item/reagent_containers/food/condiment/peppermill = 5) contraband = list( /obj/item/reagent_containers/food/snacks/monkeycube = 1, /obj/item/kitchen/knife/butcher = 2,