diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
index e3621cf7275c95..075ee0d88d56b3 100644
--- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
@@ -36,9 +36,10 @@ public sealed partial class PullerComponent : Component
public EntityUid? Pulling;
///
- /// 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?
///
- [DataField] [Access(Other = AccessPermissions.ReadWriteExecute)]
+ [DataField]
+ [Access(Other = AccessPermissions.ReadWriteExecute)] //SS220 DarkReaper Access
public bool NeedsHands = true;
[DataField]
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 927165dca1d6a1..b14b2515ed1bff 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -90,8 +90,7 @@ private void OnPullerStartup(Entity entity, ref ComponentStartu
// right after me, so this will work for now and I don't really care
// COPIUM
if (!HasComp(entity))
- return;
-
+ return;
entity.Comp.NeedsHands = false;
}
//SS220-Cart-system end
diff --git a/Content.Shared/SS220/DarkReaper/DarkReaperActions.cs b/Content.Shared/SS220/DarkReaper/DarkReaperActions.cs
index c1a3e3bfcd6e3f..b463ad8c6a8788 100644
--- a/Content.Shared/SS220/DarkReaper/DarkReaperActions.cs
+++ b/Content.Shared/SS220/DarkReaper/DarkReaperActions.cs
@@ -48,7 +48,6 @@ public sealed partial class ReaperBloodMistEvent : InstantActionEvent
///
/// BloodMist sound
///
- ///
[DataField, AutoNetworkedField]
public SoundSpecifier BloodMistSound = new SoundPathSpecifier("/Audio/Items/smoke_grenade_smoke.ogg", new()
{
diff --git a/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs b/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs
index 20f2c902fb4f74..073df590846c1d 100644
--- a/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs
+++ b/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs
@@ -112,13 +112,19 @@ public sealed partial class DarkReaperComponent : Component
public float StunAbilityLightBreakRadius = 4.5f;
///
- /// Handles confusion params
/// StunAbilityConfusion - radius in which entities are affected by confusion
- /// ConfusionDuration - duration of the confusion effect
- /// ConfusionEffectName - name of effect that applied
///
+ [DataField]
public float StunAbilityConfusion = 12f;
+ ///
+ /// ConfusionDuration - duration of the confusion effect
+ ///
+ [DataField]
public TimeSpan ConfusionDuration = TimeSpan.FromSeconds(7);
+ ///
+ /// ConfusionEffectName - name of effect that applied
+ ///
+ [DataField]
public string ConfusionEffectName = "Flashed";
///
diff --git a/Content.Shared/SS220/DarkReaper/DarkReaperSharedSystem.cs b/Content.Shared/SS220/DarkReaper/DarkReaperSharedSystem.cs
index 59075e261d150f..5e6a8d52b8e201 100644
--- a/Content.Shared/SS220/DarkReaper/DarkReaperSharedSystem.cs
+++ b/Content.Shared/SS220/DarkReaper/DarkReaperSharedSystem.cs
@@ -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)
@@ -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)
{
@@ -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);