Adds New Shoes to Sec loadouts (#29018)

* Adds New Shoes to Sec loadouts

* Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed

diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
index 543cd604a2fb0b22e58512f61a0b940d9a44b8b6..816f3ba8d49b909edad9a590c5db4462ea77b8ba 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
@@ -1,12 +1,32 @@
 - type: entity
   id: ClothingShoesBootsCombatFilled
-  parent: ClothingShoesBootsCombat
-  suffix: Filled
-  components:
-  - type: ContainerFill
-    containers:
-      item:
-      - CombatKnife
+  parent:
+  - ClothingShoesBootsCombat
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsJackFilled
+  parent:
+  - ClothingShoesBootsJack
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsWinterSecFilled
+  parent:
+  - ClothingShoesBootsWinterSec
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsCowboyBlackFilled
+  parent:
+  - ClothingShoesBootsCowboyBlack
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesHighheelBootsFilled
+  parent:
+  - ClothingShoesHighheelBoots
+  - ClothingShoesBootsSecFilled
 
 - type: entity
   id: ClothingShoesBootsMercFilled

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index c4d937b8412f68aab00a9955accdb57da4e1dd99..5b733f0d354936b6c2e51c5d6d11043746019f3b 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -19,9 +19,7 @@
     ClothingOuterWinterSec: 2
     ClothingOuterArmorBasic: 2
     ClothingNeckScarfStripedRed: 3
-    ClothingOuterArmorBasicSlim: 2 
+    ClothingOuterArmorBasicSlim: 2
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
-    ClothingShoesBootsCowboyBlack: 1
-    ClothingHeadHatCowboyBlack: 1
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index a0f56966bb5903231ac291064a2440dd651fd027..d096ee3ff177936133ff2dd6ae796d93b964f1d5 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -52,6 +52,16 @@
           - Knife
           - Sidearm
 
+- type: entity
+  abstract: true
+  id: ClothingShoesBootsSecFilled
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - CombatKnife
+
 - type: entity
   abstract: true
   parent: ClothingShoesBaseButcherable

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index af32fa581841912357607b5f8168f7aee2f707b5..33f5d36e3664e798f35bc0cdb0e8d04eb3701333 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -143,7 +143,7 @@
     sprite: Clothing/Shoes/Boots/winterbootssci.rsi
 
 - type: entity
-  parent: ClothingShoesBaseWinterBoots
+  parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase]
   id: ClothingShoesBootsWinterSec
   name: security winter boots
   components:

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 321cc46feb562330bf03ff135e2acb07ed07d8a0..dfce25809f838ce789af8fa128af81f6dd6ca7fb 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -187,6 +187,15 @@
   equipment:
     shoes: ClothingShoesBootsCombatFilled
 
+- type: loadout
+  id: JackBoots
+  equipment: JackBoots
+
+- type: startingGear
+  id: JackBoots
+  equipment:
+    shoes: ClothingShoesBootsJackFilled
+
 - type: loadout
   id: SecurityWinterBoots
   equipment: SecurityWinterBoots
@@ -194,7 +203,7 @@
 - type: startingGear
   id: SecurityWinterBoots
   equipment:
-    shoes: ClothingShoesBootsWinterSec
+    shoes: ClothingShoesBootsWinterSecFilled
 
 # PDA
 - type: loadout

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index cf9866faaedde1b86da0b7deb4caaf0a8b3b219d..0fab367fc90e54609403e19ce80cbe9244c373b5 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -882,6 +882,7 @@
   name: loadout-group-security-shoes
   loadouts:
   - CombatBoots
+  - JackBoots
   - SecurityWinterBoots
 
 - type: loadoutGroup