Merge branch 'master' into dragonops

Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

@@ -15,11 +15,11 @@ public abstract partial class SharedBuckleSystem
     private void InitializeInteraction()
     {
         SubscribeLocalEvent<StrapComponent, GetVerbsEvent<InteractionVerb>>(AddStrapVerbs);
-        SubscribeLocalEvent<StrapComponent, InteractHandEvent>(OnStrapInteractHand, before: [typeof(InteractionPopupSystem)]);
+        SubscribeLocalEvent<StrapComponent, InteractHandEvent>(OnStrapInteractHand, after: [typeof(InteractionPopupSystem)]); // DeltaV - after as subscription order has to match BuckleComponent
         SubscribeLocalEvent<StrapComponent, DragDropTargetEvent>(OnStrapDragDropTarget);
         SubscribeLocalEvent<StrapComponent, CanDropTargetEvent>(OnCanDropTarget);
 
-        SubscribeLocalEvent<BuckleComponent, InteractHandEvent>(OnBuckleInteractHand, before: [typeof(InteractionPopupSystem)]);
+        SubscribeLocalEvent<BuckleComponent, InteractHandEvent>(OnBuckleInteractHand, after: [typeof(InteractionPopupSystem)]); // DeltaV - after instead of before to hug buckled mobs
         SubscribeLocalEvent<BuckleComponent, GetVerbsEvent<InteractionVerb>>(AddUnbuckleVerb);
     }
 

Resources/Changelog/DeltaVChangelog.yml

@@ -1,61 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Made the random sentience event a glimmer event.
-    type: Tweak
-  - message: Fixed glimmer events never running.
-    type: Fix
-  id: 554
-  time: '2024-09-17T05:44:14.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1834
-- author: Beck Thompson
-  changes:
-  - message: The "Die a glorious death" objective is now limited to one traitor per
-      round maximum!
-    type: Tweak
-  id: 555
-  time: '2024-09-17T05:47:55.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1819
-- author: Fox
-  changes:
-  - message: New Lobby Track "Get It Done" by A-Guy
-    type: Add
-  id: 556
-  time: '2024-09-17T14:02:13.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1766
-- author: DisposableCrewmember42
-  changes:
-  - message: Shut the oracle up. Scientists may now research in peace.
-    type: Tweak
-  id: 557
-  time: '2024-09-17T14:09:06.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1786
-- author: deltanedas
-  changes:
-  - message: You no longer need a crowbar to pry powered firelocks open.
-    type: Tweak
-  id: 558
-  time: '2024-09-17T23:11:28.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1837
-- author: Adei, ErhardSteinhauer, Aikakakah
-  changes:
-  - message: Tweaked wooden tiles so they go with the rest of wood chairs / items
-      more.
-    type: Tweak
-  - message: Decals are now no longer offset by one pixel!
-    type: Tweak
-  - message: You can now build more secret doors.
-    type: Add
-  id: 559
-  time: '2024-09-18T05:11:08.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1842
-- author: Radezolid
-  changes:
-  - message: Nuclear operatives fire axe is no longer able to pry plating.
-    type: Fix
-  id: 560
-  time: '2024-09-18T08:57:33.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1844
 - author: dge21
   changes:
   - message: added a sweet new drink for the bar to serve
@@ -3890,3 +3833,57 @@
   id: 1053
   time: '2025-02-19T11:37:54.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2989
+- author: Lyndomen
+  changes:
+  - message: IPC bloodloss no longer causes more bleeding
+    type: Tweak
+  - message: IPCs eyes may be repaired with glass again
+    type: Fix
+  id: 1054
+  time: '2025-02-20T01:08:46.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3016
+- author: Eternally-Confused
+  changes:
+  - message: omnipatch stacks now correctly include 10 patches
+    type: Fix
+  id: 1055
+  time: '2025-02-20T23:06:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3014
+- author: Spielern
+  changes:
+  - message: Radiation no longer causes bleeding in IPCs.
+    type: Tweak
+  id: 1056
+  time: '2025-02-20T23:20:35.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3020
+- author: Stop-Signs
+  changes:
+  - message: Disaster pizza crate is no longer orderable
+    type: Remove
+  - message: Emergency pizza crate now costs more
+    type: Tweak
+  id: 1057
+  time: '2025-02-22T01:30:01.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3013
+- author: deltanedas
+  changes:
+  - message: Fixed atmos lockers with hardsuits not having insulated gloves.
+    type: Fix
+  id: 1058
+  time: '2025-02-22T01:34:16.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3025
+- author: makyo
+  changes:
+  - message: Add back hugging buckled characters.
+    type: Tweak
+  id: 1059
+  time: '2025-02-22T01:44:31.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/3024
+- author: IAmNotGray
+  changes:
+  - message: Elegance Station has recieved further tweaks according to community feedback.
+      Thank you for your continued patience!
+    type: Tweak
+  id: 1060
+  time: '2025-02-22T06:18:56.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2931