tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix namespaces and optimize imports (#1651)

Browse Source 
* Fix namespaces and optimize imports

* Cleanup fixes

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes
This commit is contained in:
DrSmugleaf
2020-08-13 14:40:27 +02:00
committed by GitHub
parent 05a76d55f7
commit 4a8ed41e3a
500 changed files with 1044 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs
View File

@@ -1,19 +1,18 @@
using System;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.Physics;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.EntitySystemMessages;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Serialization;
using Timer = Robust.Shared.Timers.Timer;
using Robust.Shared.Timers;
namespace Content.Server.GameObjects.Components.Projectiles
{
@@ -26,7 +25,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
public override string Name => "Hitscan";
public CollisionGroup CollisionMask => (CollisionGroup) _collisionMask;
private int _collisionMask;
public float Damage
{
get => _damage;
@@ -92,7 +91,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
var offset = angle.ToVec().Normalized / 2;
EntitySystem.Get<AudioSystem>().PlayAtCoords(_soundHitWall, user.Transform.GridPosition.Translated(offset));
}
Timer.Spawn((int) _deathTime.TotalMilliseconds, () =>
{
if (!Owner.Deleted)
@@ -101,16 +100,16 @@ namespace Content.Server.GameObjects.Components.Projectiles
}
});
}
private EffectSystemMessage MuzzleFlash(GridCoordinates grid, Angle angle)
{
if (_muzzleFlash == null)
{
return null;
}
var offset = angle.ToVec().Normalized / 2;
var message = new EffectSystemMessage
{
EffectSprite = _muzzleFlash,
@@ -123,7 +122,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
ColorDelta = new Vector4(0, 0, 0, -1500f),
Shaded = false
};
return message;
}
@@ -144,7 +143,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
Shaded = false
};
return message;
}