Merge branch 'master' into shadowkin-rework

Simple-Station · Nov 17, 2024 · 11b8405 · 11b8405
2 parents f9940a5 + 2eea0f7
commit 11b8405
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -2289,7 +2289,7 @@ private Dictionary<string, object> CreateTree(List<LoadoutCategoryPrototype> cat
                 return match;
 
             foreach (var subcategory in parent.Contents.Where(c => c is NeoTabContainer).Cast<NeoTabContainer>())
-                match = FindCategory(id, subcategory);
+                match ??= FindCategory(id, subcategory);
 
             return match;
         }

diff --git a/Content.Server/StationEvents/Events/PirateRadioSpawnRule.cs b/Content.Server/StationEvents/Events/PirateRadioSpawnRule.cs
@@ -12,6 +12,7 @@
 using Content.Shared.CCVar;
 using Robust.Shared.Serialization.Manager;
 using Content.Shared.Parallax.Biomes;
+using Robust.Shared.Map;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -24,6 +25,7 @@ public sealed class PirateRadioSpawnRule : StationEventSystem<PirateRadioSpawnRu
     [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly TransformSystem _xform = default!;
     [Dependency] private readonly ISerializationManager _serializationManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
 
     protected override void Started(EntityUid uid, PirateRadioSpawnRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
@@ -46,6 +48,9 @@ protected override void Started(EntityUid uid, PirateRadioSpawnRuleComponent com
             return;
 
         var targetStation = _random.Pick(stations);
+        if (!_mapManager.MapExists(Transform(targetStation).MapID))
+            return; /// SHUT UP HEISENTESTS. DIE.
+
         var randomOffset = _random.NextVector2(component.MinimumDistance, component.MaximumDistance);
 
         var outpostOptions = new MapLoadOptions
@@ -54,7 +59,7 @@ protected override void Started(EntityUid uid, PirateRadioSpawnRuleComponent com
             LoadMap = false,
         };
 
-        if (!_map.TryLoad(GameTicker.DefaultMap, _random.Pick(component.PirateRadioShuttlePath), out var outpostids, outpostOptions))
+        if (!_map.TryLoad(Transform(targetStation).MapID, _random.Pick(component.PirateRadioShuttlePath), out var outpostids, outpostOptions))
             return;
 
         SpawnDebris(component, outpostids);