NeoAvali: Female displacement fixes pt. 2

Resources/Prototypes/_Starlight/Entities/Mobs/Species/Neocyte/avali.yml

@@ -1,7 +1,7 @@
 - type: entity
   save: false
   name: Urist McAvalister
-  parent: [ BaseSpeciesPickupable, BaseMobNeocyte, BaseColdBird ]
+  parent: [ BaseSpeciesPickupable, BaseInventoryNeoAvali, BaseMobNeocyte, BaseColdBird ]
   id: BaseMobNeoAvali
   abstract: true
   components:
@@ -109,92 +109,12 @@
       bleedHealPerUpdate: 1.0
       critHealingModifier: 0.5
       stasisDamageReduction: 0.7
-    - type: Inventory
-      speciesId: avali
-      templateId: neocyte
-      femaleDisplacements:
-        jumpsuit:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: jumpsuit
-      displacements:
-        jumpsuit:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: jumpsuit
-        shoes:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: shoes
-        head:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: head
-        hand:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: hand
-        back:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: back
-        gloves:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: gloves
 
 - type: entity
-  parent: [BaseNeocyteAppearance, BaseSpeciesDummy]
+  parent: [BaseNeocyteAppearance, BaseInventoryNeoAvali, BaseSpeciesDummy]
   id: AppearanceNeoAvali
   categories: [ HideSpawnMenu ]
   description: A dummy neo-avali meant to be used in character setup.
   components:
     - type: HumanoidAppearance
       species: NeoAvali
-    - type: Inventory
-      speciesId: avali
-      templateId: neocyte
-      femaleDisplacements:
-        jumpsuit:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: jumpsuit
-      displacements:
-        jumpsuit:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: jumpsuit
-        shoes:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: shoes
-        head:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: head
-        hand:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: hand
-        back:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: back
-        gloves:
-          sizeMaps:
-            32:
-              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
-              state: gloves

Resources/Prototypes/_Starlight/Inventory/inventories.yml

@@ -65,6 +65,51 @@
             sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
             state: gloves
 
+- type: entity
+  id: BaseInventoryNeoAvali
+  parent: BaseInventoryAvali
+  abstract: true
+  components:
+    - type: Inventory
+      speciesId: avali
+      templateId: neocyte
+      femaleDisplacements: #Yes I know this is stupid.
+        jumpsuit:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: jumpsuit
+        outerClothing:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: outerclothing
+        shoes:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: shoes
+        head:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: head
+        hand:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: hand
+        back:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: back
+        gloves:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: gloves
+
 - type: entity
   id: BaseInventoryCyclorite
   abstract: true