From 2bfbdd7d29e97959d91d87cae29f03e5af6be32b Mon Sep 17 00:00:00 2001 From: zimon9 <122945887+zimon9@users.noreply.github.com> Date: Thu, 21 Nov 2024 13:52:58 -0500 Subject: [PATCH] Modifies snack, drink, and cigarette vender costs (#3721) ## About The Pull Request This pull request reduces the cost of items in snack, drink, and cigarette venders. **Snack Vending Machines**: ![image](https://github.com/user-attachments/assets/44dfff10-8553-4032-a76f-0f625d9a46f6) **Soda Vending Machines**: ![image](https://github.com/user-attachments/assets/74c25594-2f84-4a34-a335-7eb354d41d4c) **Tea and Coffee Vending Machines**: ![image](https://github.com/user-attachments/assets/4db2db0b-b45e-4ec2-a6d3-7aa88d1a2250) **Cigarette Vending Machines**: ![image](https://github.com/user-attachments/assets/1f5cbde6-db22-4171-b12b-608f25376b80) **Drink Vending Machines**: |![image](https://github.com/user-attachments/assets/0963fee1-3446-487d-8303-29f22ef4e5bf)|![image](https://github.com/user-attachments/assets/b54ff9db-7221-4914-b6cd-dc844893496a)|![image](https://github.com/user-attachments/assets/4ecec800-2801-4a82-8177-38f3be171195)| |---|---|---| ## Why It's Good For The Game The prices of these items have been brought down from their station-era level to a price range that seems reasonable for the shiptest universe. ## Changelog :cl: balance: reduces drink and cigarette vender item costs /:cl: --------- Signed-off-by: zimon9 <122945887+zimon9@users.noreply.github.com> --- code/game/objects/items/cigs_lighters.dm | 4 +-- code/game/objects/items/storage/boxes.dm | 10 +++---- code/game/objects/items/storage/fancy.dm | 4 +-- code/modules/food_and_drinks/drinks/drinks.dm | 20 ++++++------- .../food_and_drinks/drinks/drinks/bottle.dm | 30 +++++++++---------- .../drinks/drinks/breakawayflask.dm | 2 +- .../drinks/drinks/drinkingglass.dm | 6 ++-- .../food_and_drinks/drinks/drinks/modglass.dm | 2 +- .../food_and_drinks/food/snacks_meat.dm | 2 +- .../food_and_drinks/food/snacks_vend.dm | 6 ++-- code/modules/vending/boozeomat.dm | 4 +-- code/modules/vending/cigarette.dm | 4 +-- code/modules/vending/coffee.dm | 4 +-- code/modules/vending/cola.dm | 5 ++-- code/modules/vending/snack.dm | 4 +-- 15 files changed, 53 insertions(+), 54 deletions(-) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 7e0cf768de5d..3a0d7e1f81c3 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -566,7 +566,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM heat = 1500 resistance_flags = FIRE_PROOF grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/fuel/oil = 5) - custom_price = 55 + custom_price = 5 light_system = MOVABLE_LIGHT light_range = 2 light_power = 0.6 @@ -1059,4 +1059,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM vapecolor = "ecigar" overlayname = "ecigar" chem_volume = 150 - custom_premium_price = 300 + custom_premium_price = 10 diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 065102a8c863..6386d66c3e98 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -687,7 +687,7 @@ slot_flags = ITEM_SLOT_BELT drop_sound = 'sound/items/handling/matchbox_drop.ogg' pickup_sound = 'sound/items/handling/matchbox_pickup.ogg' - custom_price = 20 + custom_price = 2 /obj/item/storage/box/matches/PopulateContents() SEND_SIGNAL(src, COMSIG_TRY_STORAGE_FILL_TYPE, /obj/item/match) @@ -1470,7 +1470,7 @@ w_class = WEIGHT_CLASS_TINY illustration = null foldable = null - custom_price = 120 + custom_price = 5 /obj/item/storage/box/gum/ComponentInitialize() . = ..() @@ -1485,7 +1485,7 @@ name = "nicotine gum packet" desc = "Designed to help with nicotine addiction and oral fixation all at once without destroying your lungs in the process. Mint flavored!" icon_state = "bubblegum_nicotine" - custom_premium_price = 275 + custom_premium_price = 10 /obj/item/storage/box/gum/nicotine/PopulateContents() for(var/i in 1 to 4) @@ -1495,8 +1495,8 @@ name = "HP+ gum packet" desc = "A seemingly homemade packaging with an odd smell. It has a weird drawing of a smiling face sticking out its tongue." icon_state = "bubblegum_happiness" - custom_price = 300 - custom_premium_price = 300 + custom_price = 10 + custom_premium_price = 10 /obj/item/storage/box/gum/happiness/Initialize() . = ..() diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index d6edfb29461a..da8ae670c882 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -196,7 +196,7 @@ slot_flags = ITEM_SLOT_BELT spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette var/candy = FALSE //for cigarette overlay - custom_price = 75 + custom_price = 10 contents_tag = "cigarette" /obj/item/storage/fancy/cigarettes/ComponentInitialize() @@ -359,7 +359,7 @@ base_icon_state = "cig_paper_pack" contents_tag = "rolling paper" spawn_type = /obj/item/rollingpaper - custom_price = 25 + custom_price = 5 /obj/item/storage/fancy/rollingpapers/ComponentInitialize() . = ..() diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 90b180587638..1caa3bcb14fa 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -233,7 +233,7 @@ /obj/item/reagent_containers/food/drinks/ice name = "ice cup" desc = "Careful, cold ice, do not chew." - custom_price = 15 + custom_price = 5 icon_state = "coffee" list_reagents = list(/datum/reagent/consumable/ice = 30) spillable = TRUE @@ -268,21 +268,21 @@ list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5) foodtype = SUGAR resistance_flags = FREEZE_PROOF - custom_price = 120 + custom_price = 5 /obj/item/reagent_containers/food/drinks/cafelatte name = "cafe latte" desc = "A nice, strong and refreshing beverage while you're reading." icon_state = "cafe_latte" list_reagents = list(/datum/reagent/consumable/cafe_latte = 30) - custom_price = 200 + custom_price = 5 /obj/item/reagent_containers/food/drinks/soylatte name = "soy latte" desc = "A nice and refreshing beverage while you're reading." icon_state = "soy_latte" list_reagents = list(/datum/reagent/consumable/soy_latte = 30) - custom_price = 200 + custom_price = 5 /obj/item/reagent_containers/food/drinks/dry_ramen name = "cup ramen" @@ -291,7 +291,7 @@ list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3) foodtype = GRAIN isGlass = FALSE - custom_price = 95 + custom_price = 5 /obj/item/reagent_containers/food/drinks/waterbottle name = "Ryuunosuke Reserve" //we still have to find a way to make multiple variants as per the plan @@ -305,7 +305,7 @@ amount_per_transfer_from_this = 10 fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90) isGlass = FALSE - custom_price = 30 + custom_price = 8 can_have_cap = TRUE // The 2 bottles have separate cap overlay icons because if the bottle falls over while bottle flipping the cap stays fucked on the moved overlay cap_icon_state = "bottle_cap_small" @@ -374,7 +374,7 @@ icon_state = "beer" list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) foodtype = SUGAR | ALCOHOL - custom_price = 60 + custom_price = 10 /obj/item/reagent_containers/food/drinks/beer/light name = "Carp Lite" @@ -388,7 +388,7 @@ item_state = "beer" list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30) foodtype = GRAIN | ALCOHOL - custom_price = 60 + custom_price = 15 /obj/item/reagent_containers/food/drinks/sillycup name = "paper cup" @@ -512,7 +512,7 @@ /obj/item/reagent_containers/food/drinks/flask name = "flask" desc = "Every good spacer knows it's a good idea to bring along a couple of pints of whiskey wherever they go." - custom_price = 200 + custom_price = 20 icon_state = "flask" custom_materials = list(/datum/material/iron=250) volume = 60 @@ -554,7 +554,7 @@ reagent_flags = NONE spillable = FALSE isGlass = FALSE - custom_price = 45 + custom_price = 5 var/pierced = FALSE obj_flags = CAN_BE_HIT diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 0aa4ac7fad38..454d5a44bc3e 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -9,7 +9,7 @@ desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents." icon_state = "glassbottle" fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90) - custom_price = 65 + custom_price = 15 amount_per_transfer_from_this = 10 volume = 100 force = 15 //Smashing bottles over someone's head hurts. @@ -32,7 +32,7 @@ desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents." icon_state = "glassbottlesmall" volume = 50 - custom_price = 55 + custom_price = 1 /obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user) if(!target) @@ -297,7 +297,7 @@ /obj/item/reagent_containers/food/drinks/bottle/orangejuice name = "orange juice" desc = "Sweet and tart orange juice. Usually found fortified to make it more nutritious. Full of vitamin C!" - custom_price = 100 + custom_price = 10 icon_state = "orangejuice" item_state = "carton" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' @@ -309,7 +309,7 @@ /obj/item/reagent_containers/food/drinks/bottle/lemonjuice name = "lemon juice" desc = "Lemonade for everyone!" - custom_price = 100 + custom_price = 10 icon_state = "lemonjuice" item_state = "carton" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' @@ -321,7 +321,7 @@ /obj/item/reagent_containers/food/drinks/bottle/cream name = "milk cream" desc = "Cream made from milk. It's thicker than milk, which hopefully prevents any mixups." - custom_price = 100 + custom_price = 10 icon_state = "cream" item_state = "carton" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' @@ -333,7 +333,7 @@ /obj/item/reagent_containers/food/drinks/bottle/tomatojuice name = "tomato juice" desc = "Juice from tomatoes and salt. You'll often find some technicians soaking in this if they've been working with plasma." - custom_price = 100 + custom_price = 10 icon_state = "tomatojuice" item_state = "carton" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' @@ -345,7 +345,7 @@ /obj/item/reagent_containers/food/drinks/bottle/limejuice name = "lime juice" desc = "Lime juice. You might want to mix something with this instead of drinking it straight..." - custom_price = 100 + custom_price = 10 icon_state = "limejuice" item_state = "carton" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' @@ -357,7 +357,7 @@ /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice name = "pineapple juice" desc = "Tart, sweet juice from the tropical pineapple." - custom_price = 100 + custom_price = 10 icon_state = "pineapplejuice" item_state = "carton" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' @@ -370,7 +370,7 @@ /obj/item/reagent_containers/food/drinks/bottle/menthol name = "menthol" desc = "Tastes naturally minty, and imparts a very mild numbing sensation." - custom_price = 100 + custom_price = 10 icon_state = "mentholbox" item_state = "carton" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' @@ -381,7 +381,7 @@ /obj/item/reagent_containers/food/drinks/bottle/grenadine name = "Three-Star Grenadine" desc = "A commonly seen bottle of grenadine - or sweet fruit syrup. It might even contain real cherries, as well as some blackcurrant for color." - custom_price = 100 + custom_price = 10 icon_state = "grenadine" isGlass = TRUE list_reagents = list(/datum/reagent/consumable/grenadine = 100) @@ -391,7 +391,7 @@ /obj/item/reagent_containers/food/drinks/bottle/applejack name = "Mars Lightning" desc = "A strong brandy originating from apples, considered the older sibling to hard cider. Mars Lightning is often partnered with anti-gravity racing companies, leading to it often being served straight or for impromptu mixes." - custom_price = 100 + custom_price = 15 icon_state = "applejack_bottle" isGlass = TRUE list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100) @@ -400,7 +400,7 @@ /obj/item/reagent_containers/food/drinks/bottle/champagne name = "Treu Champagne" desc = "Finely sourced from entire canton planets dedicated to faithful reproduction of pre-Night Of Fire vineyards. Typically enjoyed for celebrations and the turn of new years." - custom_premium_price = 250 + custom_premium_price = 25 icon_state = "champagne_bottle" isGlass = TRUE list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100) @@ -414,7 +414,7 @@ /obj/item/reagent_containers/food/drinks/bottle/trappist name = "Roumain Trapper's" desc = "Traditionally (and heavily monitored for authenticity) made beer brewed on Illestren. Trapper's beer must be brewed by Saint Roumain Hunters or Shadows, made to fit the needs of their community first, and must never be made for profit... which makes it a common sight in the Frontier." - custom_premium_price = 170 + custom_premium_price = 17 icon_state = "trappistbottle" volume = 50 list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50) @@ -606,8 +606,8 @@ /obj/item/sandstar name = "SandBlast Sarsaparilla star" desc = "Legend says something amazing happens when you collect enough of these." - custom_price = 100 - custom_premium_price = 110 + custom_price = 10 + custom_premium_price = 11 icon = 'icons/obj/items.dmi' icon_state = "sandstar" w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm b/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm index 82ecdf9f2ace..45dc05531ba8 100644 --- a/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm +++ b/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @@ -15,7 +15,7 @@ obj_flags = UNIQUE_RENAME drop_sound = 'sound/items/handling/drinkglass_drop.ogg' pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' - custom_price = 25 + custom_price = 15 can_have_cap = TRUE cap_icon_state = "baflask_cap" cap_on = TRUE diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index add217d64a49..79dccfc28f41 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -13,7 +13,7 @@ obj_flags = UNIQUE_RENAME drop_sound = 'sound/items/handling/drinkglass_drop.ogg' pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' - custom_price = 25 + custom_price = 2 /obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype) cut_overlays() @@ -46,7 +46,7 @@ obj_flags = UNIQUE_RENAME drop_sound = 'sound/items/handling/drinkglass_drop.ogg' pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' - custom_price = 25 + custom_price = 15 /obj/item/reagent_containers/food/drinks/beaglemug/on_reagent_change(changetype) cut_overlays() @@ -75,7 +75,7 @@ possible_transfer_amounts = list() volume = 15 custom_materials = list(/datum/material/glass=100) - custom_price = 20 + custom_price = 1 var/filled_desc = "The challenge is not taking as many as you can, but guessing what it is before you pass out." /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype) diff --git a/code/modules/food_and_drinks/drinks/drinks/modglass.dm b/code/modules/food_and_drinks/drinks/drinks/modglass.dm index 056ece3409ae..2ac2a22870b5 100644 --- a/code/modules/food_and_drinks/drinks/drinks/modglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/modglass.dm @@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(glass_variants) obj_flags = UNIQUE_RENAME drop_sound = 'sound/items/handling/drinkglass_drop.ogg' pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' - custom_price = 25 + custom_price = 5 //rim defines the size of rim the glass has, used to decide which skins are available, and which garnish sprites to use var/rim = RIM_MEDIUM //stores the number of variations this glass sprite has to select from diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index c088b2259610..540c6f1a94ea 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -273,7 +273,7 @@ w_class = WEIGHT_CLASS_TINY var/faction var/spawned_mob = /mob/living/carbon/monkey - custom_price = 300 + custom_price = 5 /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand() var/mob/spammer = get_mob_by_key(fingerprintslast) diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 9d6470f5aec4..a450555a7a69 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -55,7 +55,7 @@ tastes = list("dried raisins" = 1) foodtype = JUNKFOOD | FRUIT | SUGAR /*food_flags = FOOD_FINGER_FOOD*/ - custom_price = 90 + custom_price = 5 w_class = WEIGHT_CLASS_SMALL /obj/item/reagent_containers/food/snacks/no_raisin/healthy @@ -74,7 +74,7 @@ filling_color = "#FFD700" foodtype = JUNKFOOD | GRAIN | SUGAR /*food_flags = FOOD_FINGER_FOOD*/ - custom_price = 30 + custom_price = 5 w_class = WEIGHT_CLASS_SMALL /obj/item/reagent_containers/food/snacks/candy_trash @@ -101,7 +101,7 @@ filling_color = "#FFD700" tastes = list("cheese" = 5, "crisps" = 2) foodtype = JUNKFOOD | DAIRY | SUGAR - custom_price = 45 + custom_price = 5 /obj/item/reagent_containers/food/snacks/syndicake name = "syndi-cakes" diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 61139749b4dd..ce8abf81c991 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -74,8 +74,8 @@ product_ads = "Drink up!;Booze is good for you!;Alcohol is everyone'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 53 FSC!;Award-winning wine!;Maximum alcohol!;Everyone loves beer.;A toast for progress!" req_access = list(ACCESS_BAR) refill_canister = /obj/item/vending_refill/boozeomat - default_price = 60 - extra_price = 150 + default_price = 10 + extra_price = 15 light_mask = "boozeomat-light-mask" /obj/machinery/vending/boozeomat/all_access diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index 24979567a7c8..3bbb10afb9c9 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -25,8 +25,8 @@ /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1, /obj/item/clothing/mask/vape/cigar = 3) refill_canister = /obj/item/vending_refill/cigarette - default_price = 50 - extra_price = 150 + default_price = 10 + extra_price = 20 light_mask = "cigs-light-mask" /obj/machinery/vending/cigarette/syndicate diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index 1aa2a78e29f2..f56336a0d44c 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -13,8 +13,8 @@ /obj/item/reagent_containers/food/drinks/cafelatte = 3, /obj/item/reagent_containers/food/drinks/soylatte = 3) refill_canister = /obj/item/vending_refill/coffee - default_price = 25 - extra_price = 40 + default_price = 5 + extra_price = 15 light_mask = "coffee-light-mask" light_color = COLOR_DARK_MODERATE_ORANGE diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index f65f2b2e5b65..b69adcec1fbb 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -23,9 +23,8 @@ /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy = 1, /obj/item/reagent_containers/food/drinks/soda_cans/crosstalk = 1) refill_canister = /obj/item/vending_refill/cola - default_price = 20 - extra_price = 50 - + default_price = 5 + extra_price = 15 /obj/item/vending_refill/cola machine_name = "RobustMore Softdrinks" diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 7d5e13a5e5c0..034d9df27ba4 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -19,8 +19,8 @@ ) refill_canister = /obj/item/vending_refill/snack canload_access_list = list(ACCESS_KITCHEN) - default_price = 60 - extra_price = 160 + default_price = 5 + extra_price = 10 input_display_header = "Chef's Food Selection" /obj/item/vending_refill/snack