From 52da86e2140efa649396d233dec3b8f6c356aff0 Mon Sep 17 00:00:00 2001 From: Anonmare Date: Sun, 10 Dec 2017 19:19:57 +0000 Subject: [PATCH 1/2] Fixes booze-o-mats not having booze (#33418) * Update vending.dm * Update vending.dm * Update vending_items.dm * Adds a missing close parenthisis * I'm drunk and blind, don't sue me * Update vending_items.dm * Update vending_items.dm --- code/game/machinery/vending.dm | 3 ++- code/game/objects/items/vending_items.dm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index eb51703642..444e7583e9 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -638,7 +638,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, /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/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/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) product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" diff --git a/code/game/objects/items/vending_items.dm b/code/game/objects/items/vending_items.dm index e84295f8ed..d44b933f83 100644 --- a/code/game/objects/items/vending_items.dm +++ b/code/game/objects/items/vending_items.dm @@ -37,8 +37,8 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" - charges = list(54, 4, 0)//of 159 standard, 12 contraband - init_charges = list(54, 4, 0) + charges = list(58, 4, 0)//of 174 standard, 12 contraband + init_charges = list(58, 4, 0) /obj/item/vending_refill/coffee machine_name = "Solar's Best Hot Drinks"