From 96391d606dd5fbae01d72bfc54c65c93ae4a67de Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:05:01 +0100
Subject: [PATCH] Adds a bundle of new items that can be put on the toy shelf
 (#21580)

The new items are pens, sticker sheets , cap guns, flag guns, eight
balls and bike horns. Based on feedback from operations players.
---
 code/modules/cooking/machinery/commissary.dm | 8 +++++++-
 html/changelogs/ToyShelfUpdate.yml           | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/ToyShelfUpdate.yml

diff --git a/code/modules/cooking/machinery/commissary.dm b/code/modules/cooking/machinery/commissary.dm
index 62c9cf7fd27..173d0dea63d 100644
--- a/code/modules/cooking/machinery/commissary.dm
+++ b/code/modules/cooking/machinery/commissary.dm
@@ -62,7 +62,13 @@
 	/obj/item/melee/dinograbber,
 	/obj/item/device/laser_pointer,
 	/obj/item/deck,
-	/obj/item/storage/pill_bottle/dice
+	/obj/item/storage/pill_bottle/dice,
+	/obj/item/pen,
+	/obj/item/storage/stickersheet,
+	/obj/item/gun/projectile/revolver/capgun,
+	/obj/item/gun/bang,
+	/obj/item/eightball,
+	/obj/item/bikehorn
 	)
 	display_tiers = 4
 	display_tier_amt = 5
diff --git a/html/changelogs/ToyShelfUpdate.yml b/html/changelogs/ToyShelfUpdate.yml
new file mode 100644
index 00000000000..c0cf0aed2e9
--- /dev/null
+++ b/html/changelogs/ToyShelfUpdate.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - rscadd: "The commissary toy shelf can now also hold pens, sticker sheets, cap guns, flag guns, eight balls and bike horns."