Boot Smallarms (#20062)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index b75a2a712ec69c57d371b903440be96ea31359c3..912e4d8594d266df8379fc3398a9e19ad437542f 100644 (file)
--- 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 6621049c68f3a09d58f8ba9ea6c1fa580bcb4cdf..d92ea5f814c8881c3d7ca07ba9936c18549ee0b2 100644 (file)
--- 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 f970b06f8ee3fc30573bd983ea4507bb062d76a8..461a6cc4373d106a9b67031e4a9c14e2125570cb 100644 (file)
--- 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 ff098b32f907c9eed3925157ed9990d259ef99bb..7bfd914d94fef78d922f75d1abf4046624f6e27c 100644 (file)
--- 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 48c02f484efd1001b2960e0775a41bdbc8b941ed..1851dcddf6b80026f7e5335b41a792f0575829b5 100644 (file)
--- 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 3073ed7ab53c2e396e4475e90ec2989c07d27ec6..af073435bae8a36e0cb7ec8db7ecb31208a42fa5 100644 (file)
--- 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 61acbe2ba874a29e6eed81bc03ae1c135402f0ff..075011730545c4e35b562901457fc9a21f67be4f 100644 (file)
--- 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