:trollface:

Content.Server/_DV/Planet/PlanetSystem.cs

@@ -56,7 +56,7 @@ public sealed class PlanetSystem : EntitySystem
     {
         var map = SpawnPlanet(id, runMapInit: false);
         var mapId = Comp<MapComponent>(map).MapId;
-        if (!_mapLoader.TryLoadMapWithId(mapId, path, out _, out var grids))
+        if (!_mapLoader.TryLoadGrid(mapId, path, out var grid))
         {
             Log.Error($"Failed to load planet grid {path} for planet {id}!");
             Del(map);
@@ -64,12 +64,9 @@ public sealed class PlanetSystem : EntitySystem
         }
 
         // don't want rocks spawning inside the base
-        foreach (var gridUid in grids)
-        {
-            _setTiles.Clear();
-            var aabb = Comp<MapGridComponent>(gridUid).LocalAABB;
-            _biome.ReserveTiles(map, aabb.Enlarged(0.2f), _setTiles);
-        }
+        _setTiles.Clear();
+        var aabb = Comp<MapGridComponent>(grid.Value).LocalAABB;
+        _biome.ReserveTiles(map, aabb.Enlarged(0.2f), _setTiles);
 
         _map.InitializeMap(map);
         return map;

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -115,7 +115,7 @@
       food:
         reagents:
         - ReagentId: GroundBee
-          Quantity: 1
+          Quantity: 5 # DeltaV - was 1
   - type: Butcherable
     spawned:
     - id: null # Should give nothing when you butcher it so we set the item id it needs to spawn to null
@@ -138,14 +138,6 @@
   - type: HTN
     rootTask:
       task: SimpleHostileCompound
-  - type: Extractable # DeltaV - Make it so bees can be ground up
-    grindableSolutionName: bee
-  - type: SolutionContainerManager
-    solutions:
-      bee:
-        reagents:
-        - ReagentId: GroundBee
-          Quantity: 5
   - type: ZombieImmune
 
 - type: entity

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -1542,7 +1542,7 @@
     appearanceDataInit:
      enum.PdaVisuals.PdaType:
        !type:String
-       pda-librarian # DeltaV - no wizard resprite yet
+       pda-library # DeltaV - no wizard resprite yet
   - type: PdaBorderColor
     borderColor: "#7F3300"
   - type: Icon

Resources/Prototypes/_DV/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -1,6 +1,6 @@
 # Standard Combat Hardsuits
 - type: entity
-  parent: ClothingHeadSuitWithLightBase
+  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitCombatStandard
   name: combat hardsuit helmet
   description: An armoured helmet with a yellow visor and dual head-mounted lights.
@@ -34,7 +34,7 @@
 
 # Medical Combat Hardsuits
 - type: entity
-  parent: ClothingHeadSuitWithLightBase
+  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitCombatMedical
   name: medical combat hardsuit helmet
   description: A lightweight armoured helmet with full-face blue visor and head-mounted light.
@@ -68,7 +68,7 @@
 
 # Riot Combat Hardsuits
 - type: entity
-  parent: ClothingHeadSuitWithLightBase
+  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitCombatRiot
   name: riot combat hardsuit helmet
   description: A heavy armoured helmet with a sealed visor with yellow slits and dual head-mounted lights.
@@ -102,7 +102,7 @@
 
 # Advanced Combat Hardsuits
 - type: entity
-  parent: ClothingHeadSuitWithLightBase
+  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitCombatAdvanced
   name: advanced combat hardsuit helmet
   description: A light but durable helmet with full-face protection and four head-mounted lights.