Skip to content

Commit

Permalink
Revert "[Port] Resomi (#172)"
Browse files Browse the repository at this point in the history
This reverts commit 7ce954b.
  • Loading branch information
DVOniksWyvern authored Dec 24, 2024
1 parent bff5fef commit a9e61d9
Show file tree
Hide file tree
Showing 518 changed files with 455 additions and 3,241 deletions.
2 changes: 1 addition & 1 deletion Content.Server/Chat/Systems/ChatSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions Content.Server/Flash/FlashSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
108 changes: 0 additions & 108 deletions Content.Server/_White/Resomi/Abilities/AgillitySkillSystem.cs

This file was deleted.

This file was deleted.

61 changes: 0 additions & 61 deletions Content.Server/_White/Speech/EntitySystems/ResomiAccentSystem.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 0 additions & 2 deletions Content.Shared/Wieldable/Components/WieldableComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ public sealed partial class WieldableComponent : Component
/// </summary>
[DataField]
public bool AltUseInHand = false;

public EntityUid? User = null;
// WD EDIT END
}

Expand Down
5 changes: 1 addition & 4 deletions Content.Shared/Wieldable/WieldableSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
12 changes: 0 additions & 12 deletions Content.Shared/_White/Chat/ChatModifierComponent.cs

This file was deleted.

12 changes: 0 additions & 12 deletions Content.Shared/_White/Flash/Components/FlashModifierComponent.cs

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions Content.Shared/_White/Resomi/SharedResomi.cs

This file was deleted.

Binary file removed Resources/Audio/_White/Voice/Resomi/resomi_cough.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit a9e61d9

Please sign in to comment.