From 456deea19e8a46dbe6ac010cbccc465b99256374 Mon Sep 17 00:00:00 2001
From: Guilherme Ornel <86210200+joshepvodka@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:16:42 -0300
Subject: [PATCH] Makes sabre sheathe use ItemSlots (#22792)

* added item slot

* fixed filled

* localized verbs

* github check was acting up
---
 Resources/Locale/en-US/clothing/belts.ftl     |  2 ++
 .../Prototypes/Catalog/Fills/Items/belt.yml   |  7 ++++---
 .../Entities/Clothing/Belt/belts.yml          | 21 ++++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 Resources/Locale/en-US/clothing/belts.ftl

diff --git a/Resources/Locale/en-US/clothing/belts.ftl b/Resources/Locale/en-US/clothing/belts.ftl
new file mode 100644
index 0000000000..c0281b9fec
--- /dev/null
+++ b/Resources/Locale/en-US/clothing/belts.ftl
@@ -0,0 +1,2 @@
+sheath-insert-verb = Sheathe
+sheath-eject-verb = Unsheathe
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 8f66c870fc..80eac02797 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -114,9 +114,10 @@
   parent: ClothingBeltSheath
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: CaptainSabre
+  - type: ContainerFill
+    containers:
+      item:
+      - CaptainSabre
 
 - type: entity
   id: ClothingBeltMilitaryWebbingGrenadeFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index d0ff683cdc..52de230056 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -399,7 +399,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltBase, ClothingSlotBase]
   id: ClothingBeltSheath
   name: sabre sheath
   description: An ornate sheath designed to hold an officer's blade.
@@ -409,12 +409,17 @@
     state: sheath
   - type: Clothing
     sprite: Clothing/Belt/sheath.rsi
-  - type: Storage
-    grid:
-    - 0,0,1,1
-    whitelist:
-      tags:
-        - CaptainSabre
+  - type: Item
+    size: Ginormous
+  - type: ItemSlots
+    slots:
+      item:
+        name: Sabre
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        whitelist:
+          tags:
+          - CaptainSabre
   - type: ItemMapper
     mapLayers:
       sheath-sabre:
@@ -422,7 +427,7 @@
           tags:
           - CaptainSabre
   - type: Appearance
-
+ 
 # Belts without visualizers
 
 - type: entity
-- 
2.51.2