Change military boot whitelist tag (#1794)

Co-authored-by: Adeinitas <[email protected]>
DeltaV-Station · Sep 21, 2024 · 3fd5287 · 3fd5287
1 parent 1c11e36
commit 3fd5287
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 1 deletion.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -111,6 +111,7 @@
     tags:
     - HighRiskItem
     - Sidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: StaticPrice
     price: 750
   - type: StealTarget
@@ -220,6 +221,7 @@
   - type: Tag
     tags:
     - Sidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: StaticPrice
     price: 750
 

diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
@@ -42,6 +42,9 @@
 - type: Tag
   id: CartridgeMusket #For the Craftable Musket
 
+- type: Tag
+  id: ConcealCarry # For objects that can be stored in military-style boots or similar items
+
 - type: Tag
   id: Directional
 

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -50,7 +50,7 @@
         whitelist:
           tags:
           - Knife
-          - Sidearm
+          - ConcealCarry # DeltaV - replace Sidearm tag
 
 - type: entity
   abstract: true

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -124,6 +124,7 @@
     tags:
     - Sidearm
     - BrassInstrument
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
 
 - type: entity
   parent: BaseHandheldInstrument

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -987,6 +987,7 @@
     tags:
     - Sidearm
     - ToySidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: Gun
     selectedMode: SemiAuto
     availableModes:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
@@ -24,6 +24,7 @@
     tags:
     - AppraisalTool
     - Sidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: GuideHelp
     guides:
     - Cargo
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -79,6 +79,7 @@
   - type: Tag
     tags:
     - Sidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
     quickEquip: false
@@ -96,6 +97,7 @@
   - type: Tag
     tags:
     - Sidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
     quickEquip: false
@@ -443,6 +445,7 @@
     tags:
     - Taser
     - Sidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
 
 - type: entity
   name: disabler
@@ -519,6 +522,7 @@
     tags:
     - Taser
     - Sidearm
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
     layers:
@@ -580,6 +584,7 @@
     - HighRiskItem
     - Sidearm
     - WeaponAntiqueLaser
+    - ConcealCarry # DeltaV - can be stowed in military boots for now
   - type: StaticPrice
     price: 750
   - type: StealTarget

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -19,6 +19,7 @@
   - type: Tag
     tags:
     - Sidearm
+    - ConcealCarry # Deltav - allow all pistols to be stowed in military boots for now.
   - 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
@@ -15,6 +15,7 @@
   - type: Tag
     tags:
     - Sidearm
+    - ConcealCarry # DeltaV - allow revolvers to be stowed in military boots for now
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
     quickEquip: false