Combat boots, but cool. (#11652)

2022-10-04 03:01:43 +02:00
parent aba2462a97
commit 5a4d2fb064
13 changed files with 65 additions and 11 deletions
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -256,7 +256,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalSyndicate
-      - id: SurvivalKnife
      - id: WeaponPistolViper
      - id: PinpointerNuclear

@@ -276,7 +275,7 @@
      - id: Retractor
      - id: ScalpelAdvanced
      - id: BoxSurvivalSyndicate
-      - id: SurvivalKnife
+      - id: CombatKnife
      - id: WeaponPistolViper
      - id: PinpointerNuclear
      - id: HandheldHealthAnalyzer
--- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
@@ -0,0 +1,8 @@
+- type: entity
+  id: ClothingShoesBootsCombatFilled
+  parent: ClothingShoesBootsCombat
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CombatKnife
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -16,3 +16,4 @@
    ClothingHeadsetSecurity: 3
    ClothingOuterWinterSec: 2
    ClothingEyesBlindfold: 1
+    ClothingShoesBootsCombat: 1
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -19,3 +19,19 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
+
+- type: entity
+  abstract: true
+  parent: ClothingShoesBase
+  id: ClothingShoesStorageBase
+  components:
+  - type: Storage
+    capacity: 10
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -43,15 +43,19 @@
    sprite: Clothing/Shoes/Boots/performer.rsi

 - type: entity
-  parent: ClothingShoesBaseButcherable
+  parent: ClothingShoesStorageBase
  id: ClothingShoesBootsCombat
  name: combat boots
  description: Robust combat boots for combat scenarios or combat situations. All combat, all the time.
  components:
  - type: Sprite
-    sprite: Clothing/Shoes/Boots/jackboots.rsi
+    sprite: Clothing/Shoes/Boots/combatboots.rsi
  - type: Clothing
-    sprite: Clothing/Shoes/Boots/jackboots.rsi
+    sprite: Clothing/Shoes/Boots/combatboots.rsi
+  - type: Storage
+    whitelist:
+      tags:
+        - Knife

 - type: entity
  parent: ClothingShoesBaseButcherable
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -73,7 +73,7 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitOperative
    back: ClothingBackpackDuffelSyndicateOperative
-    shoes: ClothingShoesBootsCombat
+    shoes: ClothingShoesBootsCombatFilled
  innerclothingskirt: ClothingUniformJumpsuitOperative
  satchel: ClothingBackpackDuffelSyndicateOperative
  duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -87,7 +87,7 @@
    back: ClothingBackpackDuffelSyndicateOperative
    ears: ClothingHeadsetAltSyndicate
    gloves: ClothingHandsGlovesCombat
-    shoes: ClothingShoesBootsCombat
+    shoes: ClothingShoesBootsCombatFilled
    pocket1: BaseUplinkRadio40TC
    id: AgentIDCard
  innerclothingskirt: ClothingUniformJumpsuitOperative
@@ -106,7 +106,7 @@
    ears: ClothingHeadsetAltSyndicate
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombat
+    shoes: ClothingShoesBootsCombatFilled
    id: AgentIDCard
    pocket1: ExtendedEmergencyOxygenTankFilled
    pocket2: BaseUplinkRadio40TC
@@ -126,7 +126,7 @@
    ears: ClothingHeadsetAltSyndicate
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitSyndieCommander
-    shoes: ClothingShoesBootsCombat
+    shoes: ClothingShoesBootsCombatFilled
    id: SyndiPDA
    pocket1: ExtendedEmergencyOxygenTankFilled
    pocket2: BaseUplinkRadio40TC
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -32,7 +32,7 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitHoS
    back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsJack
+    shoes: ClothingShoesBootsCombatFilled
    outerClothing: ClothingOuterCoatHoSTrench
    eyes: ClothingEyesGlassesSecurity
    head: ClothingHeadHatBeretHoS
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -24,7 +24,7 @@
    head: ClothingHeadHatWarden
    jumpsuit: ClothingUniformJumpsuitWarden
    back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsJack
+    shoes: ClothingShoesBootsCombatFilled
    eyes: ClothingEyesGlassesSecurity
    outerClothing: ClothingOuterCoatWarden
    id: WardenPDA