From fc6ffb15708016afb19ce629dc53ed44da5c3c70 Mon Sep 17 00:00:00 2001
From: Nairod <110078045+Nairodian@users.noreply.github.com>
Date: Sun, 1 Oct 2023 16:23:40 -0500
Subject: [PATCH] Boot Smallarms (#20062)

---
 Resources/Prototypes/Entities/Clothing/Shoes/boots.yml      | 5 ++++-
 Resources/Prototypes/Entities/Objects/Fun/toys.yml          | 3 +++
 .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml  | 6 ++++++
 .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml       | 3 +++
 .../Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml   | 3 +++
 .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml    | 3 +++
 Resources/Prototypes/tags.yml                               | 3 +++
 7 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index b75a2a712e..912e4d8594 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -25,7 +25,8 @@
     whitelist:
       tags:
         - Knife
-  
+        - Sidearm
+
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesBootsSalvage
@@ -64,6 +65,7 @@
     whitelist:
       tags:
         - Knife
+        - Sidearm
 
 - type: entity
   parent: ClothingShoesStorageBase
@@ -80,6 +82,7 @@
     whitelist:
       tags:
         - Knife
+        - Sidearm
 
 - type: entity
   parent: ClothingShoesBaseButcherable
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 6621049c68..d92ea5f814 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -600,6 +600,9 @@
   - type: Item
     sprite: Objects/Fun/toys.rsi
     heldPrefix: capgun
+  - type: Tag
+    tags:
+    - Sidearm
   - type: Gun
     selectedMode: SemiAuto
     availableModes:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index f970b06f8e..461a6cc437 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -38,6 +38,9 @@
   components:
   - type: Item
     size: 10
+  - type: Tag
+    tags:
+    - Sidearm
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
     quickEquip: false
@@ -272,6 +275,7 @@
     - type: Tag
       tags:
         - Taser
+        - Sidearm
     - type: Sprite
       sprite: Objects/Weapons/Guns/Battery/disabler.rsi
       layers:
@@ -333,6 +337,7 @@
   - type: Tag
     tags:
     - Taser
+    - Sidearm
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
     layers:
@@ -392,6 +397,7 @@
   - type: Tag
     tags:
     - HighRiskItem
+    - Sidearm
   - type: StaticPrice
     price: 750
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index ff098b32f9..7bfd914d94 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -13,6 +13,9 @@
         map: ["enum.GunVisualLayers.Mag"]
   - type: Item
     size: 10
+  - type: Tag
+    tags:
+    - Sidearm
   - type: Clothing
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 48c02f484e..1851dcddf6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -9,6 +9,9 @@
     state: icon
   - type: Item
     size: 10
+  - type: Tag
+    tags:
+    - Sidearm
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 3073ed7ab5..af073435ba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -79,6 +79,9 @@
         Slash: 6.5
   - type: Item
     size: 10
+  - type: Tag
+    tags:
+    - Knife
 
 # Like a crusher... but better
 - type: entity
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 61acbe2ba8..0750117305 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -892,6 +892,9 @@
 - type: Tag
   id: Shovel
 
+- type: Tag
+  id: Sidearm
+
 - type: Tag
   id: SkeletonMotorcycleKeys
 
-- 
2.51.2