Skip to content

Commit

Permalink
requested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
TryHardo7 committed Oct 25, 2024
1 parent e80a099 commit e9da976
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
5 changes: 3 additions & 2 deletions Content.Shared/Movement/Pulling/Components/PullerComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ public sealed partial class PullerComponent : Component
public EntityUid? Pulling;

/// <summary>
/// Does this entity need hands to be able to pull something? SS220 DarkReaper Access
/// Does this entity need hands to be able to pull something?
/// </summary>
[DataField] [Access(Other = AccessPermissions.ReadWriteExecute)]
[DataField]
[Access(Other = AccessPermissions.ReadWriteExecute)] //SS220 DarkReaper Access
public bool NeedsHands = true;

[DataField]
Expand Down
3 changes: 1 addition & 2 deletions Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ private void OnPullerStartup(Entity<PullerComponent> entity, ref ComponentStartu
// right after me, so this will work for now and I don't really care
// COPIUM
if (!HasComp<CartPullerComponent>(entity))
return;

return;
entity.Comp.NeedsHands = false;
}
//SS220-Cart-system end
Expand Down
1 change: 0 additions & 1 deletion Content.Shared/SS220/DarkReaper/DarkReaperActions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public sealed partial class ReaperBloodMistEvent : InstantActionEvent
/// <summary>
/// BloodMist sound
/// </summary>
///
[DataField, AutoNetworkedField]
public SoundSpecifier BloodMistSound = new SoundPathSpecifier("/Audio/Items/smoke_grenade_smoke.ogg", new()
{
Expand Down
12 changes: 9 additions & 3 deletions Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,19 @@ public sealed partial class DarkReaperComponent : Component
public float StunAbilityLightBreakRadius = 4.5f;

/// <summary>
/// Handles confusion params
/// StunAbilityConfusion - radius in which entities are affected by confusion
/// ConfusionDuration - duration of the confusion effect
/// ConfusionEffectName - name of effect that applied
/// </summary>
[DataField]
public float StunAbilityConfusion = 12f;
/// <summary>
/// ConfusionDuration - duration of the confusion effect
/// </summary>
[DataField]
public TimeSpan ConfusionDuration = TimeSpan.FromSeconds(7);
/// <summary>
/// ConfusionEffectName - name of effect that applied
/// </summary>
[DataField]
public string ConfusionEffectName = "Flashed";

/// <summary>
Expand Down
9 changes: 2 additions & 7 deletions Content.Shared/SS220/DarkReaper/DarkReaperSharedSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ private void OnBloodMistAction(EntityUid uid, DarkReaperComponent comp, ReaperBl
return;
args.Handled = true;
_audio.PlayPredicted(args.BloodMistSound, uid, uid);

DoBloodMistAction(uid, args);
Spawn(args.BloodMistProto, Transform(uid).Coordinates);
}

private void OnConsumeAction(EntityUid uid, DarkReaperComponent comp, ReaperConsumeEvent args)
Expand Down Expand Up @@ -183,6 +182,7 @@ protected virtual void DoStunAbility(EntityUid uid, DarkReaperComponent comp)
{
_stun.TryParalyze(entity, comp.StunDuration, true);
}

var confusedentities = _lookup.GetEntitiesInRange(uid, comp.StunAbilityConfusion);
foreach (var entity in confusedentities)
{
Expand All @@ -191,11 +191,6 @@ protected virtual void DoStunAbility(EntityUid uid, DarkReaperComponent comp)
}
}

protected virtual void DoBloodMistAction(EntityUid uid, ReaperBloodMistEvent args)
{
Spawn(args.BloodMistProto, Transform(uid).Coordinates);
}

protected virtual void DoRoflAbility(EntityUid uid, DarkReaperComponent comp)
{
_audio.PlayPredicted(comp.RolfAbilitySound, uid, uid);
Expand Down

0 comments on commit e9da976

Please sign in to comment.