rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oops

Browse source
This commit is contained in:
VigersRay 2024-07-31 03:56:35 +03:00
parent 31b2d24e30
commit 7db5bfd39d
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Content.Server/Zombies/ZombieSystem.cs
View file

@ -1,11 +1,11 @@
using System.Linq;
using System.Text.RegularExpressions; // Sunrise
using System.Text.RegularExpressions;
using Content.Server.Actions;
using Content.Server.Body.Systems;
using Content.Server.Chat;
using Content.Server.Chat.Systems;
using Content.Server.Emoting.Systems;
using Content.Server.Pinpointer; // Sunrise
using Content.Server.Pinpointer;
using Content.Server.Speech.EntitySystems;
using Content.Shared.Bed.Sleep;
using Content.Shared.Cloning;
@ -22,7 +22,6 @@ using Content.Shared.Stunnable;
using Content.Shared.Throwing;
using Content.Shared.Weapons.Melee.Events;
using Content.Shared.Zombies;
using Robust.Server.GameObjects; // Sunrise
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Timing;
@ -48,7 +47,6 @@ namespace Content.Server.Zombies
[Dependency] private readonly ActionsSystem _action = default!;
[Dependency] private readonly SharedStunSystem _stun = default!;
[Dependency] private readonly NavMapSystem _navMap = default!; // Sunrise-Zombies
[Dependency] private readonly TransformSystem _transform = default!; // Sunrise-Zombies
public const SlotFlags ProtectiveSlots =
SlotFlags.FEET |
@ -96,9 +94,6 @@ namespace Content.Server.Zombies
return;
if (!_mobState.IsAlive(args.Target))
return;
if (_timing.CurTime - component.LastThrowHit < component.ThrowHitDelay)
return;
component.LastThrowHit = _timing.CurTime;
_stun.TryParalyze(args.Target, TimeSpan.FromSeconds(component.ParalyzeTime), false);
_damageable.TryChangeDamage(args.Target, component.Damage, origin: args.Thrown);
@ -132,7 +127,6 @@ namespace Content.Server.Zombies
{
nearestUid = targetUid;
minDistance = distance;
nearestXform = xform;
}
}

9
Content.Shared/Zombies/ZombieComponent.cs
View file

@ -31,7 +31,7 @@ public sealed partial class ZombieComponent : Component
public float MinZombieInfectionChance = 0.6f; // Sunrise-Edit
[ViewVariables(VVAccess.ReadWrite)]
public float ZombieMovementSpeedBuff = 1f; // Sunrise-Edit
public float ZombieMovementSpeedBuff = 1.05f; // Sunrise-Edit
/// <summary>
/// The skin color of the zombie
@ -104,7 +104,7 @@ public sealed partial class ZombieComponent : Component
{ "Slash", -5 }, // Sunrise-Edit
{ "Piercing", -5 }, // Sunrise-Edit
{ "Heat", -0.02 },
{ "Shock", -0.02 }
{ "Shock", -0.02 },
}
};
@ -124,7 +124,7 @@ public sealed partial class ZombieComponent : Component
{
{ "Blunt", -5 }, // Sunrise-Edit
{ "Slash", -5 }, // Sunrise-Edit
{ "Piercing", -5 } // Sunrise-Edit
{ "Piercing", -5 }, // Sunrise-Edit
}
};
@ -177,9 +177,6 @@ public sealed partial class ZombieComponent : Component
[DataField]
public TimeSpan? LastThrowHit;
[DataField]
public TimeSpan ThrowHitDelay = TimeSpan.Zero();
[DataField]
public float MaxThrow = 10f;