Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Singulo/Radiation Tweaks (#6045)

Browse Source 
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
This commit is contained in:
Pancake
2022-01-10 22:30:17 -08:00
committed by GitHub
parent 989cfb49d0
commit 61da69ee74
11 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Radiation/RadiationPulseComponent.cs
View File

@@ -20,7 +20,6 @@ namespace Content.Server.Radiation
[Dependency] private readonly IRobustRandom _random = default!;
private float _duration;
private float _radsPerSecond = 8f;
private float _range = 5f;
private TimeSpan _startTime;
private TimeSpan _endTime;
@@ -48,17 +47,6 @@ namespace Content.Server.Radiation
[DataField("maxPulseLifespan")]
public float MaxPulseLifespan { get; set; } = 2.5f;
[DataField("dps")]
public override float RadsPerSecond
{
get => _radsPerSecond;
set
{
_radsPerSecond = value;
Dirty();
}
}
[DataField("sound")] public SoundSpecifier Sound { get; set; } = new SoundCollectionSpecifier("RadiationPulse");
[DataField("range")]
@@ -103,7 +91,7 @@ namespace Content.Server.Radiation
public override ComponentState GetComponentState()
{
return new RadiationPulseState(_radsPerSecond, _range, Draw, Decay, _startTime, _endTime);
return new RadiationPulseState(_range, Draw, Decay, _startTime, _endTime);
}
public void Update(float frameTime)

2
Content.Server/Radiation/RadiationPulseSystem.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Server.Radiation
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IEntityLookup _lookup = default!;
private const float RadiationCooldown = 0.5f;
private const float RadiationCooldown = 1.0f;
private float _accumulator;
public override void Update(float frameTime)