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

Merge remote-tracking branch 'Zumorica/2021-12-03-remove-IEntity-komm-süsser-todd' into 2021-12-03-remove-IEntity-komm-süsser-todd

Browse Source 
# Conflicts:
#	Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
#	Content.Server/Hands/Systems/HandsSystem.cs
#	Content.Server/Radio/Components/IRadio.cs
#	Content.Server/UserInterface/ActivatableUISystem.cs
This commit is contained in:
DrSmugleaf
2021-12-05 22:10:07 +01:00
parent ab9d0cc6d8 75247b7e2b
commit 2b1fecbe02
25 changed files with 100 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1,4 +1,4 @@
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects;
namespace Content.Server.Radio.Components
{

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

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using Robust.Shared.GameObjects;
using System.Collections.Generic;
using Robust.Shared.GameObjects;
namespace Content.Server.Radio.Components