diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index c06fc201c94..2fa3d80e9d9 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -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 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index dd9afabf0e6..be0556a9e8c 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -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" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 5a26574c165..7ab4e05dfa1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -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) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 47eb4124b89..6c5244cfb31 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers/food/drinks/carton.dm b/code/modules/reagents/reagent_containers/food/drinks/carton.dm index 9dc8bbea874..5750261206d 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/carton.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/carton.dm @@ -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." diff --git a/html/changelogs/flaminglily-back2barsics.yml b/html/changelogs/flaminglily-back2barsics.yml new file mode 100644 index 00000000000..aed973a71bd --- /dev/null +++ b/html/changelogs/flaminglily-back2barsics.yml @@ -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)." diff --git a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi index e42de20a2dc..70e63bccd48 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi and b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi differ diff --git a/icons/obj/item/reagent_containers/food/drinks/carton.dmi b/icons/obj/item/reagent_containers/food/drinks/carton.dmi index 06474bb26ec..a4315a6b1f1 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/carton.dmi and b/icons/obj/item/reagent_containers/food/drinks/carton.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 008155beead..9fdedde10ce 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -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" = (