Release 2 (#4780)

Some fixes

Author: Rinary1

Content.IntegrationTests/Tests/_Starlight/Power/GridPowerTests.cs

@@ -45,14 +45,15 @@ public sealed class GridPowerTests
         new("/Maps/_Starlight/Shuttles/LancePirates.yml"),
         new("/Maps/_Starlight/Shuttles/LynatiKr20/SmugglerMex.yml"),
         new("/Maps/_Starlight/Shuttles/Mining/breaker.yml"),
+        new("/Maps/_Starlight/Shuttles/Mining/asteroidcracker.yml"),
         new("/Maps/_Starlight/Shuttles/NSSV_MetaClass.yml"),
         new("/Maps/_Starlight/Shuttles/NT-Experimental-Botany-shuttle.yml"),
         new("/Maps/_Starlight/Shuttles/NTSV_HarrierClass.yml"),
         new("/Maps/_Starlight/Shuttles/Radiotower.yml"),
         new("/Maps/_Starlight/Shuttles/Reach.yml"),
         new("/Maps/_Starlight/Shuttles/RecluseClassSHC.yml"),
         new("/Maps/_Starlight/Shuttles/Salvage/pioneer.yml"),
-        new("/Maps/_Starlight/Shuttles/Salvage/pioneer_fuel.yml"),
+        new("/Maps/_Starlight/Shuttles/Salvage/expeditioneer.yml"),
         new("/Maps/_Starlight/Shuttles/Security/SP-4C3.yml"),
         new("/Maps/_Starlight/Shuttles/ShuttleEvent/ShadowBorgiGrid.yml"),
         new("/Maps/_Starlight/Shuttles/ShuttleEvent/UnknownShuttleFireResponse.yml"),

Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs

@@ -5,6 +5,7 @@
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
+using Content.Shared._Starlight.CrawlUnder; // Starlight
 using Content.Shared.Gravity;
 using Content.Shared.Hands;
 using Content.Shared.Hands.EntitySystems;
@@ -468,6 +469,12 @@ private bool TryForceStand(Entity<StaminaComponent?> entity)
     /// </summary>
     private bool IntersectingStandingColliders(Entity<TransformComponent?> entity)
     {
+        // Starlight begin
+        // Allows getting up from crawling while sneaking underneath the collider
+        if (TryComp<CrawlUnderObjectsComponent>(entity, out var crawlUnder) && crawlUnder.Enabled)
+            return false;
+        // Starlight end
+
         if (!Resolve(entity, ref entity.Comp))
             return false;
 

Content.Shared/_Starlight/CrawlUnder/SharedCrawlUnderObjectsSystem.cs

@@ -8,6 +8,7 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
+using Content.Shared.Standing;
 using Content.Shared.Stunnable;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Events;
@@ -138,10 +139,21 @@ private void DisableSneakMode(EntityUid uid, CrawlUnderObjectsComponent componen
         // Restore normal collision masks
         if (TryComp<FixturesComponent>(uid, out var fixtureComponent))
         {
+            var down = TryComp<StandingStateComponent>(uid, out var standing) && !standing.Standing;
+
             foreach (var (key, originalMask) in component.ChangedFixtures)
             {
                 if (fixtureComponent.Fixtures.TryGetValue(key, out var fixture))
-                    _physics.SetCollisionMask(uid, key, fixture, originalMask, fixtureComponent);
+                {
+                    var targetMask = down
+                        ? originalMask & ~StandingStateSystem.StandingCollisionLayer
+                        : originalMask | StandingStateSystem.StandingCollisionLayer;
+
+                    if (fixture.CollisionMask == targetMask)
+                        continue;
+
+                    _physics.SetCollisionMask(uid, key, fixture, targetMask, fixtureComponent);
+                }
             }
         }
 

Resources/Changelog/ChangelogStarlight.yml

@@ -1,32 +1,4 @@
 Entries:
-- author: wonderfulnewworld, princess_gurchi, Minemoder, ScarKy0
-  changes:
-  - message: Diona, Vox and Vulpkanins now have unique sneeze sounds.
-    type: Add
-  id: 405581
-  time: '2026-06-04T06:25:34.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/4650
-- author: wonderfulnewworld
-  changes:
-  - message: Changelings can now make a fake Protogen frame, allowing them to properly disguise as protogen.
-    type: Add
-  id: 405582
-  time: '2026-06-04T06:25:36.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/4645
-- author: wonderfulnewworld
-  changes:
-  - message: Ghost roles that don't use your character will not use Protogen, since they don't spawn with their armor frames.
-    type: Tweak
-  id: 405583
-  time: '2026-06-04T06:25:36.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/4645
-- author: Caws
-  changes:
-  - message: Security Suit Storages now come with jetpacks. Jetpacks have been mostly removed from being a manually mapped addition to maps, generally replaced with extra cell chargers and rechargers.
-    type: Add
-  id: 405584
-  time: '2026-06-05T00:29:57.000000+00:00'
-  url: https://github.com/ss14Starlight/space-station-14/pull/4598
 - author: Caws
   changes:
   - message: (All Maps) Security Officer ratios have been adjusted across all maps to be more consistent to the minimum/maximum players a map supports.
@@ -2799,4 +2771,32 @@ Entries:
   id: 405980
   time: '2026-06-14T05:02:54.000000+00:00'
   url: https://github.com/ss14Starlight/space-station-14/pull/4766
+- author: mikeysaurus
+  changes:
+  - message: Fixes a bug where Rodentia can break their collision states.
+    type: Fix
+  id: 405981
+  time: '2026-06-14T07:59:07.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4776
+- author: Darius
+  changes:
+  - message: Projectile speed from pyroclastic anomaly pulses increased.
+    type: Tweak
+  id: 405982
+  time: '2026-06-14T08:30:27.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4772
+- author: mikeysaurus, synthmin, johnny, Far Horizons
+  changes:
+  - message: Replaces the salvage shuttle SR-4S1 "Pioneer" with the SR-4S3 "Expeditioneer".
+    type: Add
+  id: 405983
+  time: '2026-06-14T08:30:29.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4384
+- author: mikeysaurus, synthmin, johnny, Far Horizons
+  changes:
+  - message: Replaces the mining shuttle NTMS-42A "Breaker" with the NTMS-62C "Asteroid Cracker".
+    type: Add
+  id: 405984
+  time: '2026-06-14T08:30:29.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4384
 Order: -1