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

Revert "Update submodule to 172.0.0 (#21222)" (#21225)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-24 21:55:20 +11:00
committed by GitHub
parent 517aea8bc3
commit a2bbda43cc
249 changed files with 1049 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/PDA/PdaSystem.cs
View File

@@ -4,6 +4,9 @@ using Content.Server.DeviceNetwork.Components;
using Content.Server.Instruments;
using Content.Server.Light.EntitySystems;
using Content.Server.Light.Events;
using Content.Server.MassMedia.Components;
using Content.Server.MassMedia.Systems;
using Content.Server.Mind;
using Content.Server.PDA.Ringer;
using Content.Server.Station.Systems;
using Content.Server.Store.Components;
@@ -13,6 +16,7 @@ using Content.Shared.CartridgeLoader;
using Content.Shared.Light.Components;
using Content.Shared.PDA;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Containers;
namespace Content.Server.PDA
@@ -176,7 +180,7 @@ namespace Content.Server.PDA
return;
if (HasComp<RingerComponent>(uid))
_ringer.ToggleRingerUI(uid, msg.Session);
_ringer.ToggleRingerUI(uid, (IPlayerSession) msg.Session);
}
private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaShowMusicMessage msg)
@@ -185,7 +189,7 @@ namespace Content.Server.PDA
return;
if (TryComp<InstrumentComponent>(uid, out var instrument))
_instrument.ToggleInstrumentUi(uid, msg.Session, instrument);
_instrument.ToggleInstrumentUi(uid, (IPlayerSession) msg.Session, instrument);
}
private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaShowUplinkMessage msg)

3
Content.Server/PDA/Ringer/RingerSystem.cs
View File

@@ -7,6 +7,7 @@ using Content.Shared.PDA.Ringer;
using Content.Shared.Popups;
using Content.Shared.Store;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Network;
using Robust.Shared.Player;
@@ -181,7 +182,7 @@ namespace Content.Server.PDA.Ringer
_ui.SetUiState(bui, new RingerUpdateState(isPlaying, ringer.Ringtone));
}
public bool ToggleRingerUI(EntityUid uid, ICommonSession session)
public bool ToggleRingerUI(EntityUid uid, IPlayerSession session)
{
if (_ui.TryGetUi(uid, RingerUiKey.Key, out var bui))
_ui.ToggleUi(bui, session);