mirror of
https://github.com/corvax-team/ss14-wl.git
synced 2026-02-15 03:31:38 +01:00
Some fixes
This commit is contained in:
@@ -55,12 +55,12 @@ public sealed class ContentSpriteSystem : EntitySystem
|
||||
{
|
||||
base.Shutdown();
|
||||
|
||||
foreach (var queued in _control.QueuedTextures)
|
||||
foreach (var queued in _control._queuedTextures)
|
||||
{
|
||||
queued.Tcs.SetCanceled();
|
||||
}
|
||||
|
||||
_control.QueuedTextures.Clear();
|
||||
_control._queuedTextures.Clear();
|
||||
|
||||
_ui.RootControl.RemoveChild(_control);
|
||||
}
|
||||
@@ -97,7 +97,7 @@ public sealed class ContentSpriteSystem : EntitySystem
|
||||
Action<ContentSpriteControl<Rgba32>.QueueEntry, Image<Rgba32>> action,
|
||||
CancellationToken cancelToken = default)
|
||||
{
|
||||
const string speechPath = "/Textures/Effects/speech.rsi"; //ß åáàë âû÷èñëÿòü ÅÁÓ×ÈÅ TypingIndicator-û ÑÓÊÀÀÀÀ. ëåã÷å òàê
|
||||
const string speechPath = "/Textures/Effects/speech.rsi"; //Я ебал вычислять ЕБУЧИЕ TypingIndicator-ы СУКАААА. легче так
|
||||
|
||||
if (!_timing.IsFirstTimePredicted)
|
||||
return;
|
||||
@@ -143,7 +143,7 @@ public sealed class ContentSpriteSystem : EntitySystem
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Ñîõðàíÿåò ñïðàéò â äèðåêòîðèþ /Exports
|
||||
/// Сохраняет спрайт в директорию /Exports
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <param name="direction"></param>
|
||||
|
||||
@@ -27,23 +27,23 @@ namespace Content.Server.Corvax.StationGoal
|
||||
[Dependency] private readonly StationSystem _station = default!;
|
||||
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
||||
|
||||
private static readonly Regex StationIdRegex = new(@".*\s(\w+-\w+)$"); #WL - Changes
|
||||
private static readonly Regex StationIdRegex = new(@".*\s(\w+-\w+)$"); //WL - Changes
|
||||
|
||||
private static readonly Regex RandomValueInStringRegex = new(@"\{\{(.+?)\}\}");
|
||||
|
||||
private static readonly string BaseNTLogo =
|
||||
"""
|
||||
[color=#1b487e]-----------------[/color]
|
||||
[color=#1b487e]-----------------[/color] [head=3]Áëàíê äîêóìåíòà[/head]
|
||||
[color=#1b487e]-----------------[/color] [head=3]Бланк документа[/head]
|
||||
[color=#1b487e]-----------------[/color] [head=3]NanoTrasen[/head]
|
||||
[color=#1b487e]-----------------[/color] [bold]Station { $station } ÖÊ-ÊÎÌ[/bold]
|
||||
[color=#1b487e]-----------------[/color] [bold]Station { $station } ЦК-КОМ[/bold]
|
||||
[color=#1b487e]-----------------[/color]
|
||||
=========================================
|
||||
ÏÐÈÊÀÇ Î ÍÀÇÍÀ×ÅÍÈÈ ÖÅËÈ
|
||||
ПРИКАЗ О НАЗНАЧЕНИИ ЦЕЛИ
|
||||
=========================================
|
||||
Äàòà: { $date }
|
||||
Дата: { $date }
|
||||
|
||||
Óâàæàåìîå êîìàíäîâàíèå ñòàíöèè, çàäà÷àìè Âàøåé ñìåíû ÿâëÿþòñÿ:
|
||||
Уважаемое командование станции, задачами Вашей смены являются:
|
||||
|
||||
""";
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace Content.Server.Corvax.StationGoal
|
||||
"""
|
||||
|
||||
=========================================
|
||||
[italic]Ìåñòî äëÿ ïå÷àòåé[/italic]
|
||||
[italic]Место для печатей[/italic]
|
||||
""";
|
||||
|
||||
public override void Initialize()
|
||||
|
||||
@@ -244,10 +244,10 @@ public sealed partial class BorgSystem : SharedBorgSystem
|
||||
|
||||
var containerEnt = container.Owner;
|
||||
|
||||
#WL-android species-start
|
||||
// #WL-android species-start
|
||||
if (_tag.HasTag(containerEnt, "AndroidBodyTag")) // WL android species //
|
||||
return;
|
||||
#WL-android species-end
|
||||
// #WL-android species-end
|
||||
|
||||
if (!TryComp<BorgChassisComponent>(containerEnt, out var chassisComponent) ||
|
||||
container.ID != chassisComponent.BrainContainerId)
|
||||
|
||||
@@ -160,7 +160,6 @@ namespace Content.Shared.Preferences
|
||||
|
||||
HashSet<ProtoId<AntagPrototype>> antagPreferences,
|
||||
HashSet<ProtoId<TraitPrototype>> traitPreferences,
|
||||
Dictionary<string, RoleLoadout> loadouts)
|
||||
Dictionary<string, RoleLoadout> loadouts,
|
||||
|
||||
//WL-Changes-start
|
||||
@@ -225,7 +224,6 @@ namespace Content.Shared.Preferences
|
||||
|
||||
new HashSet<ProtoId<AntagPrototype>>(other.AntagPreferences),
|
||||
new HashSet<ProtoId<TraitPrototype>>(other.TraitPreferences),
|
||||
new Dictionary<string, RoleLoadout>(other.Loadouts))
|
||||
new Dictionary<string, RoleLoadout>(other.Loadouts),
|
||||
new(other.JobUnblockings)) // WL-Heigh
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user