Change PostMapInit Path to our actual maps

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -82,8 +82,8 @@ namespace Content.IntegrationTests.Tests
             .ToArray();
 
         private static readonly string[] GameMaps = GameDataScrounger.PrototypesOfKind<GameMapPrototype>().Where(x => x != PoolManager.TestMap).ToArray();
-        private static readonly ResPath[] AllMapFiles = GameDataScrounger.FilesInDirectoryInVfs("/Maps/_DV", "*.yml");
-        private static readonly ResPath[] ShuttleMapFiles = GameDataScrounger.FilesInDirectoryInVfs("/Maps/_DV/Shuttles", "*.yml");
+        private static readonly ResPath[] AllMapFiles = GameDataScrounger.FilesInDirectoryInVfs("/Maps/", "*.yml");
+        private static readonly ResPath[] ShuttleMapFiles = GameDataScrounger.FilesInDirectoryInVfs("/Maps/Shuttles", "*.yml");
 
         private static readonly ProtoId<EntityCategoryPrototype> DoNotMapCategory = "DoNotMap";
 

Content.Shared/Body/BodySystem.cs

@@ -33,9 +33,6 @@ public sealed partial class BodySystem : EntitySystem
         SubscribeLocalEvent<BodyComponent, EntInsertedIntoContainerMessage>(OnBodyEntInserted);
         SubscribeLocalEvent<BodyComponent, EntRemovedFromContainerMessage>(OnBodyEntRemoved);
 
-        SubscribeLocalEvent<BodyComponent, OrganInsertedIntoEvent>(OnOrganInserted);
-        SubscribeLocalEvent<BodyComponent, OrganRemovedFromEvent>(OnOrganRemoved);
-
         _bodyQuery = GetEntityQuery<BodyComponent>();
         _organQuery = GetEntityQuery<OrganComponent>();
 
@@ -100,39 +97,4 @@ public sealed partial class BodySystem : EntitySystem
     {
         args.Handled = true;
     }
-
-
-    // Delta V - Organ Functionality Solution
-    private void OnOrganInserted(Entity<BodyComponent> ent, ref OrganInsertedIntoEvent args)
-    {
-        if (!TryComp<OrganComponent>(args.Organ, out var organ) || organ.OnAdd == null)
-            return;
-
-        // Delta V - Begin Organ Functionality Solution
-        foreach (var (key, comp) in organ.OnAdd)
-        {
-            var compType = comp.Component.GetType();
-            if (HasComp(ent, compType))
-                continue;
-
-            AddComp(ent, comp.Component);
-        }
-    }
-
-    private void OnOrganRemoved(Entity<BodyComponent> ent, ref OrganRemovedFromEvent args)
-    {
-        if (!TryComp<OrganComponent>(args.Organ, out var organ) || organ.OnAdd == null)
-            return;
-
-        // Delta V - Begin Organ Functionality Solution
-        foreach (var (key, comp) in organ.OnAdd)
-        {
-            var compType = comp.Component.GetType();
-            if (!HasComp(ent, compType))
-                continue;
-
-            RemComp(ent, comp.Component);
-        }
-    }
-    // Delta V - End
 }

Content.Shared/Body/OrganComponent.cs

@@ -22,11 +22,4 @@ public sealed partial class OrganComponent : Component
     /// </summary>
     [DataField]
     public ProtoId<OrganCategoryPrototype>? Category;
-
-    // Delta V - Organ Functionality
-    /// <summary>
-    /// When attached, the organ ensures that these components are added onto the entity
-    /// </summary>
-    [DataField]
-    public ComponentRegistry? OnAdd;
 }

Resources/Prototypes/_DV/Body/Species/asakim.yml

@@ -209,6 +209,11 @@
     accent: draconian
   - type: BlockWriting # can't speak common can't write common. better get an AAC tablet
   # End DeltaV Additions
+  - type: NightVision
+    isEquipment: false
+    color: "#ae65bf"
+    activateSound: null
+    deactivateSound: null
 
 - type: entity
   parent: OrganBase
@@ -311,10 +316,3 @@
   - type: VisualOrgan
     data:
       sprite: _Mono/Mobs/Customization/asakimeyes.rsi
-  - type: Organ
-    onAdd:
-    - type: NightVision
-      isEquipment: false
-      color: "#ae65bf"
-      activateSound: null
-      deactivateSound: null

Resources/Prototypes/_DV/Body/Species/avali.yml

@@ -266,13 +266,6 @@
     data:
       sprite: _Starlight/Mobs/Species/Avali/parts.rsi
       state: eyes
-  - type: Organ
-    onAdd:
-    - type: EyeCursorOffset
-      maxOffset: 5
-      pvsIncrease: 0.5
-      enabled: false
-    - type: CursorOffsetAction
 
 - type: entity
   parent: [ OrganReptilianStomach, OrganAvaliInternal ]

Resources/Prototypes/_DV/Body/Species/chitinid.yml

@@ -157,6 +157,13 @@
     needsHands: false
   - type: CosmicMarkVisuals
     subtleState: moth
+  - type: UnpoweredFlashlight
+  - type: PointLight
+    enabled: false
+    radius: 3
+    softness: 5
+    color: "#2CFA1F"
+    autoRot: true
 
 - type: entity
   parent: OrganBase
@@ -291,15 +298,6 @@
   id: OrganChitinidLiver
   parent: [ OrganAnimalLiver, OrganChitinidInternal ]
   components:
-  - type: Organ
-    onAdd:
-    - type: UnpoweredFlashlight
-    - type: PointLight
-      enabled: false
-      radius: 3
-      softness: 5
-      color: "#2CFA1F"
-      autoRot: true
   - type: Metabolizer
     maxReagents: 1
     metabolizerTypes: [ Animal ]