Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c559473
Keln-med-shuttle
theg33ka Apr 18, 2026
1478fde
Revert "Keln-med-shuttle"
theg33ka Apr 18, 2026
1b8ce90
Delete Resources/Maps/_Forge/Shuttles/Medical/keln.yml
theg33ka Apr 18, 2026
b1b88f4
Delete Resources/Prototypes/_Forge/Shipyard/Medical/keln.yml
theg33ka Apr 18, 2026
e3c08b3
Merge branch 'Forge-Station:main' into main
theg33ka Apr 18, 2026
a752324
Merge branch 'main' of https://github.com/theg33ka/Monolith
theg33ka Apr 18, 2026
c44630e
Merge branch 'Forge-Station:main' into main
theg33ka Apr 21, 2026
72aacc5
Add configurable encryption key for headsets
theg33ka Apr 23, 2026
d8b5679
Move configurable encryption key into Forge overrides
theg33ka Apr 23, 2026
bf89156
Merge branch 'main' into tuned-encr-key
theg33ka Apr 23, 2026
9e4a669
Увеличиваем тогда частоты, на один нулик
mersen-tyn Apr 26, 2026
d449099
Merge branch 'main' into tuned-encr-key
mersen-tyn Apr 26, 2026
2d78210
Merge branch 'Forge-Station:main' into main
theg33ka Apr 28, 2026
9b96b89
added locale, added customkey to loadout, added customkey to random k…
theg33ka Apr 30, 2026
a498b86
Merge branch 'main' into tuned-encr-key
theg33ka Apr 30, 2026
c28d34c
Merge branch 'Forge-Station:main' into main
theg33ka Apr 30, 2026
240499a
пук
mersen-tyn May 1, 2026
8c7ab84
Merge branch 'main' into tuned-encr-key
mersen-tyn May 1, 2026
13d09fc
Merge branch 'Forge-Station:main' into main
theg33ka May 1, 2026
9c2711a
Merge branch 'Forge-Station:main' into main
theg33ka May 3, 2026
59a6e8b
Merge branch 'Forge-Station:main' into tuned-encr-key
theg33ka May 30, 2026
adf7d7a
Merge branch 'main' into tuned-encr-key
theg33ka May 30, 2026
7cd54c3
Merge branch 'tuned-encr-key' of https://github.com/theg33ka/Monolith…
theg33ka May 30, 2026
96f3c25
Fix AI intercom relay
theg33ka May 30, 2026
d644752
Merge branch 'main' into tuned-encr-key
theg33ka Jun 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ private void OnListen(EntityUid uid, RadioMicrophoneComponent component, ListenE
private void OnAttemptListen(EntityUid uid, RadioMicrophoneComponent component, ListenAttemptEvent args)
{
if (component.PowerRequired && !this.IsPowered(uid, EntityManager)
|| component.UnobstructedRequired && !_interaction.InRangeUnobstructed(args.Source, uid, 0))
|| component.UnobstructedRequired && !_interaction.InRangeUnobstructed(ResolveListenSource(args.Source), uid, 0)) // Forge-Change
{
args.Cancel();
}
Expand Down
3 changes: 2 additions & 1 deletion Content.Server/Speech/EntitySystems/ListeningSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ public void PingListeners(EntityUid source, string message, bool isWhisper) // E
// for now, whispering just arbitrarily reduces the listener's max range.

var xformQuery = GetEntityQuery<TransformComponent>();
var sourceXform = xformQuery.GetComponent(source);
var audioSource = ResolveAudioSource(source); // Forge-Change: station AI speech should be heard from its relayed entity.
var sourceXform = xformQuery.GetComponent(audioSource);
var sourcePos = _xforms.GetWorldPosition(sourceXform, xformQuery);

var attemptEv = new ListenAttemptEvent(source);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Content.Shared.Silicons.StationAi;

namespace Content.Server.Radio.EntitySystems;

public sealed partial class RadioDeviceSystem
{
[Dependency] private SharedStationAiSystem _stationAi = default!;

private EntityUid ResolveListenSource(EntityUid source)
{
if (HasComp<StationAiHeldComponent>(source) &&
_stationAi.TryGetCore(source, out var core) &&
core.Comp?.RemoteEntity is { } remoteEntity)
{
return remoteEntity;
}

return source;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Content.Shared.Silicons.StationAi;

namespace Content.Server.Speech.EntitySystems;

public sealed partial class ListeningSystem
{
[Dependency] private SharedStationAiSystem _stationAi = default!;

private EntityUid ResolveAudioSource(EntityUid source)
{
if (HasComp<StationAiHeldComponent>(source) &&
_stationAi.TryGetCore(source, out var core) &&
core.Comp?.RemoteEntity is { } remoteEntity)
{
return remoteEntity;
}

return source;
}
}
Loading