diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index dec59d5dc29..2b98bd86e37 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -108,7 +108,6 @@
 	new /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng(src)
 	new /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc(src)
 
-
 /obj/structure/closet/secure_closet/CMO
 	name = "chief medical officer's locker"
 	req_access = list(access_cmo)
@@ -159,12 +158,10 @@
 	new /obj/item/clothing/shoes/brown	(src)
 	new /obj/item/device/radio/headset/heads/cmo(src)
 
-
 /obj/structure/closet/secure_closet/animal
 	name = "animal control closet"
 	req_access = list(access_surgery)
 
-
 /obj/structure/closet/secure_closet/animal/fill()
 	..()
 	new /obj/item/device/assembly/signaler(src)
@@ -172,7 +169,6 @@
 	new /obj/item/device/radio/electropack(src)
 	new /obj/item/device/radio/electropack(src)
 
-
 /obj/structure/closet/secure_closet/chemical
 	name = "chemistry equipment closet"
 	desc = "Contains equipment useful to chemists."
@@ -194,3 +190,19 @@
 	new /obj/item/storage/box/beakers(src)
 	new /obj/item/storage/bag/chemistry(src)
 	new /obj/item/storage/bag/chemistry(src)
+
+// Psychiatric
+/obj/structure/closet/secure_closet/psychiatric
+	name = "psychiatric supplies locker"
+	desc = "A psychiatric supplies locker."
+	icon_state = "med"
+	req_access = list(access_psychiatrist)
+
+/obj/structure/closet/secure_closet/psychiatric/fill()
+	..()
+	new /obj/item/clothing/suit/straight_jacket(src)
+	new /obj/item/reagent_containers/food/drinks/teapot(src)
+	new /obj/item/toy/plushie/therapy(src)
+	new /obj/item/toy/plushie/slime(src)
+	new /obj/item/toy/plushie/bee(src)
+	new /obj/item/device/flashlight/pen(src)
\ No newline at end of file
diff --git a/html/changelogs/psychiatric_locker.yml b/html/changelogs/psychiatric_locker.yml
new file mode 100644
index 00000000000..a498a076384
--- /dev/null
+++ b/html/changelogs/psychiatric_locker.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Adds a proper psychiatric supplies locker to the psychiatric office."
\ No newline at end of file
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index bfa9b1dead1..e12addbdf4c 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -22129,7 +22129,7 @@
 /area/rnd/research)
 "lbN" = (
 /obj/machinery/door/airlock/medical{
-	name = "Psychiatrist's Office";
+	name = "Psychiatric Office";
 	req_access = list(64)
 	},
 /obj/machinery/door/firedoor,
@@ -35475,20 +35475,12 @@
 /area/horizon/zta)
 "rIP" = (
 /obj/machinery/firealarm/south,
-/obj/structure/closet/secure_closet{
-	name = "Psychiatrist's Locker";
-	req_access = list(64)
-	},
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/reagent_containers/syringe,
-/obj/item/mesmetron,
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/obj/item/reagent_containers/food/drinks/teapot,
 /obj/machinery/light,
+/obj/structure/closet/secure_closet/psychiatric,
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "rIZ" = (
@@ -39931,7 +39923,7 @@
 "tZL" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical{
-	name = "Psychiatrist's Office";
+	name = "Psychiatric Office";
 	req_access = list(64)
 	},
 /obj/effect/map_effect/door_helper/unres{
@@ -48134,7 +48126,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/medical{
-	name = "Psychiatrist's Office";
+	name = "Psychiatric Office";
 	req_access = list(64)
 	},
 /obj/effect/map_effect/door_helper/unres,