Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

10
Content.Server/Radio/Components/HandheldRadioComponent.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.Radio.Components
_chatManager.EntitySay(Owner, message);
}
public bool Use(IEntity user)
public bool Use(EntityUiduser)
{
RadioOn = !RadioOn;
@@ -79,13 +79,13 @@ namespace Content.Server.Radio.Components
return Use(eventArgs.User);
}
public bool CanListen(string message, IEntity source)
public bool CanListen(string message, EntityUidsource)
{
return RadioOn &&
Owner.InRangeUnobstructed(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(source).Coordinates, range: ListenRange);
}
public void Receive(string message, int channel, IEntity speaker)
public void Receive(string message, int channel, EntityUidspeaker)
{
if (RadioOn)
{
@@ -93,12 +93,12 @@ namespace Content.Server.Radio.Components
}
}
public void Listen(string message, IEntity speaker)
public void Listen(string message, EntityUidspeaker)
{
Broadcast(message, speaker);
}
public void Broadcast(string message, IEntity speaker)
public void Broadcast(string message, EntityUidspeaker)
{
_radioSystem.SpreadMessage(this, speaker, message, BroadcastFrequency);
}

4
Content.Server/Radio/Components/IListen.cs
View File

@@ -10,8 +10,8 @@ namespace Content.Server.Radio.Components
{
int ListenRange { get; }
bool CanListen(string message, IEntity source);
bool CanListen(string message, EntityUidsource);
void Listen(string message, IEntity speaker);
void Listen(string message, EntityUidspeaker);
}
}

5
Content.Server/Radio/Components/IRadio.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using Robust.Shared.GameObjects;
namespace Content.Server.Radio.Components
{
@@ -7,8 +6,8 @@ namespace Content.Server.Radio.Components
{
IReadOnlyList<int> Channels { get; }
void Receive(string message, int channel, IEntity speaker);
void Receive(string message, int channel, EntityUidspeaker);
void Broadcast(string message, IEntity speaker);
void Broadcast(string message, EntityUidspeaker);
}
}

2
Content.Server/Radio/EntitySystems/ListeningSystem.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Server.Radio.EntitySystems
[UsedImplicitly]
public class ListeningSystem : EntitySystem
{
public void PingListeners(IEntity source, string message)
public void PingListeners(EntityUid source, string message)
{
foreach (var listener in EntityManager.EntityQuery<IListen>(true))
{

2
Content.Server/Radio/EntitySystems/RadioSystem.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Server.Radio.EntitySystems
{
private readonly List<string> _messages = new();
public void SpreadMessage(IRadio source, IEntity speaker, string message, int channel)
public void SpreadMessage(IRadio source, EntityUid speaker, string message, int channel)
{
if (_messages.Contains(message)) return;