From 1190e6d46b60a642bb92d9f4841ce2a345474c2c Mon Sep 17 00:00:00 2001
From: hazelrat <83198434+hazelrat@users.noreply.github.com>
Date: Sun, 24 May 2026 00:26:12 +0100
Subject: [PATCH] Adds a second shaker to the bar (#22470)

So bartenders don't have to share a shaker. Also moves them to a more
prominent spot, now that shakers are a lot more mechanically pertinent
with the recent morale changes.
---
 code/game/machinery/vending/wardrobe.dm   |  2 +
 html/changelogs/hazelmouse-twoshakers.yml | 59 +++++++++++++++++++++++
 maps/sccv_horizon/sccv_horizon.dmm        | 20 +++++---
 3 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/hazelmouse-twoshakers.yml

diff --git a/code/game/machinery/vending/wardrobe.dm b/code/game/machinery/vending/wardrobe.dm
index e5a8ef23094..10508e3d812 100644
--- a/code/game/machinery/vending/wardrobe.dm
+++ b/code/game/machinery/vending/wardrobe.dm
@@ -280,6 +280,8 @@
 	products = list(
 		/obj/item/clothing/under/sl_suit = 3,
 		/obj/item/clothing/under/rank/bartender = 3,
+		/obj/item/clothing/under/rank/bartender/idris = 3,
+		/obj/item/clothing/under/rank/bartender/orion = 3,
 		/obj/item/clothing/under/suit_jacket = 3,
 		/obj/item/clothing/under/suit_jacket/burgundy = 3,
 		/obj/item/clothing/under/suit_jacket/navy = 3,
diff --git a/html/changelogs/hazelmouse-twoshakers.yml b/html/changelogs/hazelmouse-twoshakers.yml
new file mode 100644
index 00000000000..27f4ef5bdc4
--- /dev/null
+++ b/html/changelogs/hazelmouse-twoshakers.yml
@@ -0,0 +1,59 @@
+################################
+# 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: hazelmouse
+
+# 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: "Added a second shaker to the Horizon's bar."
+  - bugfix: "BarDrobes now contain every service corporation's uniform."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 9e1e3f2621d..8560fb0b79d 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -93180,6 +93180,10 @@
 	id = "bar_shutter";
 	name = "Bar Shutter"
 	},
+/obj/item/reagent_containers/glass/rag{
+	pixel_x = -3;
+	pixel_y = 8
+	},
 /turf/simulated/floor/lino,
 /area/horizon/service/bar)
 "miS" = (
@@ -107296,6 +107300,14 @@
 /obj/machinery/smartfridge/drinks/bar{
 	pixel_y = 32
 	},
+/obj/item/reagent_containers/food/drinks/shaker{
+	pixel_x = -8;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/shaker{
+	pixel_x = 3;
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/service/bar)
 "ofB" = (
@@ -177359,10 +177371,6 @@
 	pixel_x = 10;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/shaker{
-	pixel_x = -5;
-	pixel_y = 18
-	},
 /obj/item/storage/box/fancy/candle_box{
 	pixel_x = -14;
 	pixel_y = 1
@@ -177372,11 +177380,11 @@
 	pixel_y = 1
 	},
 /obj/item/storage/box/fancy/candle_box{
-	pixel_x = -10;
+	pixel_x = -12;
 	pixel_y = 1
 	},
 /obj/item/storage/box/fancy/candle_box{
-	pixel_x = -10;
+	pixel_x = -12;
 	pixel_y = 1
 	},
 /obj/item/storage/box/fancy/candle_box{