Merge remote-tracking branch 'EE-Master/master' into Update-11/24/2024

SS14-Classic · Nov 25, 2024 · 20d9f8f · 20d9f8f
2 parents 3f349a0 + 5fe4b1e
commit 20d9f8f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
@@ -137,12 +137,13 @@ public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null,
                 else
                 {
                     _xformSystem.AttachToGridOrMap(entity, xform);
+                    var direction = holder.CurrentDirection == Direction.Invalid ? holder.PreviousDirection : holder.CurrentDirection;
 
-                    if (holder.PreviousDirection != Direction.Invalid && _xformQuery.TryGetComponent(xform.ParentUid, out var parentXform))
+                    if (direction != Direction.Invalid && _xformQuery.TryGetComponent(gridUid, out var gridXform))
                     {
-                        var direction = holder.PreviousDirection.ToAngle();
-                        direction += _xformSystem.GetWorldRotation(parentXform);
-                        _throwing.TryThrow(entity, direction.ToWorldVec() * 3f, 10f);
+                        var directionAngle = direction.ToAngle();
+                        directionAngle += _xformSystem.GetWorldRotation(gridXform);
+                        _throwing.TryThrow(entity, directionAngle.ToWorldVec() * 3f, 10f);
                     }
                 }
             }

diff --git a/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs b/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Tools.Components;
 using Content.Shared.Damage.Events;
 using Content.Shared.Nyanotrasen.Abilities.Oni;
+using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Containers;
@@ -19,8 +20,7 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<OniComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
             SubscribeLocalEvent<OniComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
-            SubscribeLocalEvent<OniComponent, MeleeHitEvent>(OnOniMeleeHit);
-            SubscribeLocalEvent<HeldByOniComponent, MeleeHitEvent>(OnHeldMeleeHit);
+            SubscribeLocalEvent<MeleeWeaponComponent, GetMeleeDamageEvent>(OnGetMeleeDamage);
             SubscribeLocalEvent<HeldByOniComponent, TakeStaminaDamageEvent>(OnStamHit);
         }
 
@@ -55,17 +55,12 @@ private void OnEntRemoved(EntityUid uid, OniComponent component, EntRemovedFromC
             RemComp<HeldByOniComponent>(args.Entity);
         }
 
-        private void OnOniMeleeHit(EntityUid uid, OniComponent component, MeleeHitEvent args)
+        private void OnGetMeleeDamage(EntityUid uid, MeleeWeaponComponent component, ref GetMeleeDamageEvent args)
         {
-            args.ModifiersList.Add(component.MeleeModifiers);
-        }
-
-        private void OnHeldMeleeHit(EntityUid uid, HeldByOniComponent component, MeleeHitEvent args)
-        {
-            if (!TryComp<OniComponent>(component.Holder, out var oni))
+            if (!TryComp<OniComponent>(args.User, out var oni))
                 return;
 
-            args.ModifiersList.Add(oni.MeleeModifiers);
+            args.Modifiers.Add(oni.MeleeModifiers);
         }
 
         private void OnStamHit(EntityUid uid, HeldByOniComponent component, TakeStaminaDamageEvent args)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -8129,3 +8129,12 @@ Entries:
   id: 6539
   time: '2024-11-22T21:54:10.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1001
+- author: Skubman
+  changes:
+    - type: Tweak
+      message: >-
+        As an Oni, examining the damage values of weapons now takes into account
+        the melee damage bonus from your species or trait.
+  id: 6540
+  time: '2024-11-24T18:44:48.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1268
diff --git a/RobustToolbox b/RobustToolbox
+1 −1		MSBuild/Robust.Engine.Version.props
+1 −1		NetSerializer
+34 −0		RELEASE-NOTES.md
+9 −0		Resources/Locale/en-US/_engine_lib.ftl
+2 −1		Robust.Client/Audio/AudioSystem.cs
+0 −1		Robust.Client/GameStates/NetGraphOverlay.cs
+11 −2		Robust.Client/Graphics/Clyde/GLContext/GLContextWindow.cs
+5 −4		Robust.Client/Placement/Modes/AlignTileAny.cs
+5 −6		Robust.Client/Placement/Modes/AlignTileEmpty.cs
+3 −3		Robust.Client/Placement/PlacementManager.cs
+3 −2		Robust.Client/Placement/PlacementMode.cs
+5 −3		Robust.Client/UserInterface/Controls/BoxContainer.cs
+2 −2		Robust.Client/UserInterface/Controls/SpinBox.cs
+8 −5		Robust.Client/UserInterface/Controls/SplitContainer.cs
+0 −5		Robust.Client/UserInterface/CustomControls/TextEditRopeViz.cs
+1 −0		Robust.Client/UserInterface/UserInterfaceManager.Input.cs
+11 −4		Robust.Client/ViewVariables/Traits/ViewVariablesTraitMembers.cs
+3 −1		Robust.Server/Console/SystemConsoleManager.cs
+4 −4		Robust.Server/GameStates/PvsSystem.Chunks.cs
+18 −2		Robust.Server/Program.cs
+8 −0		Robust.Shared/CVars.cs
+6 −5		Robust.Shared/ContentPack/Sandbox.yml
+3 −7		Robust.Shared/GameObjects/Systems/SharedEyeSystem.cs
+2 −2		Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
+11 −0		Robust.Shared/Localization/LocalizationManager.Functions.cs
+3 −2		Robust.Shared/Toolshed/Attributes.cs
+11 −0		Robust.Shared/Toolshed/Commands/Entities/WithCommand.cs
+5 −1		Robust.Shared/Toolshed/Commands/Generic/AsCommand.cs
+19 −21		Robust.Shared/Toolshed/ReflectionExtensions.cs
+5 −2		Robust.Shared/Toolshed/ToolshedCommand.Implementations.cs
+25 −0		Robust.Shared/Utility/FormattedMessage.cs
+2 −2		Robust.Shared/Utility/UniqueIndex.cs
+3 −6		Robust.Shared/Utility/UniqueIndexHkm.cs
+4 −3		Robust.UnitTesting/Shared/GameState/DeletionNetworkingTests.cs
+3 −2		Robust.UnitTesting/Shared/Map/GridCollision_Test.cs
+6 −4		Robust.UnitTesting/Shared/Map/GridContraction_Test.cs
+4 −3		Robust.UnitTesting/Shared/Map/GridFixtures_Tests.cs
+9 −9		Robust.UnitTesting/Shared/Map/GridRotation_Tests.cs
+5 −4		Robust.UnitTesting/Shared/Physics/BroadphaseNetworkingTest.cs
+6 −3		Robust.UnitTesting/Shared/Physics/CollisionWake_Test.cs
+4 −2		Robust.UnitTesting/Shared/Physics/GridMovement_Test.cs
+5 −3		Robust.UnitTesting/Shared/Physics/RecursiveUpdateTest.cs
+17 −9		Tools/package_client_build.py