Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

…-station-14 into 2024-12-22-cargo-destinations

Content.IntegrationTests/PoolSettings.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 using Robust.Shared.Random;
 
@@ -93,7 +93,7 @@ public sealed class PoolSettings
     /// <summary>
     /// Frontier: the preset to run the game in.
     /// Set to secret for upstream tests to mimic upstream behaviour.
-    /// If you need to check adventure game rule things, set this to Adventure.
+    /// If you need to check adventure game rule things, set this to nfadventure or nfpirate.
     /// </summary>
     public string GameLobbyDefaultPreset { get; set; } = "secret";
 

Content.Server/AlertLevel/AlertLevelSystem.cs

@@ -172,8 +172,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
             return;
         // End Frontier
 
-        if (!Resolve(station, ref dataComponent) // Frontier: remove component
-            || component.AlertLevels == null
+        if (component.AlertLevels == null // Frontier: remove component, resolve station to data component later
             || !component.AlertLevels.Levels.TryGetValue(level, out var detail)
             || component.CurrentLevel == level)
         {
@@ -196,7 +195,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
         component.CurrentLevel = level;
         component.IsLevelLocked = locked;
 
-        var stationName = dataComponent.EntityName;
+        //var stationName = dataComponent.EntityName; // Frontier: remove station name
 
         var name = level.ToLower();
 
@@ -232,8 +231,9 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
             }
         }
 
-        if (announce)
+        if (announce && Resolve(station, ref dataComponent)) // Frontier: add Resolve for dataComponent
         {
+            var stationName = dataComponent.EntityName; // Frontier: moved down
             _chatSystem.DispatchStationAnnouncement(station, announcementFull, playDefaultSound: playDefault,
                 colorOverride: detail.Color, sender: stationName);
         }

Content.Server/Light/EntitySystems/EmergencyLightSystem.cs

@@ -32,6 +32,8 @@ public override void Initialize()
         SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertLevelChanged);
         SubscribeLocalEvent<EmergencyLightComponent, ExaminedEvent>(OnEmergencyExamine);
         SubscribeLocalEvent<EmergencyLightComponent, PowerChangedEvent>(OnEmergencyPower);
+
+        SubscribeLocalEvent<EmergencyLightComponent, MapInitEvent>(OnMapInit); // Frontier
     }
 
     private void OnEmergencyPower(Entity<EmergencyLightComponent> entity, ref PowerChangedEvent args)
@@ -245,4 +247,21 @@ private void TurnOn(Entity<EmergencyLightComponent> entity, Color color)
         _appearance.SetData(entity.Owner, EmergencyLightVisuals.On, true);
         _ambient.SetAmbience(entity.Owner, true);
     }
+
+    // Frontier: ensure the lights are accurate to the station
+    private void OnMapInit(Entity<EmergencyLightComponent> entity, ref MapInitEvent ev)
+    {
+        if (!TryComp<AlertLevelComponent>(_sectorService.GetServiceEntity(), out var alert))
+            return;
+
+        if (alert.AlertLevels == null || !alert.AlertLevels.Levels.TryGetValue(alert.CurrentLevel, out var details))
+            return;
+
+        entity.Comp.ForciblyEnabled = details.ForceEnableEmergencyLights;
+        if (details.ForceEnableEmergencyLights)
+            TurnOn(entity, details.EmergencyLightColor);
+        else
+            TurnOff(entity, details.EmergencyLightColor);
+    }
+    // End Frontier
 }

Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs

@@ -3,7 +3,6 @@
 using Content.Server.Radio.EntitySystems;
 using Content.Server._NF.Bank;
 using Content.Server.Shipyard.Components;
-using Content.Shared._NF.GameRule;
 using Content.Shared.Bank.Components;
 using Content.Shared.Shipyard.Events;
 using Content.Shared.Shipyard.BUI;

Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs → Content.Server/_NF/GameRule/Components/NFAdventureRuleComponent.cs

@@ -1,10 +1,7 @@
-using Content.Shared.Procedural;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
 namespace Content.Server._NF.GameRule.Components;
 
-[RegisterComponent, Access(typeof(NfAdventureRuleSystem))]
-public sealed partial class AdventureRuleComponent : Component
+[RegisterComponent, Access(typeof(NFAdventureRuleSystem))]
+public sealed partial class NFAdventureRuleComponent : Component
 {
     public List<EntityUid> NFPlayerMinds = new();
     public List<EntityUid> CargoDepots = new();