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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/RoundEnd/RoundEndSystem.cs
View File

@@ -3,10 +3,8 @@ using System.Threading;
using Content.Server.Administration.Logs;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared.GameTicking;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -80,12 +78,12 @@ namespace Content.Server.RoundEnd
Timer.Spawn(CallCooldown, () => OnCallCooldownEnded?.Invoke(), _callCooldownEndedTokenSource.Token);
}
public void RequestRoundEnd(IEntity? requester = null, bool checkCooldown = true)
public void RequestRoundEnd(EntityUid? requester = null, bool checkCooldown = true)
{
RequestRoundEnd(RoundEndCountdownTime, requester, checkCooldown);
}
public void RequestRoundEnd(TimeSpan countdownTime, IEntity? requester = null, bool checkCooldown = true)
public void RequestRoundEnd(TimeSpan countdownTime, EntityUid? requester = null, bool checkCooldown = true)
{
if (IsRoundEndCountdownStarted)
return;
@@ -95,7 +93,7 @@ namespace Content.Server.RoundEnd
return;
}
if (requester != null)
if (requester != default)
{
_adminLog.Add(LogType.ShuttleCalled, LogImpact.High, $"Shuttle called by {requester}");
}
@@ -118,7 +116,7 @@ namespace Content.Server.RoundEnd
OnRoundEndCountdownStarted?.Invoke();
}
public void CancelRoundEndCountdown(IEntity? requester = null, bool checkCooldown = true)
public void CancelRoundEndCountdown(EntityUid? requester = null, bool checkCooldown = true)
{
if (!IsRoundEndCountdownStarted)
return;
@@ -128,7 +126,7 @@ namespace Content.Server.RoundEnd
return;
}
if (requester != null)
if (requester != default)
{
_adminLog.Add(LogType.ShuttleRecalled, LogImpact.High, $"Shuttle recalled by {requester}");
}