diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index ac327bbd3b2..cb44d2f1eb6 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1102,7 +1102,8 @@ /obj/item/rig/military = 0.5, /obj/item/rig/unathi/fancy = 0.5, /obj/item/rig/vaurca/minimal = 0.5, - /obj/item/anomaly_core = 0.5 + /obj/item/anomaly_core = 0.5, + /obj/item/reagent_containers/food/drinks/bottle/vintage_wine = 0.1 ) /obj/random/highvalue/no_crystal @@ -1117,9 +1118,29 @@ /obj/item/rig/military = 0.5, /obj/item/rig/unathi/fancy = 0.5, /obj/item/rig/vaurca/minimal = 0.5, - /obj/item/anomaly_core = 0.5 + /obj/item/anomaly_core = 0.5, + /obj/item/reagent_containers/food/drinks/bottle/vintage_wine = 0.1 ) +//Can be good loot for away sites as well as a guaranteed valuable for a merchant. +/obj/random/highvalue/no_weapon + problist = list( + /obj/item/bluespace_crystal = 1, + /obj/item/reagent_containers/food/drinks/bottle/vintage_wine = 0.1, + /obj/item/clothing/glasses/thermal = 0.5, + /obj/item/anomaly_core = 0.5, + /obj/item/rig/military = 0.2, + /obj/item/rig/unathi/fancy = 0.2, + /obj/item/stack/material/phoron/full = 0.1, + /obj/item/stack/material/plasteel/full = 0.8, + /obj/random/voidsuit = 1, + /obj/item/rfd/construction = 0.4, + /obj/item/vaurca/box = 0.1, + /obj/item/melee/vaurca/rock = 0.1, + /obj/item/device/personal_shield = 0.1, + /obj/item/storage/secure/briefcase/money = 0.1 + ) + /obj/random/junk name = "random trash" desc = "This is toss." diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index b22771f060f..7c624873957 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -207,6 +207,9 @@ /decl/reagent/alcohol/wine value = 0.1 +/decl/reagent/alcohol/wine/vintage + value = 15 + /decl/reagent/alcohol/acid_spit value = 0.15 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 2e781a0b571..2757301094d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2634,6 +2634,15 @@ glass_desc = "A very classy looking drink." glass_center_of_mass = list("x"=15, "y"=7) +/decl/reagent/alcohol/wine/vintage + name = "Fine Wine" + description = "A high-class artisan wine, made in a small batch and aged for decades or centuries." + strength = 20 + taste_description = "rich and full-bodied sweetness unlike anything you've ever had" + + glass_name = "glass of vintage wine" + glass_desc = "A very classy and expensive-looking drink." + // Cocktails /decl/reagent/alcohol/acid_spit diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm index 382b27339f7..24b7651a79a 100644 --- a/code/modules/reagents/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/dispenser/cartridge_presets.dm @@ -25,6 +25,7 @@ phosphorus spawn_reagent = /decl/reagent/phosphorus potassium spawn_reagent = /decl/reagent/potassium radium spawn_reagent = /decl/reagent/radium + radium/small volume = CARTRIDGE_VOLUME_SMALL //For bar drinks sacid spawn_reagent = /decl/reagent/acid silicon spawn_reagent = /decl/reagent/silicon sodium spawn_reagent = /decl/reagent/sodium @@ -49,6 +50,7 @@ // Bar, soft apple spawn_reagent = /decl/reagent/drink/applejuice banana spawn_reagent = /decl/reagent/drink/banana + berryjuice spawn_reagent = /decl/reagent/drink/berryjuice brownstar spawn_reagent = /decl/reagent/drink/brownstar clean_kois spawn_reagent = /decl/reagent/kois/clean cola spawn_reagent = /decl/reagent/drink/space_cola @@ -79,6 +81,11 @@ milk spawn_reagent = /decl/reagent/drink/milk soymilk spawn_reagent = /decl/reagent/drink/milk/soymilk + // Bar, misc. mixed drink ingredients + uranium spawn_reagent = /decl/reagent/uranium + uranium/small volume = CARTRIDGE_VOLUME_SMALL + toothpaste spawn_reagent = /decl/reagent/drink/toothpaste + // ERT alkysine spawn_reagent = /decl/reagent/alkysine arithrazine spawn_reagent = /decl/reagent/arithrazine diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm index 798f0dd1e28..474c0dfd21b 100644 --- a/code/modules/reagents/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/dispenser/dispenser_presets.dm @@ -136,6 +136,37 @@ /obj/item/reagent_containers/chem_disp_cartridge/cream ) +/obj/machinery/chemical_dispenser/bar_alc/full/space //Spacebar away site. Gets much more to make the best drinks, hassle-free. + spawn_cartridges = list( + /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/reagent_containers/chem_disp_cartridge/beer, + /obj/item/reagent_containers/chem_disp_cartridge/kahlua, + /obj/item/reagent_containers/chem_disp_cartridge/whiskey, + /obj/item/reagent_containers/chem_disp_cartridge/wine, + /obj/item/reagent_containers/chem_disp_cartridge/vodka, + /obj/item/reagent_containers/chem_disp_cartridge/gin, + /obj/item/reagent_containers/chem_disp_cartridge/champagne, + /obj/item/reagent_containers/chem_disp_cartridge/rum, + /obj/item/reagent_containers/chem_disp_cartridge/tequila, + /obj/item/reagent_containers/chem_disp_cartridge/vermouth, + /obj/item/reagent_containers/chem_disp_cartridge/cognac, + /obj/item/reagent_containers/chem_disp_cartridge/ale, + /obj/item/reagent_containers/chem_disp_cartridge/mead, + /obj/item/reagent_containers/chem_disp_cartridge/grenadine, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/ethanol, + /obj/item/reagent_containers/chem_disp_cartridge/berryjuice, + /obj/item/reagent_containers/chem_disp_cartridge/radium/small, + /obj/item/reagent_containers/chem_disp_cartridge/uranium/small, + /obj/item/reagent_containers/chem_disp_cartridge/toothpaste, + /obj/item/reagent_containers/chem_disp_cartridge/iron + ) + /obj/machinery/chemical_dispenser/coffeemaster name = "Coffee Master 3000" desc = "The only thing that can get some workers though the day, a coffee maker on steroids!" diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 3648eca145b..f2b605d4859 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -667,6 +667,21 @@ center_of_mass = list("x" = 16, "y" = 5) reagents_to_add = list(/decl/reagent/alcohol/pulque = 100) +/obj/item/reagent_containers/food/drinks/bottle/vintage_wine //can't make it a child of wine, or else reagents double-fill + name = "Vintage Wine" + desc = "A fine bottle of high-quality wine, produced in a small batch and aged for decades, if not centuries. It's likely that few bottles like it remain." + icon_state = "vwinebottle" + desc_fluff = "Small-batch wines produced by local, independent wineries are highly sought-after by those who can afford them. They are considered highly-collectable items \ + due to how relatively few exist compared to more mass-produced wines. The attention to detail can be seen in the bottle, and felt in the taste. While megacorporations and their \ + subsidiaries don't produce bad products, wine afficianados across the spur agree that nothing comes close to these locally-produced treasures. They can easily be worth thousands of credits." + center_of_mass = list("x"=16, "y"=4) + reagents_to_add = list(/decl/reagent/alcohol/wine/vintage = 100) + +/obj/item/reagent_containers/food/drinks/bottle/vintage_wine/Initialize() + . = ..() + name = pick("Triesto Pre-Dimming Sangiovese", "New Beirut 2340", "Vysokan Artisans Merlot", "Silver Seas Original Merlot", "Domelkos Morozian Treasure", "Belle Cote Serene Moth 2395", + "Malta Sol Nebbiolo", "Ashkhaimi Gardens Shiraz", "Old Cairo 2375", "Artisan Empire 2354") + // Butanol-based alcoholic drinks //===================================== //These are mainly for unathi, and have very little (but still some) effect on other species diff --git a/html/changelogs/doxxmedearly - BarShuttleQoL.yml b/html/changelogs/doxxmedearly - BarShuttleQoL.yml new file mode 100644 index 00000000000..baef2350f32 --- /dev/null +++ b/html/changelogs/doxxmedearly - BarShuttleQoL.yml @@ -0,0 +1,12 @@ +author: Doxxmedearly +delete-after: True +changes: + - maptweak: "The space bar now has a cabinet filled with high-quality drinks not usually available on the ship, and their booze dispenser was given additional cartridges to help mix uncommon drinks." + - maptweak: "The space bar kitchen now has additional meat options in the freezer." + - maptweak: "Small map tweaks to the Space Bar- More disposals, bartender can change holo-menu, replaced light bulb boxes with the correct kind." + - maptweak: "Small map tweaks to the Orion Express ship- added an engine control console to the helm, added trash bins, removed booze dispenser, added package wrap and a labeler." + - maptweak: "Condensed the Orion Express ship's anti-piracy gun lockers into one, and added a stun revolver for less lethal defense." + - maptweak: "Added a closet with some jackets and other items for the Orion Express ship." + - maptweak: "Replaces a random crate in the merchant starting area with a guaranteed medium to high-value good." + - bugfix: "The Orion Express ship cryogenics will now function." + - rscadd: "Adds vintage wine bottles, with lore-appropriate names. These are exceptionally rare drinks." \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 33838345a95..fcce3557571 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/drinks_empty.dmi b/icons/obj/drinks_empty.dmi index 44018703533..6775d27df8b 100644 Binary files a/icons/obj/drinks_empty.dmi and b/icons/obj/drinks_empty.dmi differ diff --git a/maps/away/generic/space_bar.dmm b/maps/away/generic/space_bar.dmm index e70394b4b18..0e9ffbf09ed 100644 --- a/maps/away/generic/space_bar.dmm +++ b/maps/away/generic/space_bar.dmm @@ -8,6 +8,11 @@ /area/space_bar) "aaJ" = ( /obj/structure/closet/secure_closet/freezer/meat, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/bearmeat, +/obj/item/reagent_containers/food/snacks/bearmeat, +/obj/item/reagent_containers/food/snacks/dwellermeat, /turf/simulated/floor/tiled/freezer{ name = "cold storage tiles"; temperature = 278 @@ -22,6 +27,8 @@ /obj/item/reagent_containers/food/snacks/fish/fishfillet, /obj/item/reagent_containers/food/snacks/fish/fishfillet, /obj/item/reagent_containers/food/snacks/fish/fishfillet, +/obj/item/reagent_containers/food/snacks/crabmeat, +/obj/item/reagent_containers/food/snacks/crabmeat, /turf/simulated/floor/tiled/freezer{ name = "cold storage tiles"; temperature = 278 @@ -59,8 +66,8 @@ /obj/structure/closet/crate, /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/mechanical, -/obj/item/storage/box/lights, -/obj/item/storage/box/lights/bulbs, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/holofloor/tiled, /area/space_bar) "amt" = ( @@ -165,7 +172,9 @@ }, /area/space_bar) "aDG" = ( -/obj/structure/closet/crate/trashcart, +/obj/machinery/cryopod{ + dir = 4 + }, /turf/simulated/floor/holofloor/tiled, /area/space_bar) "aEq" = ( @@ -239,6 +248,7 @@ pixel_x = 3; pixel_y = 1 }, +/obj/item/reagent_containers/glass/bottle/capsaicin, /turf/simulated/floor/tiled/white, /area/space_bar) "aHw" = ( @@ -350,6 +360,14 @@ /obj/structure/closet/wardrobe/xenos, /turf/simulated/floor/holofloor/tiled, /area/space_bar) +"cqJ" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/space_bar) "ctn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -466,6 +484,7 @@ pixel_x = -5; pixel_y = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/space_bar) "fgX" = ( @@ -620,11 +639,12 @@ /turf/simulated/floor/holofloor/tiled, /area/space_bar) "hus" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/disposal/small/south, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/white, /area/space_bar) "huE" = ( /obj/structure/table/stone/marble, @@ -683,9 +703,7 @@ /area/space_bar) "hZq" = ( /obj/structure/table/stone/marble, -/obj/machinery/chemical_dispenser/bar_alc/full{ - pixel_y = 5 - }, +/obj/machinery/chemical_dispenser/bar_alc/full/space, /turf/simulated/floor/lino/grey, /area/space_bar) "irX" = ( @@ -922,6 +940,13 @@ }, /turf/simulated/floor/tiled/steel, /area/space_bar) +"odP" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/small/east, +/turf/simulated/floor/wood, +/area/space_bar) "ofl" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -1037,6 +1062,11 @@ }, /turf/simulated/floor/tiled/steel, /area/space_bar) +"qWo" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/space_bar) "riA" = ( /obj/structure/sink{ dir = 8; @@ -1112,6 +1142,12 @@ /obj/item/flame/candle, /turf/simulated/floor/holofloor/tiled, /area/space_bar) +"sBD" = ( +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, +/turf/simulated/floor/holofloor/tiled, +/area/space_bar) "sFQ" = ( /obj/machinery/biogenerator{ icon_state = "biogen-empty" @@ -1123,7 +1159,8 @@ "taa" = ( /obj/structure/table/stone/marble, /obj/item/holomenu{ - pixel_y = 5 + req_access = list(202); + req_one_access = null }, /turf/simulated/floor/holofloor/tiled, /area/space_bar) @@ -1190,6 +1227,12 @@ }, /turf/simulated/floor/tiled/steel, /area/space_bar) +"uuL" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/turf/simulated/floor/holofloor/tiled, +/area/space_bar) "uwM" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/vending/hydronutrients, @@ -1276,9 +1319,17 @@ /turf/simulated/floor/holofloor/tiled, /area/space_bar) "vWJ" = ( -/obj/item/mop, -/obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, +/obj/structure/closet/cabinet{ + name = "special reserve cabinet"; + desc = "Contains shelves of the good stuff." + }, +/obj/item/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine, +/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, +/obj/item/reagent_containers/food/drinks/bottle/darmadhir_brew, +/obj/item/storage/box/fancy/cigarettes/cigar, +/obj/item/reagent_containers/food/drinks/bottle/vintage_wine, /turf/simulated/floor/holofloor/tiled, /area/space_bar) "wfU" = ( @@ -32937,7 +32988,7 @@ pre frn wmd hFr -jMP +odP jMP wfU wfU @@ -33193,8 +33244,8 @@ gfL pxS rtf pJZ -hus -jMP +xwj +rYT jMP jIR jIR @@ -33442,7 +33493,7 @@ ygr ygr ygr ygr -iXO +sBD ble ygr gxE @@ -34212,7 +34263,7 @@ xRX ygr ams iXO -iXO +uuL iXO ccm ygr @@ -36783,7 +36834,7 @@ ygr ygr awG ygr -ndF +hus ndF ygr jnP @@ -37040,15 +37091,15 @@ aaI arY arY ygr -ndF -ndF +cqJ +qWo fgm -jMP -jMP -jMP -jMP -jMP -xQS +pJZ +pJZ +pJZ +pJZ +pJZ +xPN jMP hON hON diff --git a/maps/away/ships/orion_express_ship.dmm b/maps/away/ships/orion_express_ship.dmm index d930e59dc39..e34a45c3aef 100644 --- a/maps/away/ships/orion_express_ship.dmm +++ b/maps/away/ships/orion_express_ship.dmm @@ -180,6 +180,7 @@ /obj/effect/floor_decal/corner_wide/beige/full{ dir = 1 }, +/obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/dark, /area/shuttle/orion_express_ship) "ccm" = ( @@ -424,6 +425,8 @@ /obj/effect/floor_decal/corner_wide/beige/full{ dir = 1 }, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/blaster/carbine, /turf/simulated/floor/tiled/dark, /area/shuttle/orion_express_ship) "goI" = ( @@ -610,6 +613,12 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/white, /area/shuttle/orion_express_ship) +"juh" = ( +/obj/machinery/computer/cryopod{ + pixel_y = -33 + }, +/turf/simulated/floor/wood, +/area/shuttle/orion_express_ship) "jEu" = ( /obj/structure/bed/stool/chair/wood{ dir = 1 @@ -665,14 +674,13 @@ /turf/simulated/floor/wood, /area/shuttle/orion_express_ship) "kYf" = ( -/obj/structure/table/stone/marble, -/obj/machinery/chemical_dispenser/bar_alc/full, -/obj/effect/floor_decal/corner/black/diagonal, -/turf/simulated/floor/tiled/white, +/obj/structure/closet/crate/bin, +/turf/simulated/floor, /area/shuttle/orion_express_ship) "lev" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate/extinguisher_cartridges, +/obj/structure/table/standard, +/obj/item/device/hand_labeler, +/obj/item/stack/packageWrap, /turf/simulated/floor/tiled/dark, /area/shuttle/orion_express_ship) "lhC" = ( @@ -723,6 +731,23 @@ /obj/item/reagent_containers/toothpaste, /turf/simulated/floor/tiled/white, /area/shuttle/orion_express_ship) +"mfi" = ( +/obj/structure/closet, +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight, +/obj/item/clothing/suit/storage/toggle/supply_dep_jacket, +/obj/item/clothing/suit/storage/toggle/supply_dep_jacket, +/obj/item/clothing/suit/storage/toggle/bomber, +/obj/item/clothing/under/shorts/khaki, +/obj/item/clothing/under/shorts/khaki/female, +/obj/item/clothing/shoes/workboots/dark, +/obj/item/clothing/shoes/workboots/toeless/dark, +/obj/item/clothing/gloves/brown, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/accessory/bandanna, +/obj/item/clothing/accessory/bandanna/black, +/turf/simulated/floor/wood, +/area/shuttle/orion_express_ship) "mkb" = ( /turf/simulated/floor, /area/shuttle/orion_express_ship) @@ -943,6 +968,7 @@ /area/shuttle/orion_express_ship) "pxS" = ( /obj/effect/floor_decal/corner_wide/beige/full, +/obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/dark, /area/shuttle/orion_express_ship) "pAh" = ( @@ -1094,13 +1120,12 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/orion_express_ship) "tra" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list(201) - }, -/obj/item/gun/energy/blaster/carbine, /obj/effect/floor_decal/corner_wide/beige/full{ dir = 4 }, +/obj/machinery/computer/ship/engines{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/orion_express_ship) "tCH" = ( @@ -31963,7 +31988,7 @@ riA riA hiw riA -lev +vUu ccm xwj ccm @@ -32498,7 +32523,7 @@ riA gOy uaE uaE -kYf +pXP wmd wmd wmd @@ -32734,7 +32759,7 @@ riA fnY mkb riA -ccm +lev ccm ccm xQS @@ -32988,7 +33013,7 @@ xRX xRX xRX riA -mkb +kYf mkb riA riA @@ -34296,7 +34321,7 @@ hZq riA riA riA -uCl +mfi wmd riA kPs @@ -35582,7 +35607,7 @@ ccm pJZ riA dKJ -wmd +juh riA xRX xRX diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 4691f9f33c8..e5debacf7bf 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -37288,6 +37288,12 @@ /obj/structure/flora/pottedplant/random, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_gym) +"eQT" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate/drop, +/obj/random/highvalue/no_weapon, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "fcH" = ( /obj/structure/dueling_table{ icon_state = "center_right" @@ -43073,7 +43079,7 @@ amd arJ asE asC -avN +eQT axf avN axd