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

Merge remote-tracking branch 'WD-core/master' into upstream-core

Browse Source
This commit is contained in:
BIGZi0348
2025-03-17 23:39:05 +03:00
parent 23c02d2d14 1aa69a5426
commit 2c2a508d7b
77 changed files with 518 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Nuke/NukeSystem.cs
View File

@@ -303,7 +303,7 @@ public sealed class NukeSystem : EntitySystem
// play alert sound if time is running out
if (nuke.RemainingTime <= nuke.AlertSoundTime && !nuke.PlayedAlertSound)
{
_sound.PlayGlobalOnStation(uid, _audio.GetSound(nuke.AlertSound), new AudioParams{Volume = -5f});
_sound.PlayGlobalOnStation(uid, _audio.GetSound(nuke.AlertSound), new AudioParams { Volume = -5f });
_sound.StopStationEventMusic(uid, StationEventMusicType.Nuke);
nuke.PlayedAlertSound = true;
UpdateAppearance(uid, nuke);
@@ -572,7 +572,7 @@ public sealed class NukeSystem : EntitySystem
_sound.StopStationEventMusic(uid, StationEventMusicType.Nuke);
Del(uid);
Timer.Spawn(TimeSpan.FromSeconds(60), () => _roundEndSystem.EndRound(TimeSpan.FromSeconds(60))); //Giedi EDIT
Timer.Spawn(TimeSpan.FromSeconds(60), () => _roundEndSystem.EndRound(TimeSpan.FromSeconds(60))); // PARSEC EDIT
}
/// <summary>

8
Content.Server/Tabletop/TabletopSystem.cs
View File

@@ -69,7 +69,7 @@ namespace Content.Server.Tabletop
session.Entities.TryGetValue(entity, out var result);
session.Entities.Remove(result);
tabletop.HologramsSpawned--; // Giedi Prime fix
tabletop.HologramsSpawned--; // PARSEC fix
QueueDel(result);
}
@@ -145,7 +145,7 @@ namespace Content.Server.Tabletop
var playVerb = new ActivationVerb()
{
Text = Loc.GetString("tabletop-verb-play-game"),
Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/die.svg.192dpi.png")),
Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/die.svg.192dpi.png")),
Act = () => OpenSessionFor(actor.PlayerSession, uid)
};
@@ -173,7 +173,7 @@ namespace Content.Server.Tabletop
private void OnPlayerDetached(EntityUid uid, TabletopGamerComponent component, PlayerDetachedEvent args)
{
if(component.Tabletop.IsValid())
if (component.Tabletop.IsValid())
CloseSessionFor(args.Player, component.Tabletop);
}
@@ -182,7 +182,7 @@ namespace Content.Server.Tabletop
if (!EntityManager.TryGetComponent(uid, out ActorComponent? actor))
return;
if(component.Tabletop.IsValid())
if (component.Tabletop.IsValid())
CloseSessionFor(actor.PlayerSession, component.Tabletop);
}