cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Build Errors

This commit is contained in:
Coryler 2026-05-28 10:16:55 +02:00
parent da45e22ffe
commit 17e5bb87ab
102 changed files with 339 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
View File

@ -9,7 +9,6 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args)
{

4
Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs
View File

@ -18,10 +18,12 @@ public sealed partial class DogVisionOverlay : Overlay
public override OverlaySpace Space => OverlaySpace.WorldSpace;
private readonly ShaderInstance _dogVisionShader;
private const string DogVisionName = "DogVision";
public DogVisionOverlay()
{
IoCManager.InjectDependencies(this);
_dogVisionShader = _prototypeManager.Index<ShaderPrototype>("DogVision").Instance().Duplicate();
_dogVisionShader = _prototypeManager.Index<ShaderPrototype>(DogVisionName).Instance().Duplicate();
}
protected override bool BeforeDraw(in OverlayDrawArgs args)

68
Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
View File

@ -86,40 +86,40 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface
case AsteroidOffering asteroid:
option.Title = Loc.GetString($"dungeon-config-proto-{asteroid.Id}");
break; // DeltaV: Skip ores since they aren't used with custom generation
var layerKeys = asteroid.MarkerLayers.Keys.ToList();
layerKeys.Sort();
foreach (var resource in layerKeys)
{
var count = asteroid.MarkerLayers[resource];
var container = new BoxContainer
{
Orientation = BoxContainer.LayoutOrientation.Horizontal,
HorizontalExpand = true,
};
var resourceLabel = new Label
{
Text = Loc.GetString("salvage-magnet-resources",
("resource", resource)),
HorizontalAlignment = Control.HAlignment.Left,
};
var countLabel = new Label
{
Text = Loc.GetString("salvage-magnet-resources-count", ("count", count)),
HorizontalAlignment = Control.HAlignment.Right,
HorizontalExpand = true,
};
container.AddChild(resourceLabel);
container.AddChild(countLabel);
option.AddContent(container);
}
break;
// var layerKeys = asteroid.MarkerLayers.Keys.ToList();
// layerKeys.Sort();
//
// foreach (var resource in layerKeys)
// {
// var count = asteroid.MarkerLayers[resource];
//
// var container = new BoxContainer
// {
// Orientation = BoxContainer.LayoutOrientation.Horizontal,
// HorizontalExpand = true,
// };
//
// var resourceLabel = new Label
// {
// Text = Loc.GetString("salvage-magnet-resources",
// ("resource", resource)),
// HorizontalAlignment = Control.HAlignment.Left,
// };
//
// var countLabel = new Label
// {
// Text = Loc.GetString("salvage-magnet-resources-count", ("count", count)),
// HorizontalAlignment = Control.HAlignment.Right,
// HorizontalExpand = true,
// };
//
// container.AddChild(resourceLabel);
// container.AddChild(countLabel);
//
// option.AddContent(container);
// }
//
// break;
case DebrisOffering debris:
option.Title = Loc.GetString($"salvage-magnet-debris-{debris.Id}");
break;

6
Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
View File

@ -17,7 +17,6 @@ namespace Content.Client.UserInterface.Systems.Chat;
/// </summary>
public sealed partial class ChatUIController : IOnSystemChanged<CharacterInfoSystem>
{
[Dependency] private readonly ILocalizationManager _loc = default!;
[UISystemDependency] private readonly CharacterInfoSystem _characterInfo = default!;
private static readonly Regex StartDoubleQuote = new("\"$");
@ -167,4 +166,9 @@ public sealed partial class ChatUIController : IOnSystemChanged<CharacterInfoSys
HighlightsUpdated?.Invoke(newHighlights);
_charInfoIsAttach = false;
}*/
// Delta V - Complains it needs an invoker. Though we moved it into the client.
private void OnHighlightsUpdated(string obj)
{
HighlightsUpdated?.Invoke(obj);
}
}

2
Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs
View File

@ -7,7 +7,6 @@ using Robust.Shared.Console; // Frontier
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controllers;
using Content.Shared._Corvax.Respawn; // Frontier
using Robust.Shared.Configuration; // Frontier
namespace Content.Client.UserInterface.Systems.Ghost;
@ -16,7 +15,6 @@ public sealed class GhostUIController : UIController, IOnSystemChanged<GhostSyst
{
[Dependency] private readonly IEntityNetworkManager _net = default!;
[Dependency] private readonly IConsoleHost _consoleHost = default!; // Frontier
[Dependency] private readonly IConfigurationManager _cfg = default!; // Frontier
[UISystemDependency] private readonly GhostSystem? _system = default;

2
Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
View File

@ -4,7 +4,6 @@ using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Timing; // Frontier
using Robust.Shared.Configuration; // Frontier
using Content.Client._NF.UserInterface.Systems.Ghost.Controls; // Frontier
namespace Content.Client.UserInterface.Systems.Ghost.Widgets;
@ -13,7 +12,6 @@ namespace Content.Client.UserInterface.Systems.Ghost.Widgets;
public sealed partial class GhostGui : UIWidget
{
[Dependency] private readonly IGameTiming _gameTiming = default!; // Frontier
[Dependency] private readonly IConfigurationManager _configurationManager = default!; // Frontier
private TimeSpan? _respawnTime; // Frontier

2
Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
View File

@ -22,7 +22,7 @@ public sealed class AnalysisConsoleBoundUserInterface(EntityUid owner, Enum uiKe
base.Open();
_consoleMenu = this.CreateWindow<AnalysisConsoleMenu>();
_consoleMenu.SetOwner(owner);
_consoleMenu.SetOwner(Owner);
_consoleMenu.OnClose += Close;
_consoleMenu.OpenCentered();

2
Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml.cs
View File

@ -47,7 +47,7 @@ public sealed partial class CharacterRecordViewer : FancyWindow
/// <remarks>
/// This may differ from <see cref="_selectedListingKey"/> because this contents has not been updated yet to reflect the new selection.
/// </remarks>
private uint? _openRecordKey;
// private uint? _openRecordKey;
public event Action<SecurityStatus, string?>? OnSetSecurityStatus;
public uint? SecurityWantedStatusMaxLength;

11
Content.Client/_DV/CosmicCult/Visuals/MonumentPlacementPreviewOverlay.cs
View File

@ -44,6 +44,11 @@ public sealed class MonumentPlacementPreviewOverlay : Overlay
private readonly SpriteSpecifier _outlineTex;
private readonly SpriteSpecifier _starTex;
private const string SaturationShuffleName = "SaturationShuffle";
private const string MonumentPulseName = "MonumentPulse";
private const string UnshadedName = "unschaded";
//todo arbitrary sprite drawing overlay at some point
//I don't want to have to make a new overlay for every "draw a sprite at x" thing
//also I kinda want wrappers around the dog ass existing arbitrary rendering methods
@ -58,14 +63,14 @@ public sealed class MonumentPlacementPreviewOverlay : Overlay
_preview = _ent.System<MonumentPlacementPreviewSystem>();
_timing = timing;
_saturationShader = protoMan.Index<ShaderPrototype>("SaturationShuffle").InstanceUnique();
_saturationShader = protoMan.Index<ShaderPrototype>(SaturationShuffleName).InstanceUnique();
_saturationShader.SetParameter("tileSize", new Vector2(96, 96));
_saturationShader.SetParameter("hsv", new Vector3(1.0f, 0.25f, 0.2f));
_starsShader = protoMan.Index<ShaderPrototype>("MonumentPulse").InstanceUnique();
_starsShader = protoMan.Index<ShaderPrototype>(MonumentPulseName).InstanceUnique();
_starsShader.SetParameter("tileSize", new Vector2(96, 96));
_unshadedShader = protoMan.Index<ShaderPrototype>("unshaded").Instance(); //doesn't need a unique instance
_unshadedShader = protoMan.Index<ShaderPrototype>(UnshadedName).Instance(); //doesn't need a unique instance
ZIndex = (int) Shared.DrawDepth.DrawDepth.Mobs; //make the overlay render at the same depth as the actual sprite. might want to make it 1 lower if things get wierd with it.

3
Content.Client/_DV/Overlays/UltraVisionOverlay.cs
View File

@ -17,11 +17,12 @@ public sealed partial class UltraVisionOverlay : Overlay
public override bool RequestScreenTexture => true;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
private readonly ShaderInstance _ultraVisionShader;
private const string UltraVisionName = "UltraVision";
public UltraVisionOverlay()
{
IoCManager.InjectDependencies(this);
_ultraVisionShader = _prototypeManager.Index<ShaderPrototype>("UltraVision").Instance().Duplicate();
_ultraVisionShader = _prototypeManager.Index<ShaderPrototype>(UltraVisionName).Instance().Duplicate();
}
protected override bool BeforeDraw(in OverlayDrawArgs args)

4
Content.Client/_FarHorizons/Power/Generation/FissionGenerator/ReactorPartSystem.cs
View File

@ -30,5 +30,5 @@ public sealed class ReactorPartSystem : SharedReactorPartSystem
}
private void OnComponentInit(Entity<ReactorPartComponent> ent, ref ComponentInit args)
=> _sprite.LayerSetColor((ent.Owner, EntityManager.GetComponent<SpriteComponent>(ent.Owner)), 0, _proto.Index(ent.Comp.Material).Color);
}
=> _sprite.LayerSetColor((ent.Owner, Comp<SpriteComponent>(ent.Owner)), 0, _proto.Index(ent.Comp.Material).Color);
}

4
Content.Client/_Goobstation/Overlays/BaseSwitchableOverlay.cs
View File

@ -27,10 +27,12 @@ public sealed class BaseSwitchableOverlay<TComp> : Overlay where TComp : Switcha
public bool IsActive = true;
private const string NightVisionName = "NightVision";
public BaseSwitchableOverlay()
{
IoCManager.InjectDependencies(this);
_shader = _prototype.Index<ShaderPrototype>("NightVision").InstanceUnique();
_shader = _prototype.Index<ShaderPrototype>(NightVisionName).InstanceUnique();
}
protected override void Draw(in OverlayDrawArgs args)

2
Content.Client/_Impstation/Revenant/RevenantRegenModifierSystem.cs
View File

@ -10,7 +10,7 @@ namespace Content.Client.Revenant;
public sealed class RevenantRegenModifierSystem : EntitySystem
{
[Dependency] private readonly SpriteSystem _sprite = default!;
// [Dependency] private readonly SpriteSystem _sprite = default!; // DV - Not used error
private readonly SpriteSpecifier _witnessIndicator = new SpriteSpecifier.Texture(new ResPath("Interface/Actions/scream.png"));

4
Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs
View File

@ -25,10 +25,12 @@ namespace Content.Client._NF.Emp.Overlays
private readonly ShaderInstance _baseShader;
private readonly Dictionary<EntityUid, (ShaderInstance shd, EmpShaderInstance instance)> _blasts = new();
private const string EmpName = "Emp";
public EmpBlastOverlay()
{
IoCManager.InjectDependencies(this);
_baseShader = _prototypeManager.Index<ShaderPrototype>("Emp").Instance().Duplicate();
_baseShader = _prototypeManager.Index<ShaderPrototype>(EmpName).Instance().Duplicate();
}
protected override bool BeforeDraw(in OverlayDrawArgs args)

4
Content.Client/_RMC14/Xenonids/Screech/RMCXenoScreechShockWaveOverlay.cs
View File

@ -18,10 +18,12 @@ public sealed class RMCXenoScreechShockWaveOverlay : Overlay, IEntityEventSubscr
private readonly ShaderInstance _shader;
private const string RMGXenoScreechShockWaveName = "RMGXenoScreechShockWave";
public RMCXenoScreechShockWaveOverlay()
{
IoCManager.InjectDependencies(this);
_shader = _prototypeManager.Index<ShaderPrototype>("RMCXenoScreechShockWave").Instance().Duplicate();
_shader = _prototypeManager.Index<ShaderPrototype>(RMGXenoScreechShockWaveName).Instance().Duplicate();
}
private Vector2 _position;

68
Content.IntegrationTests/Tests/CargoTest.cs
View File

@ -105,40 +105,40 @@ public sealed class CargoTest
public async Task NoStaticPriceAndStackPrice()
{
return; // DeltaV: Disable this stupid test its 100% false positives
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var protoManager = server.ProtoMan;
var compFact = server.ResolveDependency<IComponentFactory>();
await server.WaitAssertion(() =>
{
var protoIds = protoManager.EnumeratePrototypes<EntityPrototype>()
.Where(p => !p.Abstract)
.Where(p => !pair.IsTestPrototype(p))
.Where(p => p.Components.ContainsKey("StaticPrice"))
.ToList();
foreach (var proto in protoIds)
{
// Sanity check
Assert.That(proto.TryGetComponent<StaticPriceComponent>(out var staticPriceComp, compFact), Is.True);
if (proto.TryGetComponent<StackPriceComponent>(out var stackPriceComp, compFact) && stackPriceComp.Price > 0)
{
Assert.That(staticPriceComp.Price, Is.EqualTo(0),
$"The prototype {proto} has a StackPriceComponent and StaticPriceComponent whose values are not compatible with each other.");
}
if (proto.HasComponent<StackComponent>(compFact))
{
Assert.That(staticPriceComp.Price, Is.EqualTo(0),
$"The prototype {proto} has a StackComponent and StaticPriceComponent whose values are not compatible with each other.");
}
}
});
await pair.CleanReturnAsync();
// await using var pair = await PoolManager.GetServerClient();
// var server = pair.Server;
//
// var protoManager = server.ProtoMan;
// var compFact = server.ResolveDependency<IComponentFactory>();
//
// await server.WaitAssertion(() =>
// {
// var protoIds = protoManager.EnumeratePrototypes<EntityPrototype>()
// .Where(p => !p.Abstract)
// .Where(p => !pair.IsTestPrototype(p))
// .Where(p => p.Components.ContainsKey("StaticPrice"))
// .ToList();
//
// foreach (var proto in protoIds)
// {
// // Sanity check
// Assert.That(proto.TryGetComponent<StaticPriceComponent>(out var staticPriceComp, compFact), Is.True);
//
// if (proto.TryGetComponent<StackPriceComponent>(out var stackPriceComp, compFact) && stackPriceComp.Price > 0)
// {
// Assert.That(staticPriceComp.Price, Is.EqualTo(0),
// $"The prototype {proto} has a StackPriceComponent and StaticPriceComponent whose values are not compatible with each other.");
// }
//
// if (proto.HasComponent<StackComponent>(compFact))
// {
// Assert.That(staticPriceComp.Price, Is.EqualTo(0),
// $"The prototype {proto} has a StackComponent and StaticPriceComponent whose values are not compatible with each other.");
// }
// }
// });
//
// await pair.CleanReturnAsync();
}
/// <summary>

8
Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
View File

@ -51,10 +51,10 @@ public sealed class MachineConstruction : InteractionTest
return; // DeltaV - i doubt this will break ever and cbf to change it to something else
// Change it into an autolathe
await InteractUsing("AutolatheMachineCircuitboard");
AssertPrototype(MachineFrame);
await Interact(Manipulator1, Manipulator1, Manipulator1, Manipulator1, Glass, Screw);
AssertPrototype("Autolathe");
// await InteractUsing("AutolatheMachineCircuitboard");
// AssertPrototype(MachineFrame);
// await Interact(Manipulator1, Manipulator1, Manipulator1, Manipulator1, Glass, Screw);
// AssertPrototype("Autolathe");
}
}

34
Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs
View File

@ -22,22 +22,22 @@ public sealed class GuideEntryPrototypeTests
public async Task Validate(string protoKey)
{
return; // DeltaV - shit broken
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
var client = pair.Client;
await client.WaitIdleAsync();
var protoMan = client.ResolveDependency<IPrototypeManager>();
var resMan = client.ResolveDependency<IResourceManager>();
var parser = client.ResolveDependency<DocumentParsingManager>();
var proto = protoMan.Index<GuideEntryPrototype>(protoKey);
await client.WaitAssertion(() =>
{
using var reader = resMan.ContentFileReadText(proto.Text);
var text = reader.ReadToEnd();
Assert.That(parser.TryAddMarkup(new Document(), text), $"Failed to parse the guide entry's document.");
});
await pair.CleanReturnAsync();
// await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
// var client = pair.Client;
// await client.WaitIdleAsync();
// var protoMan = client.ResolveDependency<IPrototypeManager>();
// var resMan = client.ResolveDependency<IResourceManager>();
// var parser = client.ResolveDependency<DocumentParsingManager>();
// var proto = protoMan.Index<GuideEntryPrototype>(protoKey);
//
// await client.WaitAssertion(() =>
// {
// using var reader = resMan.ContentFileReadText(proto.Text);
// var text = reader.ReadToEnd();
//
// Assert.That(parser.TryAddMarkup(new Document(), text), $"Failed to parse the guide entry's document.");
// });
//
// await pair.CleanReturnAsync();
}
}

94
Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
View File

@ -12,52 +12,52 @@ public sealed partial class MindTests
public async Task DeleteAllThenGhost()
{
return; // DeltaV - stupid fucking test
var settings = new PoolSettings
{
Dirty = true,
DummyTicker = false,
Connected = true
};
await using var pair = await PoolManager.GetServerClient(settings);
// Client is connected with a valid entity & mind
Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
// Delete **everything**
var conHost = pair.Server.ResolveDependency<IConsoleHost>();
await pair.Server.WaitPost(() => conHost.ExecuteCommand("entities delete"));
await pair.RunTicksSync(5);
Assert.That(pair.Server.EntMan.EntityCount, Is.EqualTo(0));
foreach (var ent in pair.Client.EntMan.GetEntities())
{
Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
}
Assert.That(pair.Client.EntMan.EntityCount, Is.EqualTo(0));
// Create a new map.
MapId mapId = default;
await pair.Server.WaitPost(() => pair.Server.System<SharedMapSystem>().CreateMap(out mapId));
await pair.RunTicksSync(5);
// Client is not attached to anything
Assert.That(pair.Client.AttachedEntity, Is.Null);
Assert.That(pair.PlayerData?.Mind, Is.Null);
// Attempt to ghost
var cConHost = pair.Client.ResolveDependency<IConsoleHost>();
await pair.Client.WaitPost(() => cConHost.ExecuteCommand("ghost"));
await pair.RunTicksSync(10);
// Client should be attached to a ghost placed on the new map.
Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
var xform = pair.Client.Transform(pair.Client.AttachedEntity!.Value);
Assert.That(xform.MapID, Is.EqualTo(mapId));
await pair.CleanReturnAsync();
// var settings = new PoolSettings
// {
// Dirty = true,
// DummyTicker = false,
// Connected = true
// };
// await using var pair = await PoolManager.GetServerClient(settings);
//
// // Client is connected with a valid entity & mind
// Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
// Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
//
// // Delete **everything**
// var conHost = pair.Server.ResolveDependency<IConsoleHost>();
// await pair.Server.WaitPost(() => conHost.ExecuteCommand("entities delete"));
// await pair.RunTicksSync(5);
//
// Assert.That(pair.Server.EntMan.EntityCount, Is.EqualTo(0));
//
// foreach (var ent in pair.Client.EntMan.GetEntities())
// {
// Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
// }
//
// Assert.That(pair.Client.EntMan.EntityCount, Is.EqualTo(0));
//
// // Create a new map.
// MapId mapId = default;
// await pair.Server.WaitPost(() => pair.Server.System<SharedMapSystem>().CreateMap(out mapId));
// await pair.RunTicksSync(5);
//
// // Client is not attached to anything
// Assert.That(pair.Client.AttachedEntity, Is.Null);
// Assert.That(pair.PlayerData?.Mind, Is.Null);
//
// // Attempt to ghost
// var cConHost = pair.Client.ResolveDependency<IConsoleHost>();
// await pair.Client.WaitPost(() => cConHost.ExecuteCommand("ghost"));
// await pair.RunTicksSync(10);
//
// // Client should be attached to a ghost placed on the new map.
// Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
// Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
// var xform = pair.Client.Transform(pair.Client.AttachedEntity!.Value);
// Assert.That(xform.MapID, Is.EqualTo(mapId));
//
// await pair.CleanReturnAsync();
}
}

4
Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
View File

@ -761,8 +761,8 @@ public sealed partial class TraitSystemTest
IPrototypeManager protoMan,
IComponentFactory factory,
EntityUid player,
string? jobId = null,
string? speciesId = null)
string jobId = null,
string speciesId = null)
{
return new TraitConditionContext
{

2
Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
View File

@ -1,6 +1,8 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Numerics;
using Content.Server._Impstation.Revenant.Components;
using Content.Server._Impstation.Revenant.EntitySystems;
using Content.Server._DV.Access.Systems; // DeltaV - Subdermal ID Cards
using Content.Server.Cargo.Components;
using Content.Server.Doors.Systems;

1
Content.Server/Administration/Systems/BwoinkSystem.cs
View File

@ -483,6 +483,7 @@ namespace Content.Server.Administration.Systems
var linkToPrevious = string.Empty;
_webhookData = await GetWebhookData(_webhookUrl); // Delta V - added so webhook doesn't scream
// If we have all the data required, we can link to the embed of the previous round or embed that was too long
if (_webhookData is { GuildId: { } guildId, ChannelId: { } channelId })
{

26
Content.Server/Chat/SuicideSystem.cs
View File

@ -73,19 +73,19 @@ public sealed class SuicideSystem : EntitySystem
// TODO: fix this
// This is a handled event, but the result is never used
// It looks like TriggerOnMobstateChange is supposed to prevent you from suiciding
var suicideEvent = new SuicideEvent(victim);
RaiseLocalEvent(victim, suicideEvent);
// Since the player is already dead the log will not contain their username.
if (session != null)
{
_adminLogger.Add(LogType.Mind, $"{session:player} suicided.");
}
else
{
_adminLogger.Add(LogType.Mind, $"{ToPrettyString(victim):player} suicided.");
}
return true;
// var suicideEvent = new SuicideEvent(victim);
// RaiseLocalEvent(victim, suicideEvent);
//
// // Since the player is already dead the log will not contain their username.
// if (session != null)
// {
// _adminLogger.Add(LogType.Mind, $"{session:player} suicided.");
// }
// else
// {
// _adminLogger.Add(LogType.Mind, $"{ToPrettyString(victim):player} suicided.");
// }
// return true;
}
/// <summary>

56
Content.Server/Connection/ConnectionManager.cs
View File

@ -313,34 +313,34 @@ namespace Content.Server.Connection
}
// DeltaV - Replace existing softwhitelist implementation
if (false)//if (_cfg.GetCVar(CCVars.WhitelistEnabled) && adminData is null)
{
if (_whitelists is null)
{
_sawmill.Error("Whitelist enabled but no whitelists loaded.");
// Misconfigured, deny everyone.
return (ConnectionDenyReason.Whitelist, Loc.GetString("generic-misconfigured"), null);
}
foreach (var whitelist in _whitelists)
{
if (!IsValid(whitelist, softPlayerCount))
{
// Not valid for current player count.
continue;
}
var whitelistStatus = await IsWhitelisted(whitelist, e.UserData, _sawmill);
if (!whitelistStatus.isWhitelisted)
{
// Not whitelisted.
return (ConnectionDenyReason.Whitelist, Loc.GetString("whitelist-fail-prefix", ("msg", whitelistStatus.denyMessage!)), null);
}
// Whitelisted, don't check any more.
break;
}
}
// if (false)//if (_cfg.GetCVar(CCVars.WhitelistEnabled) && adminData is null)
// {
// if (_whitelists is null)
// {
// _sawmill.Error("Whitelist enabled but no whitelists loaded.");
// // Misconfigured, deny everyone.
// return (ConnectionDenyReason.Whitelist, Loc.GetString("generic-misconfigured"), null);
// }
//
// foreach (var whitelist in _whitelists)
// {
// if (!IsValid(whitelist, softPlayerCount))
// {
// // Not valid for current player count.
// continue;
// }
//
// var whitelistStatus = await IsWhitelisted(whitelist, e.UserData, _sawmill);
// if (!whitelistStatus.isWhitelisted)
// {
// // Not whitelisted.
// return (ConnectionDenyReason.Whitelist, Loc.GetString("whitelist-fail-prefix", ("msg", whitelistStatus.denyMessage!)), null);
// }
//
// // Whitelisted, don't check any more.
// break;
// }
// }
// DeltaV - Soft whitelist improvements
// TODO: replace this with a whitelist config prototype with a connected whitelisted players condition

4
Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs
View File

@ -25,8 +25,8 @@ public sealed class CriminalRecordsSystem : SharedCriminalRecordsSystem
{
[Dependency] private readonly GameTicker _ticker = default!;
[Dependency] private readonly StationRecordsSystem _records = default!;
[Dependency] private readonly StationSystem _station = default!;
[Dependency] private readonly CartridgeLoaderSystem _cartridge = default!;
// [Dependency] private readonly StationSystem _station = default!; // DV - Never used
// [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!; // DV - Never used
public override void Initialize()
{

2
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@ -42,7 +42,7 @@ namespace Content.Server.Electrocution;
public sealed class ElectrocutionSystem : SharedElectrocutionSystem
{
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
// [Dependency] private readonly IMapManager _mapManager = default!; // DV - Never used
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly DamageableSystem _damageable = default!;

2
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
View File

@ -27,7 +27,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b");
[Dependency] private readonly AntagSelectionSystem _antag = default!;
[Dependency] private readonly SharedJobSystem _jobs = default!;
// [Dependency] private readonly SharedJobSystem _jobs = default!; // DV - not used
[Dependency] private readonly MindSystem _mindSystem = default!;
[Dependency] private readonly NpcFactionSystem _npcFaction = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;

10
Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeSystem.cs
View File

@ -1,8 +1,10 @@
using Content.Shared.CartridgeLoader;
using Content.Server.CartridgeLoader;
using Content.Server.CartridgeLoader.Cartridges;
using Content.Shared.CartridgeLoader;
using Content.Shared.CartridgeLoader.Cartridges;
using Content.Server.Psionics.Glimmer;
using Content.Server.Nyanotrasen.Psionics.Glimmer;
namespace Content.Server.CartridgeLoader.Cartridges;
namespace Content.Server.Nyanotrasen.CartridgeLoader;
public sealed class GlimmerMonitorCartridgeSystem : EntitySystem
{
@ -29,7 +31,7 @@ public sealed class GlimmerMonitorCartridgeSystem : EntitySystem
if (args is not GlimmerMonitorSyncMessageEvent)
return;
;
UpdateUiState(uid, EntityManager.GetEntity( args.LoaderUid ), component);
UpdateUiState(uid, GetEntity( args.LoaderUid ), component);
}
public void UpdateUiState(EntityUid uid, EntityUid loaderUid, GlimmerMonitorCartridgeComponent? component)

4
Content.Server/Nyanotrasen/Laundry/LaundrySystem.cs
View File

@ -1,9 +1,9 @@
using Robust.Shared.Containers;
using Content.Shared.Destructible;
using Content.Shared.Laundry;
using Content.Shared.Nyanotrasen.Laundry;
using Content.Shared.Storage;
namespace Content.Server.Laundry;
namespace Content.Server.Nyanotrasen.Laundry;
// I just wanted the sprite to change states when it broke.

4
Content.Server/Nyanotrasen/Objectives/Components/BecomeGolemConditionComponent.cs
View File

@ -1,4 +1,4 @@
using Content.Server.Objectives.Systems;
using Content.Server.Nyanotrasen.Objectives.Systems;
namespace Content.Server.Objectives.Components;
@ -8,4 +8,4 @@ namespace Content.Server.Objectives.Components;
[RegisterComponent, Access(typeof(BecomeGolemConditionSystem))]
public sealed partial class BecomeGolemConditionComponent : Component
{
}
}

4
Content.Server/Nyanotrasen/Objectives/Systems/BecomeGolemConditionSystem.cs
View File

@ -2,11 +2,11 @@ using Content.Server.Objectives.Components;
using Content.Shared.Mind;
using Content.Shared.Objectives.Components;
namespace Content.Server.Objectives.Systems
namespace Content.Server.Nyanotrasen.Objectives.Systems
{
public sealed class BecomeGolemConditionSystem : EntitySystem
{
private EntityQuery<MetaDataComponent> _metaQuery;
private readonly EntityQuery<MetaDataComponent> _metaQuery = new EntityQuery<MetaDataComponent>();
public override void Initialize()
{

4
Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
View File

@ -4,14 +4,12 @@ using Content.Server.Chat.Systems;
using Content.Server.Chat.Managers;
using Robust.Shared.Random;
using Robust.Shared.Prototypes;
using Robust.Server.GameObjects;
using Robust.Shared.Player;
namespace Content.Server.Psionics.Dreams
namespace Content.Server.Nyanotrasen.Psionics.Dreams
{
public sealed class DreamsSystem : EntitySystem
{
[Dependency] private readonly ChatSystem _chat = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;

4
Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
View File

@ -4,9 +4,8 @@ using Robust.Shared.Configuration;
using Content.Shared._DV.CCVars;
using Content.Shared.Psionics.Glimmer;
using Content.Shared.GameTicking;
using Content.Server.CartridgeLoader.Cartridges;
namespace Content.Server.Psionics.Glimmer
namespace Content.Server.Nyanotrasen.Psionics.Glimmer
{
/// <summary>
/// Handles the passive reduction of glimmer.
@ -17,7 +16,6 @@ namespace Content.Server.Psionics.Glimmer
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly GlimmerMonitorCartridgeSystem _cartridgeSys = default!;
/// List of glimmer values spaced by minute.
public List<int> GlimmerValues = new();

6
Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
View File

@ -1,14 +1,11 @@
using Content.Server.Administration;
using Content.Shared._DV.Psionics.Components;
using Content.Shared.Administration;
using Content.Shared.Abilities.Psionics;
using Content.Shared.Mobs.Components;
using Robust.Shared.Console;
using Robust.Server.GameObjects;
using Content.Shared.Actions;
using Robust.Shared.Player;
namespace Content.Server.Psionics;
namespace Content.Server.Nyanotrasen.Psionics;
[AdminCommand(AdminFlags.Logs)]
public sealed class ListPsionicsCommand : IConsoleCommand
@ -18,7 +15,6 @@ public sealed class ListPsionicsCommand : IConsoleCommand
public string Help => Loc.GetString("command-lspsionic-help");
public async void Execute(IConsoleShell shell, string argStr, string[] args)
{
SharedActionsSystem actions = default!;
var entMan = IoCManager.Resolve<IEntityManager>();
foreach (var (actor, mob, psionic, meta) in entMan.EntityQuery<ActorComponent, MobStateComponent, PsionicComponent, MetaDataComponent>()){
// filter out xenos, etc, with innate telepathy

8
Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs
View File

@ -1,6 +1,3 @@
using Content.Server.Research.TechnologyDisk.Components;
using Content.Server.UserInterface;
using Content.Server.Power.Components;
using Content.Shared.Popups;
using Content.Shared.Power;
using Content.Shared.Research.Prototypes;
@ -9,7 +6,7 @@ using Content.Shared.ReverseEngineering;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
namespace Content.Server.ReverseEngineering;
namespace Content.Server.Nyanotrasen.ReverseEngineering;
public sealed class ReverseEngineeringSystem : SharedReverseEngineeringSystem
{
@ -112,7 +109,8 @@ public sealed class ReverseEngineeringSystem : SharedReverseEngineeringSystem
ReverseEngineeringTickResult.SuccessMinor => 10,
ReverseEngineeringTickResult.SuccessAverage => 25,
ReverseEngineeringTickResult.SuccessMajor => 40,
ReverseEngineeringTickResult.InstantSuccess => 100
ReverseEngineeringTickResult.InstantSuccess => 100,
_ => throw new ArgumentOutOfRangeException()
};
rev.Progress = Math.Clamp(rev.Progress + bonus, 0, 100);

1
Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
View File

@ -14,6 +14,7 @@ using Content.Shared.Item;
using Content.Shared.Bed.Sleep;
using System.Linq;
using System.Numerics;
using Content.Server._Impstation.Revenant.EntitySystems;
using Content.Server.Revenant.Components;
using Content.Shared.Physics;
using Content.Shared.DoAfter;

2
Content.Server/Spider/SpiderSystem.cs
View File

@ -13,7 +13,7 @@ namespace Content.Server.Spider;
public sealed class SpiderSystem : SharedSpiderSystem
{
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
// [Dependency] private readonly EntityLookupSystem _lookup = default!; // Delta V - Never used
[Dependency] private readonly TurfSystem _turf = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;

2
Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
View File

@ -26,7 +26,7 @@ namespace Content.Server.StationEvents
public sealed class BasicStationEventSchedulerSystem : GameRuleSystem<BasicStationEventSchedulerComponent>
{
[Dependency] private readonly IChatManager _chatManager = default!; // DeltaV
[Dependency] private readonly IGameTiming _timing = default!; // DeltaV
// [Dependency] private readonly IGameTiming _timing = default!; // DeltaV - Never used
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly EventManagerSystem _event = default!;
[Dependency] private readonly NextEventSystem _next = default!; // DeltaV

2
Content.Server/StationEvents/Events/StationEventSystem.cs
View File

@ -23,7 +23,7 @@ public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : ICompo
[Dependency] protected readonly ChatSystem ChatSystem = default!;
[Dependency] protected readonly SharedAudioSystem Audio = default!;
[Dependency] protected readonly StationSystem StationSystem = default!;
[Dependency] protected readonly GameTicker GameTicker = default!;
// [Dependency] protected readonly GameTicker GameTicker = default!; // Delta V - Never used
protected ISawmill Sawmill = default!;

1
Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
View File

@ -12,7 +12,6 @@ namespace Content.Server.StationEvents;
public sealed class RampingStationEventSchedulerSystem : GameRuleSystem<RampingStationEventSchedulerComponent>
{
[Dependency] private readonly IChatManager _chatManager = default!; // DeltaV
[Dependency] private readonly IGameTiming _timing = default!; // DeltaV
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly EventManagerSystem _event = default!;
[Dependency] private readonly GameTicker _gameTicker = default!;

2
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
View File

@ -1,6 +1,5 @@
using System.Numerics;
using Content.Server.Cargo.Systems;
using Content.Server.Temperature.Systems; // DeltaV Heat Change system
using Content.Server.Weapons.Ranged.Components;
using Content.Shared.Cargo;
using Content.Shared.Damage;
@ -29,7 +28,6 @@ public sealed partial class GunSystem : SharedGunSystem
{
[Dependency] private readonly PricingSystem _pricing = default!;
[Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly TemperatureSystem _temperature = default!; // DeltaV Heat change system
private const float DamagePitchVariation = 0.05f;

2
Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs
View File

@ -12,7 +12,7 @@ namespace Content.Server.Worldgen.Systems.Debris;
public sealed class SimpleFloorPlanPopulatorSystem : BaseWorldSystem
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinition = default!;
// [Dependency] private readonly ITileDefinitionManager _tileDefinition = default!; // Delta V - Never used
[Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly TurfSystem _turf = default!;

1
Content.Server/_DV/Chapel/SacrificialAltarSystem.cs
View File

@ -26,7 +26,6 @@ public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly BodySystem _body = default!;
[Dependency] private readonly SharedMindSystem _mind = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly GibbingSystem _gibbing = default!;

1
Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs
View File

@ -93,7 +93,6 @@ public sealed class CosmicCultRuleSystem : GameRuleSystem<CosmicCultRuleComponen
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly RoundEndSystem _roundEnd = default!;
[Dependency] private readonly ServerGlobalSoundSystem _sound = default!;
[Dependency] private readonly BodySystem _body = default!;
[Dependency] private readonly SharedEyeSystem _eye = default!;
[Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly SharedMindSystem _mind = default!;

2
Content.Server/_DV/StationEvents/GameRules/NoosphericStormRule.cs
View File

@ -23,7 +23,7 @@ internal sealed class NoosphericStormRule : StationEventSystem<NoosphericStormRu
Dictionary<EntityUid, PotentialPsionicComponent> validList = [];
var query = EntityManager.EntityQueryEnumerator<PotentialPsionicComponent>();
var query = EntityQueryEnumerator<PotentialPsionicComponent>();
while (query.MoveNext(out var potPsionic, out var potPsionicComp))
{
if (!_mobStateSystem.IsAlive(potPsionic)

1
Content.Server/_DV/StationEvents/GameRules/RandomAnimationRule.cs
View File

@ -1,4 +1,5 @@
using Content.Server._DV.StationEvents.Components;
using Content.Server._Impstation.Revenant.EntitySystems;
using Content.Server.Revenant.EntitySystems;
using Content.Server.StationEvents.Events;
using Content.Shared.GameTicking.Components;

1
Content.Server/_DV/Weather/WeatherEffectsSystem.cs
View File

@ -17,7 +17,6 @@ public sealed partial class WeatherEffectsSystem : EntitySystem
[Dependency] private readonly DamageableSystem _damageable = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly SharedWeatherSystem _weather = default!;

1
Content.Server/_DV/Weather/WeatherSchedulerSystem.cs
View File

@ -13,7 +13,6 @@ public sealed class WeatherSchedulerSystem : EntitySystem
{
[Dependency] private readonly IChatManager _chat = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedWeatherSystem _weather = default!;

1
Content.Server/_Goobstation/Bible/GoobBibleSystem.cs
View File

@ -32,7 +32,6 @@ public sealed partial class GoobBibleSystem : EntitySystem
[Dependency] private readonly UseDelaySystem _delay = default!;
[Dependency] private readonly SharedStunSystem _stun = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly INetManager _netManager = default!;
public override void Initialize()

1
Content.Server/_Goobstation/Devil/DevilSystem.cs
View File

@ -75,7 +75,6 @@ public sealed partial class DevilSystem : EntitySystem
[Dependency] private readonly CondemnedSystem _condemned = default!;
[Dependency] private readonly MobStateSystem _state = default!;
[Dependency] private readonly JitteringSystem _jittering = default!;
[Dependency] private readonly BodySystem _body = default!;
[Dependency] private readonly ContainerSystem _container = default!;
private static readonly Regex WhitespaceAndNonWordRegex = new(@"[\s\W]+", RegexOptions.Compiled);

3
Content.Server/_Goobstation/Factory/ConstructorSystem.cs
View File

@ -52,7 +52,8 @@ public sealed class ConstructorSystem : SharedConstructorSystem
var completed = proto.Type switch
{
ConstructionType.Structure => await _construction.TryStartStructureConstruction(uid, id, OutputPosition(ent), Angle.Zero),
ConstructionType.Item => await _construction.TryStartItemConstruction(id, uid)
ConstructionType.Item => await _construction.TryStartItemConstruction(id, uid),
_ => throw new ArgumentOutOfRangeException()
};
if (completed)

2
Content.Server/_Goobstation/Possession/PossessionSystem.cs
View File

@ -47,7 +47,7 @@ public sealed partial class PossessionSystem : EntitySystem
[Dependency] private readonly ISharedAdminLogManager _admin = default!;
[Dependency] private readonly ActionsSystem _action = default!;
[Dependency] private readonly PolymorphSystem _polymorph = default!;
[Dependency] private readonly TagSystem _tag = default!;
// [Dependency] private readonly TagSystem _tag = default!; // Delta V - Never used
// private static readonly ProtoId<TagPrototype> CannotSuicideAnyTag = "CannotSuicideAny"; // DeltaV - Don't use literals. // DV - ShitMed Removal
private static readonly EntProtoId LolipopProto = "FoodLollipop"; // DeltaV - Don't use literals.

4
Content.Server/_Goobstation/Religion/WeakToHolySystem.cs
View File

@ -30,10 +30,10 @@ namespace Content.Server._Goobstation.Religion;
public sealed class WeakToHolySystem : EntitySystem
{
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
// [Dependency] private readonly InventorySystem _inventorySystem = default!; // Delta V - Never used
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly GoobBibleSystem _goobBible = default!;
[Dependency] private readonly BodySystem _body = default!;
// [Dependency] private readonly BodySystem _body = default!; // Delta V - Never used
[Dependency] private readonly UseDelaySystem _useDelay = default!;
public override void Initialize()
{

3
Content.Server/_Goobstation/Singularity/RadCollectorSignalSystem.cs
View File

@ -54,6 +54,7 @@ public sealed class RadCollectorSignalSystem : EntitySystem
{
RadCollectorState.Empty => EmptyPort,
RadCollectorState.Low => LowPort,
RadCollectorState.Full => FullPort
RadCollectorState.Full => FullPort,
_ => throw new ArgumentOutOfRangeException(nameof(state), state, null)
};
}

2
Content.Server/_Harmony/GameTicking/Rules/ConspiratorRuleSystem.cs
View File

@ -17,7 +17,7 @@ namespace Content.Server._Harmony.GameTicking.Rules;
public sealed class ConspiratorRuleSystem : GameRuleSystem<ConspiratorRuleComponent>
{
[Dependency] private readonly AntagSelectionSystem _antag = default!;
// [Dependency] private readonly AntagSelectionSystem _antag = default!; // Delta V - Never used
[Dependency] private readonly SharedMindSystem _mind = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly IRobustRandom _random = default!;

2
Content.Server/_Impstation/Containers/AntiTamper/AntiTamperComponent.cs
View File

@ -1,4 +1,6 @@
using Content.Server._Impstation.Containers.AntiTamper;
using Content.Shared.Damage;
using Content.Shared.Mind.Components;
using Content.Shared.Tools;
using Robust.Shared.Audio;
using Robust.Shared.Prototypes;

6
Content.Server/_Impstation/Containers/AntiTamper/AntiTamperSystem.cs
View File

@ -1,3 +1,4 @@
using Content.Server.Containers.AntiTamper;
using Content.Server.Storage.EntitySystems;
using Content.Shared.Containers.AntiTamper;
using Content.Shared.Damage.Systems;
@ -7,14 +8,13 @@ using Content.Shared.Lock;
using Content.Shared.Mind.Components;
using Content.Shared.Popups;
using Content.Shared.Storage.Components;
using Content.Shared.Storage.EntitySystems;
using Content.Shared.Tools.Systems;
using Content.Shared.Verbs;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.Random;
namespace Content.Server.Containers.AntiTamper;
namespace Content.Server._Impstation.Containers.AntiTamper;
public sealed partial class AntiTamperSystem : EntitySystem
{
@ -23,7 +23,7 @@ public sealed partial class AntiTamperSystem : EntitySystem
[Dependency] private readonly LockSystem _lockSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly SharedToolSystem _toolSystem = default!;
[Dependency] private readonly SharedEntityStorageSystem _entityStorageSystem = default!;
// [Dependency] private readonly SharedEntityStorageSystem _entityStorageSystem = default!; // Delta V - Never used
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!;

4
Content.Server/_Impstation/Revenant/Components/RevenantAnimatedComponent.cs
View File

@ -1,9 +1,9 @@
using System.Threading;
using Content.Server.Revenant.EntitySystems;
using Content.Server._Impstation.Revenant.EntitySystems;
using Content.Shared.Revenant.Components;
using Robust.Shared.GameStates;
namespace Content.Server.Revenant.Components;
namespace Content.Server._Impstation.Revenant.Components;
[RegisterComponent, NetworkedComponent]
[Access(typeof(RevenantAnimatedSystem))]

11
Content.Server/_Impstation/Revenant/EntitySystems/RevenantAnimatedSystem.cs
View File

@ -1,7 +1,7 @@
using Content.Server._Impstation.Revenant.Components;
using Content.Shared.Popups;
using Content.Shared.Damage;
using Content.Shared.Damage.Components;
using Content.Server.Revenant.Components;
using Content.Shared.DoAfter;
using Content.Shared.Revenant.Components;
using Content.Server.NPC.HTN;
@ -28,7 +28,7 @@ using Robust.Shared.Timing;
using Content.Shared.Construction.Components;
using Content.Shared.Trigger.Components;
namespace Content.Server.Revenant.EntitySystems;
namespace Content.Server._Impstation.Revenant.EntitySystems;
public sealed partial class RevenantAnimatedSystem : EntitySystem
{
@ -41,6 +41,9 @@ public sealed partial class RevenantAnimatedSystem : EntitySystem
[Dependency] private readonly MobThresholdSystem _thresholds = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
private const string BluntName = "Blunt";
private const string SimpleHostileName = "SimpleHostile";
public override void Initialize()
{
base.Initialize();
@ -79,7 +82,7 @@ public sealed partial class RevenantAnimatedSystem : EntitySystem
// Add melee damage if an item doesn't already have it
if (EnsureHelper<MeleeWeaponComponent>(ent, out var melee))
melee.Damage = new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Blunt"), 5);
melee.Damage = new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>(BluntName), 5);
EnsureHelper<InputMoverComponent>(ent);
EnsureHelper<MovementSpeedModifierComponent>(ent, out var moveSpeed);
@ -100,7 +103,7 @@ public sealed partial class RevenantAnimatedSystem : EntitySystem
EnsureHelper<NpcFactionMemberComponent>(ent, out var factions);
_factionSystem.ClearFactions((ent, factions));
_factionSystem.AddFaction((ent, factions), "SimpleHostile");
_factionSystem.AddFaction((ent, factions), SimpleHostileName);
// For things like handcuffs
EnsureHelper<DoAfterComponent>(ent);

6
Content.Server/_Impstation/Revenant/EntitySystems/RevenantStasisSystem.cs
View File

@ -36,11 +36,13 @@ public sealed partial class RevenantStasisSystem : EntitySystem
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] private readonly TagSystem _tags = default!;
[Dependency] private readonly ExplosionSystem _explosion = default!;
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[ValidatePrototypeId<StatusEffectPrototype>]
private const string RevenantStasisId = "Stasis";
private const string HolyId = "Holy"; // DV - Fix Errors
private const string SaltId = "Salt"; // DV - Fix Errors
public override void Initialize()
{
base.Initialize();
@ -130,7 +132,7 @@ public sealed partial class RevenantStasisSystem : EntitySystem
foreach (var reagent in args.Reagents)
{
if (_tags.HasAnyTag(reagent, "Salt", "Holy"))
if (_tags.HasAnyTag(reagent, SaltId, HolyId))
return;
}

2
Content.Server/_Impstation/Thaven/ThavenMoodSystem.cs
View File

@ -92,7 +92,7 @@ public sealed partial class ThavenMoodsSystem : SharedThavenMoodSystem
return false;
_sharedMoods.Add(mood);
var enumerator = EntityManager.EntityQueryEnumerator<ThavenMoodsComponent>();
var enumerator = EntityQueryEnumerator<ThavenMoodsComponent>();
while (enumerator.MoveNext(out var ent, out var comp))
{
if (!comp.FollowsSharedMoods)

1
Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Systems/AnimateArtifactSystem.cs
View File

@ -3,6 +3,7 @@ using Content.Shared.Xenoarchaeology.Artifact;
using Content.Server.Revenant.EntitySystems;
using Content.Shared.Item;
using System.Linq;
using Content.Server._Impstation.Revenant.EntitySystems;
using Robust.Shared.Random;
using Robust.Shared.Containers;

11
Content.Server/_Mono/CorticalBorer/CorticalBorerSystem.cs
View File

@ -51,6 +51,9 @@ public sealed partial class CorticalBorerSystem : SharedCorticalBorerSystem
[Dependency] private readonly AlertsSystem _alerts = default!;
[Dependency] private readonly GhostRoleSystem _ghost = default!;
private const string ActionEndControlHostName = "ActionEndControlHost";
private const string ActionLayEggHostName = "ActionLayEggHost";
public override void Initialize()
{
SubscribeAbilities();
@ -80,7 +83,7 @@ public sealed partial class CorticalBorerSystem : SharedCorticalBorerSystem
{
base.Update(frameTime);
foreach (var comp in EntityManager.EntityQuery<CorticalBorerComponent>())
foreach (var comp in EntityQuery<CorticalBorerComponent>())
{
if (_timing.CurTime < comp.UpdateTimer)
continue;
@ -91,7 +94,7 @@ public sealed partial class CorticalBorerSystem : SharedCorticalBorerSystem
UpdateChems((comp.Owner, comp), comp.ChemicalGenerationRate);
}
foreach (var comp in EntityManager.EntityQuery<CorticalBorerInfestedComponent>())
foreach (var comp in EntityQuery<CorticalBorerInfestedComponent>())
{
if (_timing.CurTime >= comp.ControlTimeEnd)
EndControl(comp.Borer);
@ -329,12 +332,12 @@ public sealed partial class CorticalBorerSystem : SharedCorticalBorerSystem
_ghost.UnregisterGhostRole((worm, ghostRole)); // prevent players from taking the worm role once mind isn't in the worm
// add the end control and vomit egg action
if (_actions.AddAction(host, "ActionEndControlHost") is {} actionEnd)
if (_actions.AddAction(host, ActionEndControlHostName) is {} actionEnd)
infestedComp.RemoveAbilities.Add(actionEnd);
if (comp.CanReproduce &&
infestedComp.ControlTimeEnd != null) // you can't lay eggs with something you can control forever
{
if (_actions.AddAction(host, "ActionLayEggHost") is {} actionLay)
if (_actions.AddAction(host, ActionLayEggHostName) is {} actionLay)
infestedComp.RemoveAbilities.Add(actionLay);
}

1
Content.Shared/Actions/ActionUpgradeSystem.cs
View File

@ -11,7 +11,6 @@ public sealed class ActionUpgradeSystem : EntitySystem
{
[Dependency] private readonly SharedActionsSystem _actions = default!;
[Dependency] private readonly ActionContainerSystem _actionContainer = default!;
[Dependency] private readonly EntityManager _entityManager = default!;
public override void Initialize()
{

1
Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs
View File

@ -19,7 +19,6 @@ namespace Content.Shared.EntityEffects.Effects.Damage;
public sealed partial class EvenHealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, EvenHealthChange>
{
[Dependency] private readonly DamageableSystem _damageable = default!;
[Dependency] private readonly BodySystem _body = default!; // DeltaV
protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<EvenHealthChange> args)
{

17
Content.Shared/Gravity/SharedGravitySystem.Shake.cs
View File

@ -61,14 +61,15 @@ public abstract partial class SharedGravitySystem
return;
// ES END
if (!TryComp<GravityShakeComponent>(uid, out var shake))
{
shake = AddComp<GravityShakeComponent>(uid);
shake.NextShake = Timing.CurTime;
}
shake.ShakeTimes = 10;
Dirty(uid, shake);
// Delta V - Commented out since unreachable
// if (!TryComp<GravityShakeComponent>(uid, out var shake))
// {
// shake = AddComp<GravityShakeComponent>(uid);
// shake.NextShake = Timing.CurTime;
// }
//
// shake.ShakeTimes = 10;
// Dirty(uid, shake);
}
protected virtual void ShakeGrid(EntityUid uid, GravityComponent? comp = null) {}

9
Content.Shared/Implants/SharedImplanterSystem.cs
View File

@ -49,10 +49,11 @@ public abstract class SharedImplanterSystem : EntitySystem
_itemSlots.AddItemSlot(uid, ImplanterComponent.ImplanterSlotId, component.ImplanterSlot);
return; // DeltaV - don't use deimplant chosing
component.DeimplantChosen ??= component.DeimplantWhitelist.FirstOrNull();
Dirty(uid, component);
// DeltaV - don't use deimplant chosing
// return;
// component.DeimplantChosen ??= component.DeimplantWhitelist.FirstOrNull();
//
// Dirty(uid, component);
}
private void OnEntInserted(EntityUid uid, ImplanterComponent component, EntInsertedIntoContainerMessage args)

9
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@ -254,10 +254,11 @@ public abstract partial class InventorySystem
if (!HasComp(slotEntity, entry.Component.GetType()))
return false;
continue; // DeltaV - ignore suit storage whitelist
if (TryComp<AllowSuitStorageComponent>(slotEntity, out var comp) &&
_whitelistSystem.IsWhitelistFailOrNull(comp.Whitelist, itemUid))
return false;
// DeltaV - ignore suit storage whitelist
// continue;
// if (TryComp<AllowSuitStorageComponent>(slotEntity, out var comp) &&
// _whitelistSystem.IsWhitelistFailOrNull(comp.Whitelist, itemUid))
// return false;
}
}
}

2
Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs
View File

@ -16,7 +16,7 @@ public partial class SharedPseudoItemSystem
if (!Resolve(itemEnt, ref itemEnt.Comp) || !Resolve(storageEnt, ref storageEnt.Comp))
return false;
if (!TryComp<MetaDataComponent>(itemEnt, out var metadata))
if (!HasComp<MetaDataComponent>(itemEnt))
return false;
TryComp<ItemComponent>(itemEnt, out var item);

4
Content.Shared/Nyanotrasen/Laundry/SharedLaundry.cs
View File

@ -1,9 +1,9 @@
using Robust.Shared.Serialization;
namespace Content.Shared.Laundry;
namespace Content.Shared.Nyanotrasen.Laundry;
[RegisterComponent]
public partial class SharedWashingMachineComponent : Component { } //Hi, I'm no coder but the word "partial" used to be "sealed" o3o
public sealed partial class SharedWashingMachineComponent : Component { } //Hi, I'm no coder but the word "partial" used to be "sealed" o3o
[Serializable, NetSerializable]
public enum WashingMachineVisualState : byte

2
Content.Shared/StatusEffect/StatusEffectsSystem.cs
View File

@ -157,7 +157,7 @@ namespace Content.Shared.StatusEffect
if (TryAddStatusEffect(uid, key, time, refresh, status))
{
EntityManager.AddComponent(uid, component, true);
AddComp(uid, component, true);
status.ActiveEffects[key].RelevantComponent = Factory.GetComponentName(component.GetType());
return true;
}

1
Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
View File

@ -14,7 +14,6 @@ public sealed class MagnetPickupSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly ItemToggleSystem _toggle = default!; // DeltaV
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedStorageSystem _storage = default!;

1
Content.Shared/_DV/Chapel/SharedSacrificialAltarSystem.cs
View File

@ -8,7 +8,6 @@ namespace Content.Shared._DV.Chapel;
public abstract class SharedSacrificialAltarSystem : EntitySystem
{
[Dependency] private readonly SharedBuckleSystem _buckle = default!;
[Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
public override void Initialize()

1
Content.Shared/_DV/CosmicCult/Components/CosmicPurifiableComponent.cs
View File

@ -4,7 +4,6 @@ using Robust.Shared.Prototypes;
namespace Content.Shared._DV.CosmicCult.Components;
[RegisterComponent]
[AutoGenerateComponentPause]
public sealed partial class CosmicPurifiableComponent : Component
{
[DataField]

2
Content.Shared/_DV/CosmicCult/SharedMonumentSystem.cs
View File

@ -117,7 +117,7 @@ public abstract class SharedMonumentSystem : EntitySystem
if (!_prototype.TryIndex(args.InfluenceProtoId, out var proto) || !TryComp<ActivatableUIComponent>(ent, out var uiComp) || !TryComp<CosmicCultComponent>(args.Actor, out var cultComp))
return;
if (cultComp.EntropyBudget < proto.Cost || cultComp.OwnedInfluences.Contains(proto) || args.Actor == null)
if (cultComp.EntropyBudget < proto.Cost || cultComp.OwnedInfluences.Contains(proto))
return;
cultComp.OwnedInfluences.Add(proto);

2
Content.Shared/_DV/DeviceLinking/Systems/PowerTogglePortSystem.cs
View File

@ -9,8 +9,6 @@ namespace Content.Shared._DV.DeviceLinking.Systems;
public sealed class PowerTogglePortSystem : EntitySystem
{
[Dependency] private readonly SharedDeviceLinkSystem _device = default!;
[Dependency] private readonly SharedPowerReceiverSystem _power = default!;
public override void Initialize()

2
Content.Shared/_DV/Harpy/HarpySingerSystem.cs
View File

@ -2,7 +2,7 @@ using Content.Shared.Actions;
namespace Content.Shared._DV.Harpy
{
public class HarpySingerSystem : EntitySystem
public sealed class HarpySingerSystem : EntitySystem
{
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;

4
Content.Shared/_DV/Holosign/ChargeHolosignSystem.cs
View File

@ -66,7 +66,7 @@ public sealed class ChargeHolosignSystem : EntitySystem
return false;
}
var holoUid = EntityManager.PredictedSpawnAtPosition(ent.Comp1.SignProto, args.ClickLocation.SnapToGrid(EntityManager));
var holoUid = PredictedSpawnAtPosition(ent.Comp1.SignProto, args.ClickLocation.SnapToGrid(EntityManager));
var xform = Transform(holoUid);
if (!xform.Anchored)
_transform.AnchorEntity(holoUid, xform); // anchor to prevent any tempering with (don't know what could even interact with it)
@ -88,7 +88,7 @@ public sealed class ChargeHolosignSystem : EntitySystem
ent,
user);
EntityManager.PredictedDeleteEntity(sign);
PredictedDel(sign);
return true;
}
}

4
Content.Shared/_DV/IdentityManagement/IdentityBlockerExamineSystem.cs
View File

@ -1,9 +1,9 @@
using Content.Shared.Examine;
using Content.Shared.IdentityManagement.Components;
namespace Content.Shared.IdentityManagement;
namespace Content.Shared._DV.IdentityManagement;
public class IdentityBlockerExamineSystem : EntitySystem
public sealed class IdentityBlockerExamineSystem : EntitySystem
{
public override void Initialize()
{

2
Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantSystem.cs
View File

@ -20,7 +20,7 @@ public sealed class AddComponentsImplantSystem : EntitySystem
foreach (var component in ent.Comp.ComponentsToAdd)
{
// Don't add the component if it already exists
if (EntityManager.HasComponent(target, _factory.GetComponent(component.Key).GetType()))
if (HasComp(target, _factory.GetComponent(component.Key).GetType()))
continue;
EntityManager.AddComponent(target, component.Value);

1
Content.Shared/_DV/Movement/TileMovementSystem.cs
View File

@ -22,7 +22,6 @@ public sealed class TileMovementSystem : EntitySystem
[Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedMoverController _mover = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;

1
Content.Shared/_DV/Psionics/Systems/PsionicPowers/PsychokineticScreamPowerSystem.cs
View File

@ -25,7 +25,6 @@ public sealed class PsychokineticScreamPowerSystem : BasePsionicPowerSystem<Psyc
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly INetManager _net = default!;
protected override void OnPowerUsed(Entity<PsychokineticScreamPowerComponent> psionic, ref PsychokineticScreamPowerActionEvent args)
{

2
Content.Shared/_DV/Psionics/Systems/SubSystems/SharedPsionicSystem.Rolling.cs
View File

@ -74,7 +74,7 @@ public abstract partial class SharedPsionicSystem
return false;
// If the psionic already has that power, do not add it again.
if (powerEntity.Components.Any(psionicComponent =>
EntityManager.HasComponent(psionic, psionicComponent.Value.Component.GetType())))
HasComp(psionic, psionicComponent.Value.Component.GetType())))
return false;
// If they don't have it already, add it.
EntityManager.AddComponents(psionic, powerEntity);

2
Content.Shared/_DV/Shipyard/Prototypes/VesselCategoryPrototype.cs
View File

@ -6,7 +6,7 @@ namespace Content.Shared.Shipyard.Prototypes;
/// Like <c>TagPrototype</c> but for vessel categories.
/// Prevents making typos being silently ignored by the linter.
/// </summary>
[Prototype("vesselCategory")]
[Prototype]
public sealed partial class VesselCategoryPrototype : IPrototype
{
/// <summary>

2
Content.Shared/_DV/Shipyard/Prototypes/VesselPrototype.cs
View File

@ -4,7 +4,7 @@ using Robust.Shared.Utility;
namespace Content.Shared.Shipyard.Prototypes;
[Prototype("vessel")]
[Prototype]
public sealed partial class VesselPrototype : IPrototype
{
[ViewVariables, IdDataField]

1
Content.Shared/_DV/Silicons/Borgs/IdChipSlotSystem.cs
View File

@ -19,7 +19,6 @@ namespace Content.Shared._DV.Silicons.Borgs;
public sealed class IdChipSlotSystem : EntitySystem
{
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
[Dependency] private readonly ItemSlotsSystem _slots = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
[Dependency] private readonly SharedAccessSystem _access = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;

2
Content.Shared/_DV/Silicons/SharedStationAiShopSystem.cs
View File

@ -64,7 +64,7 @@ public abstract class SharedStationAiShopSystem : EntitySystem
if (!_timing.IsFirstTimePredicted)
return;
Spawn(args.Entity, args.Target);
Spawn(args.EntityAction, args.Target);
args.Handled = true;
}
}

2
Content.Shared/_DV/Silicons/StationAiShopComponent.cs
View File

@ -59,7 +59,7 @@ public sealed partial class StationAiHealthChangeActionEvent : EntityTargetActio
public sealed partial class StationAiSpawnEntityActionEvent : WorldTargetActionEvent
{
[DataField(required: true)]
public EntProtoId Entity;
public EntProtoId EntityAction;
}
/// <summary>

2
Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs
View File

@ -3,7 +3,7 @@ using Robust.Shared.Prototypes;
namespace Content.Shared._DV.Whitelist;
[Prototype("whitelistTier")]
[Prototype]
public sealed partial class WhitelistTierPrototype : IPrototype
{
[IdDataField]

2
Content.Shared/_ES/Camera/SharedESScreenshakeSystem.cs
View File

@ -15,7 +15,7 @@ namespace Content.Shared._ES.Camera;
// DeltaV - renamed from ESScreenshakeSystem to SharedESScreenshakeSystem
public sealed class SharedESScreenshakeSystem : EntitySystem
{
[Dependency] private readonly IRobustRandom _random = default!;
// [Dependency] private readonly IRobustRandom _random = default!; // Delta V - Never used
[Dependency] private readonly IGameTiming _timing = default!;
#region Internal

8
Content.Shared/_FarHorizons/Power/Generation/FissionGenerator/SharedTurbineSystem.cs
View File

@ -19,14 +19,14 @@ namespace Content.Shared._FarHorizons.Power.Generation.FissionGenerator;
public abstract class SharedTurbineSystem : EntitySystem
{
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
// [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; // Delta V - Never used
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] protected readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly SharedToolSystem _toolSystem = default!;
[Dependency] private readonly EntityManager _entityManager = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
// [Dependency] private readonly IPrototypeManager _proto = default!; // Delta V - Never used
public override void Initialize()
{
@ -118,9 +118,7 @@ public abstract class SharedTurbineSystem : EntitySystem
}
var loop = audioParams.Value.WithLoop(true);
var stream = false
? _audio.PlayPredicted(sound, uid, uid, loop)
: _audio.PlayPvs(sound, uid, loop);
var stream = _audio.PlayPvs(sound, uid, loop); // Delta V - It was alwasy false... so it was always this
audioStream = stream?.Entity is { } entity ? entity : null;
}

2
Content.Shared/_Goobstation/Clothing/Systems/ClothingGrantingSystem.cs
View File

@ -46,7 +46,7 @@ public sealed class ClothingGrantingSystem : EntitySystem
var temp = (object) newComp;
_serializationManager.CopyTo(data.Component, ref temp);
EntityManager.AddComponent(args.Equipee, (Component)temp!);
AddComp(args.Equipee, (Component)temp!);
component.Active[name] = true; // Goobstation
}

6
Content.Shared/_Goobstation/Factory/Filters/AutomationFilterSystem.cs
View File

@ -152,7 +152,8 @@ public sealed class AutomationFilterSystem : EntitySystem
NameFilterMode.Contain => name.Contains(check),
NameFilterMode.Start => name.StartsWith(check),
NameFilterMode.End => name.EndsWith(check),
NameFilterMode.Match => name == check
NameFilterMode.Match => name == check,
_ => throw new ArgumentOutOfRangeException()
};
// entity names usually don't change except for the end including a label
args.CouldAllow = ent.Comp.Mode switch
@ -255,7 +256,8 @@ public sealed class AutomationFilterSystem : EntitySystem
LogicGate.Xor => a != b,
LogicGate.Nor => !(a || b),
LogicGate.Nand => !(a && b),
LogicGate.Xnor => a == b
LogicGate.Xnor => a == b,
_ => throw new ArgumentOutOfRangeException()
};
args.CouldAllow = couldAllowA || couldAllowB; // if any subfilter could allow it, this could allow it too
}

1
Content.Shared/_Goobstation/Factory/RoboticArmSystem.cs
View File

@ -29,7 +29,6 @@ public sealed class RoboticArmSystem : EntitySystem
[Dependency] private readonly AutomationFilterSystem _filter = default!;
[Dependency] private readonly CollisionWakeSystem _wake = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly ItemSlotsSystem _slots = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedDeviceLinkSystem _device = default!;

2
Content.Shared/_Goobstation/Factory/SharedInteractorSystem.cs
View File

@ -21,7 +21,7 @@ namespace Content.Shared._Goobstation.Factory;
public abstract class SharedInteractorSystem : EntitySystem
{
[Dependency] private readonly AutomationSystem _automation = default!;
// [Dependency] private readonly AutomationSystem _automation = default!; // Delta V - Never used
[Dependency] private readonly AutomationFilterSystem _filter = default!;
[Dependency] private readonly CollisionWakeSystem _wake = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;

2
Content.Shared/_Goobstation/Factory/Slots/AutomatedHand.cs
View File

@ -21,7 +21,7 @@ public sealed partial class AutomatedHand : AutomationSlot
[DataField(required: true)]
public string HandName = string.Empty;
protected SharedHandsSystem _hands;
private SharedHandsSystem _hands;
private Hand? _hand;

3
Content.Shared/_Goobstation/Factory/StartableMachineSystem.cs
View File

@ -61,7 +61,8 @@ public sealed class StartableMachineSystem : EntitySystem
{
SignalState.Momentary => !ent.Comp.AutoStart,
SignalState.High => true,
SignalState.Low => false
SignalState.Low => false,
_ => throw new ArgumentOutOfRangeException()
};
}
}

8
Content.Shared/_Goobstation/Trigger/Systems/DeleteParentOnTriggerSystem.cs
View File

@ -9,8 +9,8 @@ namespace Content.Shared._Goobstation.Trigger.Systems;
public sealed class DeleteParentOnTriggerSystem : EntitySystem
{
[Dependency] private readonly BodySystem _body = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
// [Dependency] private readonly BodySystem _body = default!; // Delta V - Not used
// [Dependency] private readonly InventorySystem _inventory = default!; // Delta V - Not used
public override void Initialize()
{
@ -26,13 +26,13 @@ public sealed class DeleteParentOnTriggerSystem : EntitySystem
var target = ent.Comp.TargetUser ? args.User : ent.Owner;
if (!TryComp<TransformComponent>(ent.Owner, out var userXform))
if (!TryComp<TransformComponent>(target, out var userXform)) // Delta V - was ent.Owner before. Changed to unused target
return;
if (userXform.ParentUid == userXform.GridUid || userXform.ParentUid == userXform.MapUid)
return;
EntityManager.PredictedQueueDeleteEntity(userXform.ParentUid);
PredictedQueueDel(userXform.ParentUid);
args.Handled = true;
}
}

2
Content.Shared/_Impstation/Revenant/EntitySystems/SharedRevealRevenantOnCollideSystem.cs
View File

@ -12,7 +12,7 @@ public abstract class SharedRevealRevenantOnCollideSystem : EntitySystem
[Dependency] private readonly StatusEffectsSystem _status = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly SharedStunSystem _stun = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
// [Dependency] private readonly IGameTiming _gameTiming = default!; // Delta V - Never used
[ValidatePrototypeId<StatusEffectPrototype>]
private const string CorporealStatusId = "Corporeal";

4
Content.Shared/_Impstation/Thaven/ThavenMoodPrototype.cs
View File

@ -54,8 +54,8 @@ public partial class ThavenMood
}
}
[Prototype("thavenMood")]
[Serializable, NetSerializable]
[Prototype()]
// [Serializable, NetSerializable] // Delta V - Id should be sent directly instead of these
public sealed partial class ThavenMoodPrototype : IPrototype
{
/// <inheritdoc/>

Some files were not shown because too many files have changed in this diff Show More