Merge branch 'starlight-dev' into moff/shatter-the-twilight-reverie

Author: walksanatora

Content.IntegrationTests/Tests/Power/StationPowerTests.cs

@@ -75,6 +75,15 @@ public sealed class StationPowerTests : GameTest
         #endregion
     ];
 
+    #region Starlight
+    /// <summary>
+    /// Starlight: allows specific maps to skip having a upper bound on power in the case of admeme maps or where it is deemed acceptable by head mapper
+    /// </summary>
+    private static readonly HashSet<string> _noUpperBoundedPowerMaps = [
+        "StarlightRemix"
+    ];
+    #endregion
+
     public override PoolSettings PoolSettings => new ()
     {
         Dirty = true,
@@ -257,6 +266,8 @@ await server.WaitAssertion(() =>
             Assert.That(totalStartingCharge, Is.GreaterThanOrEqualTo(requiredStoredPower),
                 $"Needs at least {requiredStoredPower - totalStartingCharge} more stored power!");
             // Starlight start
+            if (_noUpperBoundedPowerMaps.Contains(mapProtoId))
+                return; //skip the section below if it is a no upper bound map.
             Assert.That(estimatedDuration, Is.LessThanOrEqualTo(MaximumPowerDurationSeconds),
                 $"Initial power for {mapProtoId} lasts too long! Max allowed {MaximumPowerDurationSeconds}s " +
                 $"but estimated to last {estimatedDuration}s remove some stored power!");

Content.Shared/IdentityManagement/IdentitySystem.cs

@@ -9,7 +9,6 @@
 using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
-using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.VoiceMask;
 using Robust.Shared.Containers;
 using Robust.Shared.Enums;
@@ -198,10 +197,8 @@ private void SetIdentityCriminalIcon(EntityUid uid)
     /// </returns>
     private string GetIdentityName(EntityUid target, IdentityRepresentation representation)
     {
-        // Starlight Begin - borgs are always identifiable, chassis shape aside (e.g. Borgi)
-        if (HasComp<BorgChassisComponent>(target))
+        if (IsAlwaysIdentifiable(target)) // Starlight
             return representation.ToStringKnown(true, null);
-        // Starlight End
 
         var ev = new SeeIdentityAttemptEvent();
 

Content.Shared/_Starlight/IdentityManagement/Components/AlwaysIdentifiableComponent.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Starlight.IdentityManagement.Components;
+
+/// <summary>
+/// The entity's real name always shows, even with an identity-concealing item
+/// worn (masks, helmets). Used for mobs that shouldn't be maskable, like the
+/// security K9. Mirrors the built-in always-identifiable handling for borgs.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class AlwaysIdentifiableComponent : Component
+{
+}

Content.Shared/_Starlight/IdentityManagement/IdentitySystem.Starlight.cs

@@ -0,0 +1,20 @@
+using Content.Shared._Starlight.IdentityManagement.Components;
+using Content.Shared.Silicons.Borgs.Components;
+
+// ReSharper disable once CheckNamespace
+namespace Content.Shared.IdentityManagement;
+
+public sealed partial class IdentitySystem
+{
+    /// <summary>
+    /// Whether this entity's real name should always show, ignoring any
+    /// identity-concealing worn items. Borgs are always identifiable (chassis
+    /// shape aside, e.g. Borgi); anything with <see cref="AlwaysIdentifiableComponent"/>
+    /// opts into the same behavior.
+    /// </summary>
+    private bool IsAlwaysIdentifiable(EntityUid target)
+    {
+        return HasComp<BorgChassisComponent>(target)
+            || HasComp<AlwaysIdentifiableComponent>(target);
+    }
+}

Resources/Changelog/ChangelogStarlight.yml

@@ -1,137 +1,4 @@
 Entries:
-- author: OMEGA
-  changes:
-  - message: The Chief Engineer's access configurator now starts in their toolbelt instead of their locker.
-    type: Tweak
-  id: 407655
-  time: '2026-08-16T15:53:55.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5638
-- author: OMEGA
-  changes:
-  - message: Removed duplicate items from the Chief Engineer's locker.
-    type: Remove
-  id: 407656
-  time: '2026-08-16T15:53:55.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5638
-- author: Mack
-  changes:
-  - message: Construction ghosts templates.
-    type: Add
-  id: 407657
-  time: '2026-08-16T16:24:08.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5649
-- author: Conflee
-  changes:
-  - message: increased Max Title Length from 25 to 35, and Max Content Length from 2048 to 3072, for News Articles.
-    type: Tweak
-  id: 407658
-  time: '2026-08-16T16:24:10.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5636
-- author: Johnny
-  changes:
-  - message: Added some extra spawners for mappers to use for EVA ERT.
-    type: Add
-  id: 407659
-  time: '2026-08-16T16:24:12.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5654
-- author: Johnny
-  changes:
-  - message: Changed the ERT chaplain to be more in line with what its meant to do.
-    type: Tweak
-  id: 407660
-  time: '2026-08-16T16:24:12.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5654
-- author: Johnny
-  changes:
-  - message: Changed some other loadouts slightly based off feedback.
-    type: Tweak
-  id: 407661
-  time: '2026-08-16T16:24:12.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5654
-- author: Johnny
-  changes:
-  - message: ERT Now actually get knives in their boots (including magboots).
-    type: Tweak
-  id: 407662
-  time: '2026-08-16T16:24:12.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5654
-- author: Musiklie
-  changes:
-  - message: Mumbling (ending the message with ..) will now make your text smaller.
-    type: Tweak
-  id: 407663
-  time: '2026-08-16T16:57:14.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5663
-- author: Common
-  changes:
-  - message: Specific accesses added for Clown and Mime.
-    type: Add
-  id: 407664
-  time: '2026-08-16T16:57:16.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5665
-- author: Common
-  changes:
-  - message: Change access on Clown Vend and Locker from theatre to Clown.
-    type: Tweak
-  id: 407665
-  time: '2026-08-16T16:57:16.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5665
-- author: Common
-  changes:
-  - message: Change access on Mime Vend and Locker from theatre to Mime.
-    type: Tweak
-  id: 407666
-  time: '2026-08-16T16:57:16.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5665
-- author: Conflee
-  changes:
-  - message: Added a Cat Bed, Raccoon Bed, generic Pet Bed, and 9 colored Soft Pet Beds, for more decorating options for mappers.
-    type: Add
-  id: 407667
-  time: '2026-08-16T17:31:59.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5666
-- author: Conflee
-  changes:
-  - message: Resprited the Dog Bed slightly to match the new Pet Beds.
-    type: Tweak
-  id: 407668
-  time: '2026-08-16T17:31:59.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5666
-- author: briochebear
-  changes:
-  - message: Added janitorial maid dress to janitor jumpsuit loadout.
-    type: Add
-  id: 407669
-  time: '2026-08-16T17:32:01.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5643
-- author: briochebear
-  changes:
-  - message: Added janitorial maid dress to service worker loadout.
-    type: Add
-  id: 407670
-  time: '2026-08-16T17:32:01.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5643
-- author: briochebear
-  changes:
-  - message: Added janitorial maid dress to trinkets category, under maid dresses.
-    type: Add
-  id: 407671
-  time: '2026-08-16T17:32:01.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5643
-- author: briochebear
-  changes:
-  - message: Janidrobe now offers the janitorial maid dress under the contraband catalogue, instead of the emagged catalogue.
-    type: Tweak
-  id: 407672
-  time: '2026-08-16T17:32:01.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5643
-- author: wonderfulnewworld, ItsMaitake
-  changes:
-  - message: Added Brass Walls and Reinforced Brass Walls.
-    type: Add
-  id: 407673
-  time: '2026-08-16T17:32:03.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/5613
 - author: wonderfulnewworld, ItsMaitake
   changes:
   - message: Added Brass Windows and Reinforced Brass Windows.
@@ -2799,4 +2666,137 @@ Entries:
   id: 408054
   time: '2026-09-02T22:50:05.000000+00:00'
   url: https://github.com/ss14Starlight/space-station-14/pull/5950
+- author: walksanatora
+  changes:
+  - message: Remix admeme station no-longer has a ghost of dev station providing unlimited captain slots and a 2nd arrivals shuttle.
+    type: Fix
+  id: 408055
+  time: '2026-09-03T01:39:31.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5914
+- author: Sparlight
+  changes:
+  - message: K9s will no longer suffer abject identity concealment issues.
+    type: Fix
+  id: 408056
+  time: '2026-09-03T02:04:58.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5954
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: You can now boil snails alive in the microwave.
+    type: Add
+  id: 408057
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Blood volume has been doubled.
+    type: Tweak
+  id: 408058
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Many chef recipes have been changed so the final result better matches the ingredients put in. This means overall the nutritional value of the chef's meals have increased.
+    type: Tweak
+  id: 408059
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Many chef recipes have had their ingredients changed.
+    type: Tweak
+  id: 408060
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Most sliceable foods now give a lot more slices.
+    type: Tweak
+  id: 408061
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Reagent container sizes have been standardized, at a base of 30 units per inventory square. Most containers can now hold more than they did before.
+    type: Tweak
+  id: 408062
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Changed the size of the silver and gold beakers; they don't fit the standards of the others, since they cost credits.
+    type: Tweak
+  id: 408063
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Chemical jugs and bar jugs are now Large (2x4) items.
+    type: Tweak
+  id: 408064
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Buckets now hold 360u and are 3x4 items.
+    type: Tweak
+  id: 408065
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Nukie medical duffel bag now comes with a bicaridine jug, a mixed puncturase & tranexamic acid jug, a mixed dermaline & pyrazine jug, and a mixed saline & dexalin plus jug.
+    type: Tweak
+  id: 408066
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Most items with slicing tool quality now can be used for butchering.
+    type: Tweak
+  id: 408067
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Butchering is now predicted and called slicing!
+    type: Tweak
+  id: 408068
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Butter and butter slices can be mixed into solutions.
+    type: Tweak
+  id: 408069
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Chemical dispenser and ChemMaster transfer increments have been changed to 1u, 5u, 10u, 15u, 20u, 30u, 40u, 60u, and 120u.
+    type: Tweak
+  id: 408070
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Hyposprays and jet injectors no longer spill when thrown.
+    type: Tweak
+  id: 408071
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: The salt and pepper requirements for several recipes have been heavily reduced.
+    type: Tweak
+  id: 408072
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
+- author: wonderfulnewworld, Princess Cheeseballs, kosticia, slarticodefast, themias, rumaks xyz, veprolet, AreYouConfused, insoPL, whatston3, cashew 42, B Kirill, portfiend, korczoczek, deltanedas, Winkarst cpu, Wintoli
+  changes:
+  - message: Butter now requires Cream instead of Milk to create.
+    type: Tweak
+  id: 408073
+  time: '2026-09-03T03:51:28.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/5893
 Order: -1