From bca1ae342a8d2d220a543b42d76f8422eaf49b7b Mon Sep 17 00:00:00 2001
From: dge21 <129136517+dge21@users.noreply.github.com>
Date: Sat, 17 Feb 2024 01:55:32 -0500
Subject: [PATCH 1/3] Update cargo_fun.yml

Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com>
---
 .../Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
index d994967a2aa..dd3a3cd0f10 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
@@ -7,3 +7,18 @@
   cost: 1000
   category: Fun
   group: market
+
+- 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

From a70e16960bb7645ab87727d7e2caa595b46ea900 Mon Sep 17 00:00:00 2001
From: dge21 <129136517+dge21@users.noreply.github.com>
Date: Sat, 17 Feb 2024 01:56:42 -0500
Subject: [PATCH 2/3] Update cargo_fun.yml

Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com>
---
 .../DeltaV/Catalog/Cargo/cargo_fun.yml        | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
index dd3a3cd0f10..ddf3ebdb9e1 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
@@ -8,17 +8,12 @@
   category: Fun
   group: market
 
-- 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
+- type: cargoProduct
+  id: CapGunSet
+  icon:
+    sprite: Objects/Fun/caps.rsi
+    state: icon
+  product: CrateCapGunSet
+  cost: 1000
+  category: Fun
+  group: market

From 09a5f860eda9b34a7e96e8a4359f31e4c329852f Mon Sep 17 00:00:00 2001
From: dge21 <129136517+dge21@users.noreply.github.com>
Date: Sat, 17 Feb 2024 01:56:45 -0500
Subject: [PATCH 3/3] Update fun.yml

Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com>
---
 .../DeltaV/Catalog/Fills/Crates/fun.yml           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
index 45e371ac63b..18185d975e3 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
@@ -8,3 +8,18 @@
         amount: 1
       - id: BoxCartridgeBB
         amount: 2
+
+- 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