diff --git a/baystation12.dme b/baystation12.dme
index ef59c4d2ddf..bf6eb6b488c 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -667,6 +667,7 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\cargo.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm"
+#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
new file mode 100644
index 00000000000..73d3347b41d
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -0,0 +1,54 @@
+/obj/structure/closet/secure_closet/guncabinet
+	name = "gun cabinet"
+	req_access = list(access_armory)
+	icon = 'icons/obj/guncabinet.dmi'
+	icon_state = "base"
+	icon_closed = "base"
+	icon_locked = "base"
+	icon_broken = "base"
+	icon_off = "base"
+
+/obj/structure/closet/secure_closet/guncabinet/New()
+	..()
+	update_icon()
+
+
+
+/obj/structure/closet/secure_closet/guncabinet/toggle()
+	..()
+	update_icon()
+
+/obj/structure/closet/secure_closet/guncabinet/update_icon()
+	overlays.Cut()
+	if(opened)
+		overlays += icon(icon,"door_open")
+	else
+		var/lazors = 0
+		var/shottas = 0
+		for (var/obj/item/weapon/gun/G in contents)
+			if (istype(G, /obj/item/weapon/gun/energy))
+				lazors++
+			if (istype(G, /obj/item/weapon/gun/projectile/))
+				shottas++
+		if (lazors || shottas)
+			for (var/i = 0 to 2)
+				var/image/gun = image(icon(src.icon))
+
+				if (lazors > 0 && (shottas <= 0 || prob(50)))
+					lazors--
+					gun.icon_state = "laser"
+				else if (shottas > 0)
+					shottas--
+					gun.icon_state = "projectile"
+
+				gun.pixel_x = i*4
+				overlays += gun
+
+		overlays += icon(src.icon,"door")
+
+		if(broken)
+			overlays += icon(src.icon,"broken")
+		else if (locked)
+			overlays += icon(src.icon,"locked")
+		else
+			overlays += icon(src.icon,"open")
\ No newline at end of file
diff --git a/icons/obj/guncabinet.dmi b/icons/obj/guncabinet.dmi
new file mode 100644
index 00000000000..49d7db0840d
Binary files /dev/null and b/icons/obj/guncabinet.dmi differ