Revert "[Port] Resomi"

Content.Server/Chat/Systems/ChatSystem.cs

@@ -524,7 +524,7 @@ private void SendEntityWhisper(
             // Result is the intermediate message derived from the perceived one via obfuscation
             // Wrapped message is the result wrapped in an "x says y" string
             string result, wrappedMessage;
-            if (data.Range <= (TryComp<ChatModifierComponent>(listener, out var modifier) ? modifier.WhisperListeningRange : WhisperClearRange)) // WWDP-Edit
+            if (data.Range <= WhisperClearRange)
             {
                 // Scenario 1: the listener can clearly understand the message
                 result = perceivedMessage;

Content.Server/Flash/FlashSystem.cs

@@ -135,13 +135,6 @@ public void Flash(EntityUid target,
             if (!Resolve(target, ref flashable, false))
                 return;
 
-            // WWDP-Start
-            if (TryComp<FlashModifierComponent>(target, out var flashModifier))
-            {
-                flashDuration *= flashModifier.Modifier;
-            }
-            // WWDP-End
-
             var attempt = new FlashAttemptEvent(target, user, used);
             RaiseLocalEvent(target, attempt, true);
 

Content.Shared/Weapons/Ranged/Events/GunRefreshModifiersEvent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
 

Content.Shared/Wieldable/Components/WieldableComponent.cs

@@ -43,8 +43,6 @@ public sealed partial class WieldableComponent : Component
     /// </summary>
     [DataField]
     public bool AltUseInHand = false;
-
-    public EntityUid? User = null;
     // WD EDIT END
 }
 

Content.Shared/Wieldable/WieldableSystem.cs

@@ -18,7 +18,6 @@
 using Content.Shared.Wieldable.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
-using Content.Shared._White.Resomi.Abilities;
 
 namespace Content.Shared.Wieldable;
 
@@ -107,7 +106,7 @@ private void OnDeselectWieldable(EntityUid uid, WieldableComponent component, Ha
     private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref GunRefreshModifiersEvent args)
     {
         if (TryComp(bonus, out WieldableComponent? wield) &&
-            wield.Wielded && !HasComp<WeaponsUseInabilityComponent>(wield.User)) // WWDP-Edit
+            wield.Wielded)
         {
             args.MinAngle += bonus.Comp.MinAngle;
             args.MaxAngle += bonus.Comp.MaxAngle;
@@ -270,8 +269,6 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
         var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used));
         _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
 
-        component.User = user; // WWDP
-
         var targEv = new ItemWieldedEvent();
         RaiseLocalEvent(used, ref targEv);