From a39ea84e786b2f229a328ea16e330bd79337d1ce Mon Sep 17 00:00:00 2001
From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:38:03 +0200
Subject: [PATCH] aprons (#926)

---
 .../Clothing/Cloak/Roles/alchemist.yml        | 14 ++++++++--
 .../Clothing/Cloak/Roles/blacksmith.yml       | 28 +++++++++++++++++++
 .../Entities/Clothing/Cloak/sort_later.yml    | 13 ---------
 .../_CP14/Entities/Clothing/base.yml          | 13 +++++++++
 .../Entities/Objects/Materials/simple.yml     |  3 ++
 .../Objects/Specific/Alchemy/vials.yml        |  3 ++
 .../_CP14/Entities/Objects/Tools/flint.yml    |  5 +++-
 .../_CP14/Entities/Objects/Tools/scissors.yml |  3 ++
 .../Objects/Tools/sharpening_stone.yml        |  5 +++-
 Resources/Prototypes/_CP14/tags.yml           | 15 ++++++++++
 10 files changed, 85 insertions(+), 17 deletions(-)
 create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml
 create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/base.yml

diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml
index db8639d6c2..23c33ab108 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml
@@ -1,5 +1,7 @@
 - type: entity
-  parent: CP14ClothingCloakBase
+  parent: 
+  - CP14ClothingCloakBase
+  - CP14ClothingBaseContainer
   id: CP14ClothingCloakAlchemist
   name: alchemist's cloak
   description: An expensive fabric that can withstand acid splashes - the standard for alchemist experts.
@@ -12,4 +14,12 @@
     modifiers:
       coefficients:
         Heat: 0.9
-        Caustic: 0.75
\ No newline at end of file
+        Caustic: 0.75
+  - type: Storage
+    maxItemSize: Tiny
+    defaultStorageOrientation: Vertical
+    grid:
+    - 0,0,1,1
+    whitelist:
+      tags:
+        - CP14Vial
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml
new file mode 100644
index 0000000000..b8edd982c6
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml
@@ -0,0 +1,28 @@
+- type: entity
+  parent: 
+  - CP14ClothingCloakBase
+  - CP14ClothingBaseContainer
+  id: CP14ClothingCloakBlacksmithArpon
+  name: blacksmith's apron
+  description: Loose leather strips, still actually being clothing. 
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Heat: 0.95
+  - type: Storage
+    maxItemSize: Small
+    defaultStorageOrientation: Vertical
+    grid:
+    - 0,0,2,1
+    whitelist:
+      tags:
+        - Crayon
+        - CP14Lighter
+        - CP14Scissors
+        - CP14SharpeningStone
+        - CP14Nail
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml
index a0dadc197a..2a6d2bc14d 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml
@@ -1,16 +1,3 @@
-- type: entity
-  parent: 
-  - CP14ClothingCloakBase
-  - ClothingSlotBase
-  id: CP14ClothingCloakBlacksmithArpon
-  name: blacksmith's apron
-  description: Loose leather strips, still actually being clothing. 
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi
-
 - type: entity
   parent: 
   - CP14ClothingCloakBase
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/base.yml
new file mode 100644
index 0000000000..5d820a51e4
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/base.yml
@@ -0,0 +1,13 @@
+- type: entity
+  abstract: true
+  id: CP14ClothingBaseContainer
+  categories: [ ForkFiltered ]
+  components:
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
index 960ac2c711..05ab29de9e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
@@ -345,6 +345,9 @@
     slipSound:
       path: /Audio/Effects/weak_hit2.ogg
     launchForwardsMultiplier: 0
+  - type: Tag
+    tags:
+    - CP14Nail
 
 - type: entity
   id: CP14Nail20
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
index de7f3fbdde..3a139640de 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
@@ -51,6 +51,9 @@
     maxTransferAmount: 10
     transferAmount: 1
     toggleState: 1 # draw
+  - type: Tag
+    tags:
+    - CP14Vial
 
 - type: entity
   parent: CP14BaseVial
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml
index d413349ae4..189f5302c5 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml
@@ -12,4 +12,7 @@
     state: icon
   - type: CP14DelayedIgnitionSource
     enabled: true
-  # TODO: Damageable, Ignite attempt self damage, Ignite prob
\ No newline at end of file
+  # TODO: Damageable, Ignite attempt self damage, Ignite prob
+  - type: Tag
+    tags:
+    - CP14Lighter
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml
index 16007eecbd..edf5fb369f 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml
@@ -27,3 +27,6 @@
         Piercing: 7
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"
+  - type: Tag
+    tags:
+    - CP14Scissors
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/sharpening_stone.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/sharpening_stone.yml
index 34ef9613c2..cac14dc6be 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/sharpening_stone.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/sharpening_stone.yml
@@ -25,4 +25,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: CP14SharpeningStone
-    sharpnessHeal: 0.1
\ No newline at end of file
+    sharpnessHeal: 0.1
+  - type: Tag
+    tags:
+    - CP14SharpeningStone
diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml
index c15db14717..9c5edf88f7 100644
--- a/Resources/Prototypes/_CP14/tags.yml
+++ b/Resources/Prototypes/_CP14/tags.yml
@@ -111,3 +111,18 @@
 
 - type: Tag
   id: CP14AlchemicalHerbals
+
+- type: Tag
+  id: CP14Lighter
+
+- type: Tag
+  id: CP14Scissors
+
+- type: Tag
+  id: CP14SharpeningStone
+
+- type: Tag
+  id: CP14Nail
+
+- type: Tag
+  id: CP14Vial