reparenting is annoying

K-Dynamic · Dec 3, 2024 · 80cf89b · 80cf89b
1 parent 5003fe5
commit 80cf89b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 33 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -59,10 +59,15 @@
     sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
 
 - type: entity
-  abstract: true
-  parent: AllowSuitStorageClothing
-  id: ClothingOuterArmorHoS
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, ClothingOuterStorageBase, BaseSecurityCommandContraband]
+  id: ClothingOuterCoatHoSTrench
+  name: head of security's armored trenchcoat
+  description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
   components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
   - type: Armor
     modifiers:
       coefficients:
@@ -75,10 +80,15 @@
     damageCoefficient: 0.9
 
 - type: entity
-  abstract: true
-  parent: AllowSuitStorageClothing
-  id: ClothingOuterArmorWarden
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, ClothingOuterStorageBase, BaseRestrictedContraband]
+  id: ClothingOuterCoatWarden
+  name: warden's armored jacket
+  description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats.
   components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/warden.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/warden.rsi
   - type: Armor
     modifiers:
       coefficients:
@@ -89,17 +99,6 @@
   - type: ExplosionResistance
     damageCoefficient: 0.9
 
-- type: entity
-  parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase, BaseSecurityCommandContraband]
-  id: ClothingOuterCoatHoSTrench
-  name: head of security's armored trenchcoat
-  description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
-
 - type: entity
   parent: ClothingOuterStorageToggleableBase
   id: ClothingOuterCoatJensen
@@ -314,17 +313,6 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/pirate.rsi
 
-- type: entity
-  parent: [ClothingOuterArmorWarden, ClothingOuterStorageBase, BaseRestrictedContraband]
-  id: ClothingOuterCoatWarden
-  name: warden's armored jacket
-  description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Coats/warden.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Coats/warden.rsi
-
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterDameDane

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -359,7 +359,7 @@
 
 ##########################################################
 - type: entity
-  parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband]
+  parent: [ClothingOuterCoatHoSTrench, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterHoS
   name: head of security's armored winter coat
   description: A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events.
@@ -665,7 +665,7 @@
 
 ##########################################################
 - type: entity
-  parent: [ClothingOuterArmorBasic, ClothingOuterWinterCoatToggleable, BaseRestrictedContraband]
+  parent: [ClothingOuterArmorBasic, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterSec
   name: security armored winter coat
   description: A sturdy, utilitarian winter coat designed to protect an officer from any brig-bound threats and hypothermic events.
@@ -745,7 +745,7 @@
 
 ################################################################
 - type: entity
-  parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseRestrictedContraband]
+  parent: [ClothingOuterCoatWarden, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterWarden
   name: warden's armored winter coat
   description: A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events.
@@ -783,7 +783,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterWarden
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband]
+  parent: [BaseSyndicateContraband, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterSyndieCap
   name: syndicate's winter coat
   description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool."
@@ -808,7 +808,7 @@
 
 ##############################################################
 - type: entity
-  parent: [ClothingOuterWinterWarden, BaseSyndicateContraband]
+  parent: [BaseSyndicateContraband, ClothingOuterWinterHoS]
   id: ClothingOuterWinterSyndieCapArmored
   name: syndicate's armored winter coat
   description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool."