diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index e3092724dc6..55d61f30504 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -208,6 +208,16 @@
   category: Fun
   group: market
 
+- type: cargoProduct
+  id: CapGunSet
+  icon:
+    sprite: Objects/Fun/caps.rsi
+    state: icon
+  product: CrateCapGunSet
+  cost: 550
+  category: Fun
+  group: market
+  
 #- type: cargoProduct
 #  id: FunCrateGambling
 #  icon:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 3a20d6d47a9..1d78338320c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -368,4 +368,21 @@
       - id: BoxDarts
         amount: 1
         prob: 0.05
+        
+- type: entity
+  name: cap gun box set
+  description: A box filled with fun, harmless cap guns that are sure to keep security entertained and the air smelling of sulfur.
+  id: CrateCapGunSet
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: RevolverCapGun
+        amount: 1
+      - id: SpeedLoaderCap
+        amount: 2
+      - id: BoxCartridgeCap
+        amount: 2
+  
+