diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 9608ee8494..c6f994b44e 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -33,6 +33,11 @@
 	icon_state = "box"
 	item_state = "syringe_kit"
 
+/obj/item/weapon/storage/pillbottlebox
+	name = "Pill Bottles"
+	icon_state = "box"
+	item_state = "syringe_kit"
+
 /obj/item/weapon/storage/blankbox
 	name = "Blank Shells"
 	icon_state = "box"
diff --git a/code/game/objects/closets/secure/chemlocker.dm b/code/game/objects/closets/secure/chemlocker.dm
new file mode 100644
index 0000000000..1e1cb34094
--- /dev/null
+++ b/code/game/objects/closets/secure/chemlocker.dm
@@ -0,0 +1,6 @@
+/obj/secure_closet/chemtoxin/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/storage/pillbottlebox(src)
+	new /obj/item/weapon/storage/pillbottlebox(src)
+	return
\ No newline at end of file
diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm
index ab07368037..94902a80cc 100644
--- a/code/game/objects/storage/storage.dm
+++ b/code/game/objects/storage/storage.dm
@@ -177,6 +177,17 @@
 	..()
 	return
 
+/obj/item/weapon/storage/pillbottlebox/New()
+	new /obj/item/weapon/storage/pill_bottle( src )
+	new /obj/item/weapon/storage/pill_bottle( src )
+	new /obj/item/weapon/storage/pill_bottle( src )
+	new /obj/item/weapon/storage/pill_bottle( src )
+	new /obj/item/weapon/storage/pill_bottle( src )
+	new /obj/item/weapon/storage/pill_bottle( src )
+	new /obj/item/weapon/storage/pill_bottle( src )
+	..()
+	return
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /obj/item/weapon/storage/utilitybelt/proc/can_use()
diff --git a/goonstation.dme b/goonstation.dme
index 4f81b31f82..1c134081f6 100644
--- a/goonstation.dme
+++ b/goonstation.dme
@@ -416,6 +416,7 @@
 #include "code\game\objects\closets\secure\bar.dm"
 #include "code\game\objects\closets\secure\brig.dm"
 #include "code\game\objects\closets\secure\captain.dm"
+#include "code\game\objects\closets\secure\chemlocker.dm"
 #include "code\game\objects\closets\secure\courtroom.dm"
 #include "code\game\objects\closets\secure\engineering.dm"
 #include "code\game\objects\closets\secure\medical.dm"