Merge branch 'DeltaV-Station:master' into Byoin

DeltaV-Station · Jan 2, 2025 · 7302cff · 7302cff
2 parents 8767a2f + c70307b
commit 7302cff
Show file tree

Hide file tree

Showing 69 changed files with 31,358 additions and 20,639 deletions.
diff --git a/...tionTests/Tests/DeltaV/CrimeassistTest.cs → ...grationTests/Tests/_DV/CrimeassistTest.cs b/...tionTests/Tests/DeltaV/CrimeassistTest.cs → ...grationTests/Tests/_DV/CrimeassistTest.cs
@@ -5,7 +5,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests.DeltaV;
+namespace Content.IntegrationTests.Tests._DV;
 
 [TestFixture]
 public sealed class CrimeAssistTest

diff --git a/...nTests/Tests/DeltaV/MetempsychosisTest.cs → ...tionTests/Tests/_DV/MetempsychosisTest.cs b/...nTests/Tests/DeltaV/MetempsychosisTest.cs → ...tionTests/Tests/_DV/MetempsychosisTest.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests.DeltaV;
+namespace Content.IntegrationTests.Tests._DV;
 
 [TestFixture]
 public sealed class MetempsychosisTest

diff --git a/...ts/Tests/DeltaV/ReverseEngineeringTest.cs → ...Tests/Tests/_DV/ReverseEngineeringTest.cs b/...ts/Tests/DeltaV/ReverseEngineeringTest.cs → ...Tests/Tests/_DV/ReverseEngineeringTest.cs
@@ -3,7 +3,7 @@
 using Content.Shared.ReverseEngineering;
 using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests.DeltaV;
+namespace Content.IntegrationTests.Tests._DV;
 
 [TestFixture]
 public sealed class ReverseEngineeringTest

diff --git a/...ationTests/Tests/DeltaV/RoboisseurTest.cs → ...egrationTests/Tests/_DV/RoboisseurTest.cs b/...ationTests/Tests/DeltaV/RoboisseurTest.cs → ...egrationTests/Tests/_DV/RoboisseurTest.cs
@@ -5,7 +5,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests.DeltaV;
+namespace Content.IntegrationTests.Tests._DV;
 
 [TestFixture]
 [TestOf(typeof(RoboisseurSystem))]

diff --git a/...grationTests/Tests/DeltaV/ShipyardTest.cs → ...ntegrationTests/Tests/_DV/ShipyardTest.cs b/...grationTests/Tests/DeltaV/ShipyardTest.cs → ...ntegrationTests/Tests/_DV/ShipyardTest.cs
@@ -5,7 +5,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests.DeltaV;
+namespace Content.IntegrationTests.Tests._DV;
 
 [TestFixture]
 [TestOf(typeof(ShipyardSystem))]

diff --git a/Content.Shared/_DV/Carrying/CarryingSystem.cs b/Content.Shared/_DV/Carrying/CarryingSystem.cs
@@ -57,6 +57,7 @@ public override void Initialize()
         SubscribeLocalEvent<CarryingComponent, BeforeThrowEvent>(OnThrow);
         SubscribeLocalEvent<CarryingComponent, EntParentChangedMessage>(OnParentChanged);
         SubscribeLocalEvent<CarryingComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<CarryingComponent, DownedEvent>(OnDowned);
         SubscribeLocalEvent<BeingCarriedComponent, InteractionAttemptEvent>(OnInteractionAttempt);
         SubscribeLocalEvent<BeingCarriedComponent, UpdateCanMoveEvent>(OnMoveAttempt);
         SubscribeLocalEvent<BeingCarriedComponent, StandAttemptEvent>(OnStandAttempt);
@@ -158,6 +159,11 @@ private void OnMobStateChanged(Entity<CarryingComponent> ent, ref MobStateChange
         DropCarried(ent, ent.Comp.Carried);
     }
 
+    private void OnDowned(Entity<CarryingComponent> ent, ref DownedEvent args)
+    {
+        DropCarried(ent, ent.Comp.Carried);
+    }
+
     /// <summary>
     /// Only let the person being carried interact with their carrier and things on their person.
     /// </summary>

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,56 +1,4 @@
 Entries:
-- author: Mnemotechnician
-  changes:
-  - message: Carrying is less likely to behave erratically or suddenly interrupt now.
-    type: Fix
-  - message: You can now see when someone is trying to pick you up, and also you can
-      interrupt your attempt at escaping from their hands or inventory.
-    type: Add
-  - message: You can now properly take Felinids out of bags and place them inside.
-    type: Add
-  - message: Scientists have discovered that Felinids can sleep in bags.
-    type: Add
-  id: 334
-  time: '2024-05-06T18:21:07.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1118
-- author: Lyndomen
-  changes:
-  - message: Syndicate Agents will no longer receive the "Become Psionic" objective.
-    type: Tweak
-  id: 335
-  time: '2024-05-06T22:02:34.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1166
-- author: Lyndomen
-  changes:
-  - message: Psionic Mute now has a higher Glimmer threshold for when it may occur.
-    type: Tweak
-  id: 336
-  time: '2024-05-06T22:02:42.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1168
-- author: Lyndomen
-  changes:
-  - message: Changed TC penalties for several roles! Atmosians rejoice.
-    type: Tweak
-  id: 337
-  time: '2024-05-06T22:04:00.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1165
-- author: NullWanderer
-  changes:
-  - message: Merged upstream
-    type: Add
-  id: 338
-  time: '2024-05-07T20:50:32.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1170
-- author: NullWanderer
-  changes:
-  - message: Fixed some of the harpies emotes that had previously broken with merges
-    type: Fix
-  - message: Futureproofed harpy emotes by allowing conflicting chat triggers to exist.
-      If you notice sounds playing twice, please report them.
-    type: Tweak
-  id: 339
-  time: '2024-05-07T23:49:26.865090+00:00'
-  url: null
 - author: WarMechanic
   changes:
   - message: Added the IgnoreStripHidden variable to ThievingComponent, which allows
@@ -3839,3 +3787,50 @@
   id: 833
   time: '2025-01-01T14:32:51.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2539
+- author: Stop-Signs
+  changes:
+  - message: Security warden suit has been made tankier but slower to differentiate
+      it from the HOS
+    type: Tweak
+  id: 834
+  time: '2025-01-01T14:36:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2397
+- author: HTMLSystem
+  changes:
+  - message: Added formal dresses for the LO, HoP, and CJ! Find them in their dressers,
+      lockers, loadouts, and uniform printer!
+    type: Add
+  - message: Added the HoP's formal suit to the uniform printer!
+    type: Add
+  id: 835
+  time: '2025-01-01T20:19:36.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2556
+- author: Velcroboy
+  changes:
+  - message: Tortuga is now nitrogen friendly and perma got some leg room.
+    type: Tweak
+  id: 836
+  time: '2025-01-01T20:25:43.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2537
+- author: Velcroboy
+  changes:
+  - message: Arena Nitrogen breathers can breath a little easier in the new N2 Lounge.
+    type: Tweak
+  id: 837
+  time: '2025-01-01T20:31:46.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2580
+- author: Velcroboy
+  changes:
+  - message: The Hive kitchen and botany has flipped locations with arcade and library.
+    type: Tweak
+  id: 838
+  time: '2025-01-02T05:03:04.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2551
+- author: Unkn0wnGh0st333
+  changes:
+  - message: Shoko is no longer christmasy and now has a bunch of cool things like
+      holopads. Bleh
+    type: Tweak
+  id: 839
+  time: '2025-01-02T06:09:56.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2530