cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Partially reverts the scarcity PR with respect to the bar. (#20788)

Browse Source 
From the feedback I've been seeing while playing, the bar has become
*unfun* to play or to interact with. I don't think the scarcity PR has
helped improve player experience, at least for the bar. I've re-added
the drinks that were removed, including the cabinet of beer yokes in the
back.

HOWEVER. There are less of all of them, encouraging resupplies if
there's heavy use.

!!!! I have not touched any other changes the scarcity PR introduced.
Medbay and Engineering scarcity remain. Anything added to cargo remains
purchasable, and the lavatory vendor still exists. !!!!

Supersedes #20786
This commit is contained in:
FlamingLily
2025-06-11 09:55:51 +00:00
committed by GitHub
parent bdfa1d5a1d
commit 04cd449bd7
9 changed files with 135 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending_types.dm
+24 -4
View File
@@ -1,4 +1,3 @@
/*
* Vending machine types
*/
@@ -67,6 +66,7 @@
/obj/item/reagent_containers/food/drinks/bottle/wine = 5,
/obj/item/reagent_containers/food/drinks/bottle/rose_wine = 5,
/obj/item/reagent_containers/food/drinks/bottle/whitewine = 5,
/obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha = 2,
/obj/item/reagent_containers/food/drinks/bottle/drambuie = 4,
/obj/item/reagent_containers/food/drinks/bottle/melonliquor = 2,
/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
@@ -77,28 +77,48 @@
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao = 2,
/obj/item/reagent_containers/food/drinks/bottle/kahlua = 5,
/obj/item/reagent_containers/food/drinks/bottle/triplesec = 5,
/obj/item/reagent_containers/food/drinks/bottle/sarezhiwine = 2,
/obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
/obj/item/reagent_containers/food/drinks/bottle/vodka = 5,
/obj/item/reagent_containers/food/drinks/bottle/vodka/mushroom = 1,
/obj/item/reagent_containers/food/drinks/bottle/pulque = 5,
/obj/item/reagent_containers/food/drinks/bottle/fireball = 2,
/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/victorygin = 2,
/obj/item/reagent_containers/food/drinks/bottle/makgeolli = 2,
/obj/item/reagent_containers/food/drinks/bottle/soju = 2,
/obj/item/reagent_containers/food/drinks/bottle/sake = 1,
/obj/item/reagent_containers/food/drinks/bottle/cremewhite = 4,
/obj/item/reagent_containers/food/drinks/bottle/mintsyrup = 5,
/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor = 2,
/obj/item/reagent_containers/food/drinks/bottle/chartreuseyellow = 5,
/obj/item/reagent_containers/food/drinks/bottle/messa_mead = 2,
/obj/item/reagent_containers/food/drinks/bottle/dominian_wine = 1,
/obj/item/reagent_containers/food/drinks/bottle/assunzione_wine = 1,
/obj/item/reagent_containers/food/drinks/bottle/algae_wine = 1,
/obj/item/reagent_containers/food/drinks/bottle/kvass = 1,
/obj/item/reagent_containers/food/drinks/bottle/tarasun = 1,
/obj/item/reagent_containers/food/drinks/bottle/valokki_wine = 1,
/obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive = 1,
/obj/item/reagent_containers/food/drinks/bottle/saintjacques = 1,
/obj/item/reagent_containers/food/drinks/bottle/hooch = 1,
/obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha = 2,
/obj/item/reagent_containers/food/drinks/bottle/nemiik = 1,
/obj/item/reagent_containers/food/drinks/bottle/ogogoro = 2,
/obj/item/reagent_containers/food/drinks/carton/applejuice = 2,
/obj/item/reagent_containers/food/drinks/carton/cream = 4,
/obj/item/reagent_containers/food/drinks/carton/dynjuice = 2,
/obj/item/reagent_containers/food/drinks/carton/limejuice = 4,
/obj/item/reagent_containers/food/drinks/carton/lemonjuice = 4,
/obj/item/reagent_containers/food/drinks/carton/orangejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/small/skrellbeerdyn = 8,
/obj/item/reagent_containers/food/drinks/bottle/small/xuizijuice = 8,
/obj/item/reagent_containers/food/drinks/carton/tomatojuice = 2,
/obj/item/reagent_containers/food/drinks/carton/cranberryjuice = 2,
/obj/item/reagent_containers/food/drinks/carton/watermelonjuice = 2,
/obj/item/reagent_containers/food/drinks/carton/bananajuice = 2,
/obj/item/reagent_containers/food/drinks/carton/fatshouters = 1,
/obj/item/reagent_containers/food/drinks/carton/mutthir = 1,
/obj/item/reagent_containers/food/drinks/boba = 2,
/obj/item/reagent_containers/food/drinks/ice = 9,
/obj/item/storage/box/fancy/vkrexi_swollen_organ = 1
)
contraband = list(
/obj/item/reagent_containers/food/drinks/tea = 10
code/game/objects/items/weapons/storage/boxes.dm
+1 -1
View File
@@ -1478,7 +1478,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water = 6
)
/obj/item/storage/box/midynhr_water
/obj/item/storage/box/burukutu
name = "pack of burukutu"
desc = "A box containing a six pack of burukutu."
illustration = "soda"
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+18
View File
@@ -23,3 +23,21 @@
new /obj/item/reagent_containers/food/drinks/bottle/small/beer(src)
new /obj/item/reagent_containers/food/drinks/bottle/small/beer(src)
new /obj/item/reagent_containers/food/drinks/bottle/small/beer(src)
/obj/structure/closet/secure_closet/cabinet/beer
name = "beer closet"
desc = "A cabinet stacked end-to-end with six packs of beer."
req_access = null
storage_capacity = 45
/obj/structure/closet/secure_closet/cabinet/beer/fill()
new /obj/item/storage/box/fancy/yoke/beer(src)
new /obj/item/storage/box/fancy/yoke/ebisu(src)
new /obj/item/storage/box/fancy/yoke/shimauma(src)
new /obj/item/storage/box/fancy/yoke/moonlabor(src)
new /obj/item/storage/box/fancy/yoke/earthmover(src)
new /obj/item/storage/box/fancy/yoke/whistlingforest(src)
new /obj/item/storage/box/fancy/yoke/threetowns(src)
/obj/structure/closet/secure_closet/cabinet/beer/horizon
req_access = list(ACCESS_BAR)
code/game/objects/structures/crates_lockers/crates.dm
+14
View File
@@ -711,3 +711,17 @@
desc = "A secure security crate. Secure."
icon_state = "security_crate"
secure = TRUE
/obj/structure/closet/crate/drinks
name = "exotic drinks crate"
desc = "A crate packed with boxes of various beverages. Handle with care!"
/obj/structure/closet/crate/drinks/fill()
new /obj/item/storage/box/burukutu(src)
new /obj/item/storage/box/skrellbeerdyn(src)
new /obj/item/storage/box/khlibnyz(src)
new /obj/item/storage/box/hrozamal_soda(src)
new /obj/item/storage/box/xuizijuice(src)
new /obj/item/storage/box/midynhr_water(src)
new /obj/item/storage/box/fancy/yoke/grape_juice(src)
new /obj/item/storage/box/fancy/yoke/beetle_milk(src)
code/modules/reagents/reagent_containers/food/drinks/carton.dm
+12
View File
@@ -69,6 +69,18 @@
icon_state = "applejuice"
reagents_to_add = list(/singleton/reagent/drink/applejuice = 100)
/obj/item/reagent_containers/food/drinks/carton/watermelonjuice
name = "watermelon juice"
desc = "Juice from a watermelon. Not to be confused with water."
icon_state = "watermelonjuice"
reagents_to_add = list(/singleton/reagent/drink/watermelonjuice = 100)
/obj/item/reagent_containers/food/drinks/carton/bananajuice
name = "banana juice"
desc = "Juice from a banana. However that works."
icon_state = "bananajuice"
reagents_to_add = list(/singleton/reagent/drink/banana = 100)
/obj/item/reagent_containers/food/drinks/carton/fatshouters
name = "fatshouters milk carton"
desc = "Fatty fatshouters milk in a carton."
html/changelogs/flaminglily-back2barsics.yml
+58
View File
@@ -0,0 +1,58 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: FlamingLily
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Partially reverts the scarcity changes to the bar. Rare drinks are now once again in the vendor or the yokes, but there's less of them overall (encouraging use of resupply means)."
icons/obj/item/reagent_containers/food/drinks/bottle.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

icons/obj/item/reagent_containers/food/drinks/carton.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

maps/sccv_horizon/sccv_horizon.dmm
+8 -2
View File
@@ -86667,8 +86667,7 @@
c_tag = "Service - Deck 2 - Bar Backroom";
dir = 8
},
/obj/structure/closet/secure_closet/cabinet/bar,
/obj/item/reagent_containers/food/drinks/bottle/valokki_wine,
/obj/structure/closet/secure_closet/cabinet/beer/horizon,
/turf/simulated/floor/tiled/dark,
/area/horizon/bar/backroom)
"mtw" = (
@@ -109940,6 +109939,9 @@
departmentType = 1;
name = "Bar Requests Console"
},
/obj/structure/closet/crate/drinks,
/obj/item/storage/box/fancy/yoke/grape_juice,
/obj/item/storage/box/fancy/yoke/beetle_milk,
/turf/simulated/floor/lino,
/area/horizon/bar)
"pQn" = (
@@ -165614,6 +165616,10 @@
pixel_x = 6;
pixel_y = -2
},
/obj/item/reagent_containers/food/condiment/sugar{
pixel_y = 13;
pixel_x = -7
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/bar)
"xPT" = (