diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 61d791ac..4082dacf 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -100,4 +100,14 @@
 		new /obj/item/weapon/implantcase/loyalty(src)
 		new /obj/item/weapon/implanter/loyalty(src)
 		new /obj/item/clothing/tie/holster/waist(src)
-		new /obj/item/weapon/gun/energy/gun/pistol(src)
\ No newline at end of file
+		new /obj/item/weapon/gun/energy/gun/pistol(src)
+
+/obj/item/weapon/storage/lockbox/lawgiver
+	name = "Weapons lockbox"
+	desc = "A high security weapons lockbox"
+	req_access = list(access_armory)
+	storage_slots = 1
+
+	New()
+		..()
+		new /obj/item/weapon/gun/energy/lawgiver(src)
\ No newline at end of file
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 198ec3a1..970f7763 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1663,7 +1663,7 @@ datum/design/lawgiver
 	req_tech = list("combat" = 6, "plasmatech" = 4, "bluespace" = 5, "materials" = 7)
 	build_type = PROTOLATHE
 	materials = list("$metal" = 6000, "$glass" = 1000, "$uranium" = 1000, "$plasma" = 1000, "$diamond" = 3000)
-	build_path = "/obj/item/weapon/gun/energy/lawgiver"
+	build_path = "/obj/item/weapon/storage/lockbox/lawgiver"
 
 datum/design/bprotopistol
 	name = "Basic Protopistol"