Merge branch 'master' into autovotes

Content.Server/StationEvents/Events/PirateRadioSpawnRule.cs

@@ -10,6 +10,8 @@
 using System.Linq;
 using Content.Server.GameTicking.Components;
 using Content.Shared.CCVar;
+using Robust.Shared.Serialization.Manager;
+using Content.Shared.Parallax.Biomes;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -21,13 +23,26 @@ public sealed class PirateRadioSpawnRule : StationEventSystem<PirateRadioSpawnRu
     [Dependency] private readonly IConfigurationManager _confMan = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly TransformSystem _xform = default!;
+    [Dependency] private readonly ISerializationManager _serializationManager = default!;
 
     protected override void Started(EntityUid uid, PirateRadioSpawnRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
 
         var stations = _gameTicker.GetSpawnableStations();
-        if (stations is null || stations.Count <= 0)
+        if (stations is null)
+            return;
+
+        // Remove any station from the list that is on a Planet's surface.
+        // We have to do this because if we spawn the listening post 1.5 kilometers from the station on a planet
+        // The server will then attempt to generate 7 billion entities, immediately exceeding the 32bit signed integer limit for EntityUids.
+        var stationsCopy = _serializationManager.CreateCopy(stations, notNullableOverride: true);
+        foreach (var station in stationsCopy)
+            if (HasComp<BiomeComponent>(Transform(station).MapUid))
+                stations.Remove(station);
+
+        // _random forces Test Fails if given an empty list. which is guaranteed to happen during Tests.
+        if (stations.Count <= 0)
             return;
 
         var targetStation = _random.Pick(stations);

Resources/Audio/Lobby/attributions.yml

@@ -1,4 +1,14 @@
-- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"]
+- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "All songs used are produced by Danya Vodovoz, royalty free."
   source: "https://soundcloud.com/danyavodovoz"
+
+- files: ["atomicamnesiammx.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Atomic Amnesia MMX by Phillip Dyer. Converted from MP3 to OGG."
+  source: "https://soundcloud.com/3kliksphilip/atomic-amnesia-mmx-1"
+
+- files: ["Monument.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Monument by Six Umbrellas."
+  source: "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and"

Resources/Changelog/Changelog.yml

@@ -7853,3 +7853,35 @@ Entries:
   id: 6514
   time: '2024-11-10T15:22:47.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1195
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: Butlertron is no longer as wide as a barn.
+  id: 6515
+  time: '2024-11-13T23:08:38.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1192
+- author: Ichaie
+  changes:
+    - type: Tweak
+      message: 'The Hive (map): add an SM engine to the eng, replacing the singularity.'
+  id: 6516
+  time: '2024-11-13T23:12:41.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1201
+- author: DocNITE
+  changes:
+    - type: Add
+      message: Return  'Monument' and 'Atomic Amnesia MMX' as a lobby music.
+  id: 6517
+  time: '2024-11-13T23:17:11.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1204
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Syndicate Listening Posts can no longer spawn on a planet surface. This
+        isn't for balance reasons, I would love for planetside listening posts.
+        This is actually to address a server crashing bug whereby listening
+        posts on planets cause 7 billion entities to spawn.
+  id: 6518
+  time: '2024-11-13T23:27:00.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1188

Resources/Prototypes/Body/Prototypes/ipc.yml

@@ -12,10 +12,10 @@
     torso:
       part: TorsoIPC
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         brain: PositronicBrain
         heart: OrganIPCPump

Resources/Prototypes/Body/Prototypes/shadowkin.yml

@@ -13,10 +13,10 @@
     torso:
       part: TorsoShadowkin
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganShadowkinHeart
         stomach: OrganShadowkinStomach

Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml

@@ -47,3 +47,4 @@
       part: RightFootHarpy
     left foot:
       part: LeftFootHarpy
+

Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml

@@ -1,4 +1,4 @@
-- type: body
+- type: body
   name: "vulpkanin"
   id: Vulpkanin
   root: torso

Resources/Prototypes/DeltaV/NPC/roboisseur.yml

@@ -28,3 +28,15 @@
     attributes:
       gender: male
       proper: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.15,0.15,0.15"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+        - LowImpassable

Resources/Prototypes/SoundCollections/lobby.yml

@@ -19,3 +19,5 @@
     - /Audio/Lobby/hackers.ogg
     - /Audio/Lobby/every_light_is_blinking_at_once.ogg
     - /Audio/Lobby/DOS=HIGH,_UMB.ogg
+    - /Audio/Lobby/atomicamnesiammx.ogg
+    - /Audio/Lobby/Monument.ogg