Adjust Belt Storage (#1870)

* belt rework * Remove unnecessary tags * Add whitelist to first aid kits * Adjust medkit whitelist * Add bottle-tagged items to medkit whitelist * Grenade tag already exists pro * tj is an idiot * b&t debug wtaf are you yappin about * Give belts another parent, ClothingSlotBase * contain uncontained containers * tj dumb fuck
DeltaV-Station · Sep 21, 2024 · bc609b8 · bc609b8
1 parent 78a80ee
commit bc609b8
Show file tree

Hide file tree

Showing 18 changed files with 222 additions and 56 deletions.
diff --git a/Resources/Locale/en-US/deltav/clothing/belts.ftl b/Resources/Locale/en-US/deltav/clothing/belts.ftl
@@ -0,0 +1,7 @@
+# Add sidearm and medkit slots to security belts + webbing, medical webbing respectively
+clothing-belt-sidearm = Sidearm
+clothing-belt-medkit = Medkit
+
+# Add slots to the daishou
+clothing-belt-katana = Katana
+clothing-belt-wakizashi = Wakizashi
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml
@@ -3,10 +3,12 @@
   parent: ClothingBeltKatanaSheath
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: Wakizashi
-      - id: Katana
+  - type: ContainerFill
+    containers:
+      katanaslot:
+        - Katana
+      wakizashislot:
+        - Wakizashi
 
 - type: entity
   id: ClothingBeltCorpsmanWebbingFilled

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml
@@ -39,7 +39,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltStorageBase, ClothingSlotBase]
   id: ClothingBeltCorpsmanWebbing
   name: corpsman webbing
   description: A set of security webbing with blue corpsman highlights.
@@ -48,7 +48,28 @@
     sprite: DeltaV/Clothing/Belt/corpsman.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Belt/corpsman.rsi
+  - type: ItemSlots # add medkit slot
+    slots:
+      medkit:
+        name: clothing-belt-medkit
+        whitelist:
+          tags:
+          - Medkit
+        insertOnInteract: false # or you can't easily stow medkits in your rig.
   - type: Storage
     grid:
     - 0,0,2,1
     - 4,0,7,1
+  - type: ItemMapper # add stowed medkit sprite
+    mapLayers:
+      medkit:
+        whitelist:
+          tags:
+          - Medkit
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      medkit: !type:ContainerSlot {}
+  - type: Appearance
diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
@@ -7,85 +7,88 @@
   id: BeltSlotNotBelt #not a 'belt'
 
 - type: Tag
-  id: BulletBB
+  id: BionicSyrinxImplant
 
 - type: Tag
-  id: CartridgeSpecial # For the .38 special ammo and revolver
+  id: BorgModuleSecurity
 
 - type: Tag
-  id: CartridgeMusket #For the Craftable Musket
+  id: BorgSecurityArmour
 
 - type: Tag
-  id: Directional
+  id: BorgSecurityHead
 
 - type: Tag
-  id: DockShipyard
+  id: BorgSecurityLArm
 
 - type: Tag
-  id: ForensicBeltEquip
+  id: BorgSecurityLLeg
 
 - type: Tag
-  id: Gavel
+  id: BorgSecurityRArm
 
 - type: Tag
-  id: GasPipeHalf #Craftable Musket
+  id: BorgSecurityRLeg
 
 - type: Tag
-  id: HandLabeler
+  id: BorgSecurityTorso
 
 - type: Tag
-  id: HidesHarpyWings
+  id: BulletBB
 
 - type: Tag
-  id: MagazinePistolSpecial # For the .38 special ammo and pistol
+  id: CartridgeSpecial # For the .38 special ammo and revolver
 
 - type: Tag
-  id: ModularBreech #Craftable Musket
+  id: CartridgeMusket #For the Craftable Musket
 
 - type: Tag
-  id: ModularTrigger #Craftable Musket
+  id: Directional
 
 - type: Tag
-  id: SecDogWearable # allows Laika to wear meson goggles (and more later?)
+  id: DockShipyard
 
 - type: Tag
-  id: SpeedLoaderSpecial
+  id: ForensicBeltEquip
 
 - type: Tag
-  id: PreventLabel
+  id: Gavel
 
 - type: Tag
-  id: BionicSyrinxImplant
+  id: GasPipeHalf #Craftable Musket
 
 - type: Tag
-  id: PaperSlip
+  id: HandLabeler
+
+- type: Tag
+  id: HidesHarpyWings
 
 - type: Tag
   id: HudMedicalSecurity #Craftable Corpsman Glasses
 
 - type: Tag
-  id: BorgModuleSecurity
+  id: MagazinePistolSpecial # For the .38 special ammo and pistol
 
 - type: Tag
-  id: BorgSecurityHead
+  id: ModularBreech #Craftable Musket
 
 - type: Tag
-  id: BorgSecurityTorso
+  id: ModularTrigger #Craftable Musket
 
 - type: Tag
-  id: BorgSecurityRLeg
+  id: PaperSlip
 
 - type: Tag
-  id: BorgSecurityLLeg
+  id: PreventLabel
 
 - type: Tag
-  id: BorgSecurityRArm
+  id: SecDogWearable # allows Laika to wear meson goggles (and more later?)
 
 - type: Tag
-  id: BorgSecurityLArm
+  id: Skirt
 
 - type: Tag
-  id: Skirt
+  id: SpeedLoaderSpecial
 
 - type: Tag
-  id: BorgSecurityArmour
+  id: Wakizashi
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -456,7 +456,7 @@
   - type: Appearance
 
 - type: entity
-  parent: [ClothingBeltStorageBase, BaseRestrictedContraband]
+  parent: [ClothingBeltStorageBase, BaseRestrictedContraband, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase
   id: ClothingBeltSecurity
   name: security belt
   description: Can hold security gear like handcuffs and flashes.
@@ -465,6 +465,14 @@
     sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite
   - type: Clothing
     sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite
+  - type: ItemSlots # DeltaV - add sidearm slot
+    slots:
+      holster:
+        name: clothing-belt-sidearm
+        whitelist:
+          tags:
+          - Sidearm
+        insertOnInteract: false
   - type: Storage
     whitelist:
       tags:
@@ -489,21 +497,26 @@
         - Whistle
         - HolosignProjector
         - BalloonPopper
-  - type: ItemMapper
+  - type: ItemMapper # DeltaV - adjust for DeltaV sprites.
     mapLayers:
-      flashbang:
-        whitelist:
-          components:
-          - FlashOnTrigger
-      stunbaton:
+      baton:
         whitelist:
           components:
           - Stunbaton
-      tear_gas_grenade:
+      gasgrenade:
         whitelist:
-          components:
-          - SmokeOnTrigger
-    sprite: Clothing/Belt/belt_overlay.rsi
+          tags:
+            - Grenade
+      slp:
+        whitelist:
+          tags:
+          - Sidearm
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      holster: !type:ContainerSlot {}
   - type: Appearance
 
 - type: entity
@@ -610,7 +623,7 @@
         - CartridgeAmmo
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltStorageBase, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase
   id: ClothingBeltSecurityWebbing
   name: security chest rig # DeltaV - rename from "security carrier" due to already existing plate carrier
   description: Unique and versatile chest rig, can hold security gear.
@@ -619,10 +632,31 @@
     sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite
   - type: Clothing
     sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite
+  - type: ItemSlots # DeltaV - add sidearm slot
+    slots:
+      holster:
+        name: clothing-belt-sidearm
+        whitelist:
+          tags:
+          - Sidearm
+        insertOnInteract: false
   - type: Storage # Delta-V - Split Inventory
     grid:
     - 0,0,2,1
     - 4,0,7,1
+  - type: ItemMapper # DeltaV - add holstered sidearm sprite
+    mapLayers:
+      slp:
+        whitelist:
+          tags:
+          - Sidearm
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      holster: !type:ContainerSlot {}
+  - type: Appearance # DeltaV
 
 - type: entity
   parent: [ ClothingBeltStorageBase, BaseSecurityCargoContraband ]

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
@@ -7,7 +7,20 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: firstaid
-  - type: Storage
+  - type: Storage # DeltaV - add whitelist to first aid kits
+    whitelist:
+      tags:
+        - Bloodpack
+        - Bottle
+        - Brutepack
+        - Gauze
+        - GasTank
+        - Ointment
+        - PillCanister
+        - Syringe
+      components:
+        - BreathMask
+        - Hypospray
     maxItemSize: Small
     grid:
     - 0,0,3,1

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -35,6 +35,9 @@
         enum.ConstructionVisuals.Layer:
           Primed: { state: primed }
           Unprimed: { state: icon }
+  - type: Tag # DeltaV - assign grenade tag to all grenades
+    tags:
+    - Grenade
 
 - type: entity
   name: explosive grenade