Allow non-brain nymphs to talk.

Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml

@@ -1,16 +1,13 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Medical.CrewMonitoring"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               xmlns:crewMonitoring="clr-namespace:Content.Client._DV.CrewMonitoring"
                Title="{Loc crew-monitoring-ui-title}"
                Resizable="False"
                SetSize="1210 700"
                MinSize="1210 700">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
-            <ui:CrewMonitoringNavMapControl Name="NavMap" HorizontalExpand="True" VerticalExpand="True" Margin="5 20" Visible="False" />
-            <crewMonitoring:CrewMonitoringShuttleControl Name="ShuttleMap" HorizontalExpand="True" VerticalExpand="True" Margin="5 20" Visible="False" />
-
+            <ui:CrewMonitoringNavMapControl Name="NavMap" HorizontalExpand="True" VerticalExpand="True" Margin="5 20"/>
             <BoxContainer Orientation="Vertical" Margin="0 0 10 0">
                 <controls:StripeBack>
                     <PanelContainer>

Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs

@@ -5,7 +5,6 @@ using Content.Client.Pinpointer.UI;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Medical.SuitSensor;
-using Content.Shared.Station; // DeltaV - crew monitoring radar
 using Content.Shared.StatusIcon;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
@@ -28,7 +27,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private readonly SharedTransformSystem _transformSystem;
     private readonly SpriteSystem _spriteSystem;
-    private readonly SharedStationSystem _station; // DeltaV - crew monitoring radar
 
     private NetEntity? _trackedEntity;
     private bool _tryToScrollToListFocus;
@@ -41,10 +39,8 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
 
         _transformSystem = _entManager.System<SharedTransformSystem>();
         _spriteSystem = _entManager.System<SpriteSystem>();
-        _station = _entManager.System<SharedStationSystem>(); // DeltaV - crew monitoring radar
 
         NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-        ShuttleMap.NavMap = NavMap; // DeltaV - crew monitoring radar
     }
 
     public void Set(string stationName, EntityUid? mapUid)
@@ -54,10 +50,8 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
         if (_entManager.TryGetComponent<TransformComponent>(mapUid, out var xform))
             NavMap.MapUid = xform.GridUid;
 
-        // Begin DeltaV - handle navmap visibility based on current position
-        // else
-        //    NavMap.Visible = false;
-        // End DeltaV - handle navmap visibility based on current position
+        else
+            NavMap.Visible = false;
 
         StationName.AddStyleClass("LabelBig");
         StationName.Text = stationName;
@@ -68,19 +62,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
     {
         base.FrameUpdate(args);
 
-        // Begin DeltaV - handle navmap visibility based on current position
-        if (_station.GetOwningStation(ShuttleMap.Owner) is not null)
-        {
-            NavMap.Visible = true;
-            ShuttleMap.Visible = false;
-        }
-        else
-        {
-            NavMap.Visible = false;
-            ShuttleMap.Visible = true;
-        }
-        // End DeltaV - handle navmap visibility based on current position
-
         if (_tryToScrollToListFocus)
             TryToScrollToFocus();
     }
@@ -88,7 +69,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
     public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, EntityCoordinates? monitorCoords)
     {
         ClearOutDatedData();
-        ShuttleMap.Owner = monitor; // DeltaV - crew monitoring radar
 
         // No server label
         if (sensors.Count == 0)
@@ -324,7 +304,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
             jobContainer.AddChild(jobLabel);
 
             // Add user coordinates to the navmap
-            if (coordinates != null && _blipTexture != null) // DeltaV - don't filter the navmap visibility
+            if (coordinates != null && NavMap.Visible && _blipTexture != null)
             {
                 NavMap.TrackedEntities.TryAdd(sensor.SuitSensorUid,
                     new NavMapBlip

Content.Client/Pinpointer/UI/NavMapControl.cs

@@ -56,8 +56,8 @@ public partial class NavMapControl : MapGridControl
 
     // Constants
     protected float UpdateTime = 1.0f;
-    public float MaxSelectableDistance = 10f; // DeltaV - accessible to CrewMonitoringShuttleControl
-    public float MinDragDistance = 5f; // DeltaV - accessible to CrewMonitoringShuttleControl
+    protected float MaxSelectableDistance = 10f;
+    protected float MinDragDistance = 5f;
     protected static float MinDisplayedRange = 8f;
     protected static float MaxDisplayedRange = 128f;
     protected static float DefaultDisplayedRange = 48f;
@@ -193,13 +193,6 @@ public partial class NavMapControl : MapGridControl
         _recenter.Disabled = false;
     }
 
-    // Begin DeltaV - we need access to that from outside
-    public void TrackEntity(NetEntity? entity)
-    {
-        TrackedEntitySelectedAction?.Invoke(entity);
-    }
-    // End DeltaV - we need access to that from outside
-
     protected override void KeyBindUp(GUIBoundKeyEventArgs args)
     {
         base.KeyBindUp(args);

Content.Client/SubFloor/SubFloorHideSystem.cs

@@ -32,21 +32,6 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
         }
     }
 
-    // Begin DeltaV - node crawling
-    private Type[] _types = new Type[] { };
-
-    [ViewVariables]
-    public Type[] Types
-    {
-        get => _types;
-        set
-        {
-            _types = value;
-            UpdateAll();
-        }
-    }
-    // End DeltaV - node crawling
-
     public override void Initialize()
     {
         base.Initialize();
@@ -80,17 +65,6 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
 
         var revealed = !covered || ShowAll || scannerRevealed;
 
-        // Begin DeltaV - node crawling
-        foreach (var type in _types)
-        {
-            if (!HasComp(uid, type))
-                continue;
-
-            revealed = true;
-            break;
-        }
-        // End DeltaV - node crawling
-
         // set visibility & color of each layer
         foreach (var layer in args.Sprite.AllLayers)
         {

Content.Client/_DV/CrewMonitoring/CrewMonitoringShuttleControl.cs

@@ -1,180 +0,0 @@
-using System.Numerics;
-using Content.Client.Pinpointer.UI;
-using Content.Client.Shuttles.UI;
-using Content.Shared.Shuttles.Components;
-using Content.Shared.Shuttles.Systems;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Shared.Input;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-
-namespace Content.Client._DV.CrewMonitoring;
-
-public sealed class CrewMonitoringShuttleControl : BaseShuttleControl
-{
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    private readonly SharedShuttleSystem _shuttles;
-    private readonly SharedTransformSystem _transform;
-
-    public EntityUid? Owner;
-    public NavMapControl? NavMap;
-
-    private List<Entity<MapGridComponent>> _grids = new();
-
-    public CrewMonitoringShuttleControl() : base(64f, 256f, 256f)
-    {
-        _shuttles = EntManager.System<SharedShuttleSystem>();
-        _transform = EntManager.System<SharedTransformSystem>();
-    }
-
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        base.Draw(handle);
-
-        DrawBacking(handle);
-        DrawCircles(handle);
-
-        if (Owner is not { } owner || NavMap is not { } navMap)
-            return;
-
-        var xformQuery = EntManager.GetEntityQuery<TransformComponent>();
-        var fixturesQuery = EntManager.GetEntityQuery<FixturesComponent>();
-        var bodyQuery = EntManager.GetEntityQuery<PhysicsComponent>();
-        var iffQuery = EntManager.GetEntityQuery<IFFComponent>();
-
-        if (!xformQuery.TryGetComponent(owner, out var xform)
-            || xform.MapID == MapId.Nullspace)
-        {
-            return;
-        }
-
-        var coordinates = new EntityCoordinates(owner, Vector2.Zero);
-
-        var mapPos = _transform.ToMapCoordinates(coordinates);
-        var ourEntRot = Angle.Zero;
-        var ourEntMatrix = Matrix3Helpers.CreateTransform(_transform.GetWorldPosition(xform), ourEntRot);
-        Matrix3x2.Invert(ourEntMatrix, out var worldToShuttle);
-        var shuttleToView = Matrix3x2.CreateScale(new Vector2(MinimapScale, -MinimapScale)) * Matrix3x2.CreateTranslation(MidPointVector);
-        var worldToView = worldToShuttle * shuttleToView;
-
-        var viewBounds = new Box2Rotated(new Box2(-WorldRange, -WorldRange, WorldRange, WorldRange).Translated(mapPos.Position), ourEntRot, mapPos.Position);
-        var viewAABB = viewBounds.CalcBoundingBox();
-
-        _grids.Clear();
-        _mapManager.FindGridsIntersecting(xform.MapID, new Box2(mapPos.Position - MaxRadarRangeVector, mapPos.Position + MaxRadarRangeVector), ref _grids, approx: true, includeMap: false);
-
-        foreach (var grid in _grids)
-        {
-            if (!fixturesQuery.HasComponent(grid))
-                continue;
-
-            var body = bodyQuery.GetComponent(grid);
-            iffQuery.TryComp(grid, out var iff);
-
-            if (!_shuttles.CanDraw(grid, body, iff))
-                continue;
-
-            var curGridToWorld = _transform.GetWorldMatrix(grid);
-            var curGridToView = curGridToWorld * worldToShuttle * shuttleToView;
-
-            var gridAABB = curGridToWorld.TransformBox(grid.Comp.LocalAABB);
-            if (!gridAABB.Intersects(viewAABB))
-                continue;
-
-            var labelColor = _shuttles.GetIFFColor(grid, self: false, iff);
-            DrawGrid(handle, curGridToView, grid, labelColor);
-        }
-
-        var curTime = Timing.RealTime;
-        var blinkFrequency = 1f / 1f;
-        var lit = curTime.TotalSeconds % blinkFrequency > blinkFrequency / 2f;
-        var box = SizeBox;
-
-        foreach (var (coord, value) in navMap.TrackedCoordinates)
-        {
-            if (!lit || !value.Visible)
-                continue;
-
-            var blipPos = _transform.ToMapCoordinates(coord);
-
-            if (mapPos.MapId == MapId.Nullspace)
-                continue;
-
-            handle.DrawCircle(Vector2.Clamp(Vector2.Transform(blipPos.Position, worldToView), box.TopLeft, box.BottomRight), float.Sqrt(MinimapScale) * 2f, value.Color);
-        }
-
-        foreach (var blip in navMap.TrackedEntities.Values)
-        {
-            if (blip.Blinks && !lit)
-                continue;
-
-            var blipPos = _transform.ToMapCoordinates(blip.Coordinates);
-
-            if (mapPos.MapId == MapId.Nullspace)
-                continue;
-
-            handle.DrawCircle(Vector2.Clamp(Vector2.Transform(blipPos.Position, worldToView), box.TopLeft, box.BottomRight), float.Sqrt(MinimapScale) * 2f, blip.Color);
-        }
-    }
-
-    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
-    {
-        base.KeyBindUp(args);
-
-        if (Owner is not { } owner || NavMap is null)
-            return;
-
-        if (!EntManager.TryGetComponent<TransformComponent>(owner, out var xform) || xform.MapID == MapId.Nullspace)
-        {
-            return;
-        }
-
-        var ourEntRot = Angle.Zero;
-        var ourEntMatrix = Matrix3Helpers.CreateTransform(_transform.GetWorldPosition(xform), ourEntRot);
-        Matrix3x2.Invert(ourEntMatrix, out var worldToShuttle);
-        var shuttleToView = Matrix3x2.CreateScale(new Vector2(MinimapScale, -MinimapScale)) * Matrix3x2.CreateTranslation(MidPointVector);
-        var worldToView = worldToShuttle * shuttleToView;
-        Matrix3x2.Invert(worldToView, out var viewToWorld);
-
-        if (args.Function == EngineKeyFunctions.UIClick)
-        {
-            if (NavMap.TrackedEntities.Count == 0)
-                return;
-
-            if ((StartDragPosition - args.PointerLocation.Position).Length() > NavMap.MinDragDistance)
-                return;
-
-            var localPosition = args.PointerLocation.Position - GlobalPixelPosition;
-            var worldPosition = Vector2.Transform(localPosition, viewToWorld);
-
-            var closestEntity = NetEntity.Invalid;
-            var closestDistance = float.PositiveInfinity;
-
-            foreach (var (currentEntity, blip) in NavMap.TrackedEntities)
-            {
-                if (!blip.Selectable)
-                    continue;
-
-                var currentDistance = (_transform.ToMapCoordinates(blip.Coordinates).Position - worldPosition).Length();
-
-                if (closestDistance < currentDistance || currentDistance * MinimapScale > NavMap.MaxSelectableDistance)
-                    continue;
-
-                closestEntity = currentEntity;
-                closestDistance = currentDistance;
-            }
-
-            if (closestDistance > NavMap.MaxSelectableDistance || !closestEntity.IsValid())
-                return;
-
-            NavMap.TrackEntity(closestEntity);
-        }
-        else if (args.Function == EngineKeyFunctions.UIRightClick)
-        {
-            NavMap.TrackEntity(null);
-        }
-    }
-}

Content.Client/_DV/NodeCrawl/NodeCrawlSystem.cs

@@ -1,43 +0,0 @@
-using Content.Client.SubFloor;
-using Content.Shared._DV.NodeCrawl;
-using Robust.Client.Player;
-using Robust.Shared.Player;
-
-namespace Content.Client._DV.NodeCrawl;
-
-public sealed class NodeCrawlSystem : SharedNodeCrawlSystem
-{
-    [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly SubFloorHideSystem _subfloor = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<NodeCrawlerComponent, LocalPlayerAttachedEvent>(OnAttached);
-        SubscribeLocalEvent<NodeCrawlerComponent, LocalPlayerDetachedEvent>(OnDetached);
-        SubscribeLocalEvent<NodeCrawlerComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
-    }
-
-    private void OnAttached(Entity<NodeCrawlerComponent> ent, ref LocalPlayerAttachedEvent args)
-    {
-        if (ent.Comp.Mover is not null)
-            _subfloor.Types = ent.Comp.RevealedComponents;
-    }
-
-    private void OnDetached(Entity<NodeCrawlerComponent> ent, ref LocalPlayerDetachedEvent args)
-    {
-        _subfloor.Types = new Type[] { };
-    }
-
-    private void OnAfterAutoHandleState(Entity<NodeCrawlerComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        if (_player.LocalEntity != ent)
-            return;
-
-        if (ent.Comp.Mover is not null)
-            _subfloor.Types = ent.Comp.RevealedComponents;
-        else
-            _subfloor.Types = new Type[] { };
-    }
-}

Content.Client/_DV/Silicons/NameHelpers.cs

@@ -1,17 +0,0 @@
-using Content.Shared.Labels.Components;
-
-namespace Content.Client._DV.Silicons;
-
-public static class NameHelpers
-{
-    extension(IEntityManager self)
-    {
-        public string PaperName(EntityUid paper)
-        {
-            if (self.TryGetComponent<LabelComponent>(paper, out var label) && label.CurrentLabel is { } labelText)
-                return labelText;
-
-            return self.GetComponent<MetaDataComponent>(paper).EntityName;
-        }
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxBoundUserInterface.cs

@@ -1,144 +0,0 @@
-using System.IO;
-using Content.Shared._DV.Silicons;
-using Content.Shared.Fax;
-using JetBrains.Annotations;
-using Robust.Client.UserInterface;
-using Robust.Shared.Containers;
-
-namespace Content.Client._DV.Silicons;
-
-[UsedImplicitly]
-public sealed class StationAiFaxBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
-{
-    [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
-
-    private StationAiFaxWindow? _window;
-    private List<StationAiFaxPageWindow> _windows = new();
-
-    private bool _dialogIsOpen;
-
-    protected override void Open()
-    {
-        base.Open();
-
-        _window = this.CreateWindow<StationAiFaxWindow>();
-        _window.FileButtonPressed += OnFileButtonPressed;
-        _window.BlankButtonPressed += OnBlankButtonPressed;
-        _window.OpenSendWindowPressed += OnOpenSendWindowPressed;
-        _window.ExaminePressed += OnExaminePressed;
-        _window.ShredPressed += OnShredPressed;
-        _window.DuplicatePressed += OnDuplicatePressed;
-
-        UpdateFaxes(EntMan.System<SharedContainerSystem>().EnsureContainer<Container>(Owner, StationAiFaxComponent.Container, out _));
-    }
-
-    private async void OnFileButtonPressed()
-    {
-        if (_dialogIsOpen)
-            return;
-
-        _dialogIsOpen = true;
-        var filters = new FileDialogFilters(new FileDialogFilters.Group("txt"));
-        await using var file = await _fileDialogManager.OpenFile(filters, FileAccess.Read);
-        _dialogIsOpen = false;
-
-        if (_window == null || _window.Disposed || file == null)
-        {
-            return;
-        }
-
-        using var reader = new StreamReader(file);
-
-        var firstLine = await reader.ReadLineAsync();
-        string? label = null;
-        var content = await reader.ReadToEndAsync();
-
-        if (firstLine is { })
-        {
-            if (firstLine.StartsWith('#'))
-            {
-                label = firstLine[1..].Trim();
-            }
-            else
-            {
-                content = firstLine + "\n" + content;
-            }
-        }
-
-        SendMessage(new FaxFileMessage(
-            label?[..Math.Min(label.Length, FaxFileMessageValidation.MaxLabelSize)],
-            content[..Math.Min(content.Length, FaxFileMessageValidation.MaxContentSize)],
-            false));
-    }
-
-    private void OnBlankButtonPressed()
-    {
-        SendMessage(new FaxFileMessage(null, string.Empty, false));
-    }
-
-    private void OnOpenSendWindowPressed(EntityUid entity)
-    {
-        var window = new StationAiFaxPageWindow(entity, EntMan);
-        _windows.Add(window);
-
-        window.RefreshButtonPressed += OnRefreshButtonPressed;
-        window.PeerSelected += OnPeerSelected;
-        window.SendButtonPressed += OnSendDocument;
-
-        if (UiSystem.TryGetUiState<FaxUiState>(Owner, UiKey, out var state))
-        {
-            window.UpdateState(state);
-        }
-
-        window.OpenCentered();
-    }
-
-    private void OnSendDocument(EntityUid entity)
-    {
-        SendMessage(new StationAiFaxSendMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnExaminePressed(EntityUid entity)
-    {
-        SendPredictedMessage(new StationAiFaxExamineMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnShredPressed(EntityUid entity)
-    {
-        SendPredictedMessage(new StationAiFaxShredMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnDuplicatePressed(EntityUid entity)
-    {
-        SendPredictedMessage(new StationAiFaxDuplicateMessage(EntMan.GetNetEntity(entity)));
-    }
-
-    private void OnRefreshButtonPressed()
-    {
-        SendMessage(new FaxRefreshMessage());
-    }
-
-    private void OnPeerSelected(string address)
-    {
-        SendMessage(new FaxDestinationMessage(address));
-    }
-
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        base.UpdateState(state);
-
-        if (state is not FaxUiState cast)
-            return;
-
-        _window?.UpdateState(cast);
-        foreach (var window in _windows)
-        {
-            window.UpdateState(cast);
-        }
-    }
-
-    public void UpdateFaxes(Container container)
-    {
-        _window?.UpdateFaxes(container);
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxItem.xaml

@@ -1,14 +0,0 @@
-<PanelContainer xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client._DV.UserInterfaces"
-                xmlns:xe="clr-namespace:Content.Client.UserInterface.XamlExtensions"
-                StyleClasses="PanelLight"
-                HorizontalExpand="True">
-    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="8">
-        <Label Name="PaperName" HorizontalExpand="True" />
-
-        <ui:IconButton Name="Shred" StyleClasses="OpenRight" Icon="{xe:Tex '/Textures/Interface/shredder.svg.192dpi.png'}" />
-        <ui:IconButton Name="Duplicate" StyleClasses="OpenBoth" Icon="{xe:Tex '/Textures/Interface/files.svg.192dpi.png'}" />
-        <ui:IconButton Name="Examine" StyleClasses="OpenBoth" Icon="{xe:Tex '/Textures/Interface/eye.svg.192dpi.png'}" />
-        <ui:IconButton Name="Send" StyleClasses="OpenLeft" Icon="{xe:Tex '/Textures/Interface/send.svg.192dpi.png'}" />
-    </BoxContainer>
-</PanelContainer>

Content.Client/_DV/Silicons/StationAiFaxItem.xaml.cs

@@ -1,27 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.Silicons;
-
-[GenerateTypedNameReferences]
-public sealed partial class StationAiFaxItem : PanelContainer
-{
-    public string? Text { get => PaperName.Text; set => PaperName.Text = value; }
-    public bool CanSend { get => !Duplicate.Disabled; set => Duplicate.Disabled = !value; }
-
-    public event Action? ShredPressed;
-    public event Action? DuplicatePressed;
-    public event Action? ExaminePressed;
-    public event Action? SendPressed;
-
-    public StationAiFaxItem()
-    {
-        RobustXamlLoader.Load(this);
-
-        Shred.OnPressed += _ => ShredPressed?.Invoke();
-        Duplicate.OnPressed += _ => DuplicatePressed?.Invoke();
-        Examine.OnPressed += _ => ExaminePressed?.Invoke();
-        Send.OnPressed += _ => SendPressed?.Invoke();
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxPageWindow.xaml

@@ -1,64 +0,0 @@
-<controls:FancyWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    Title="{Loc 'fax-machine-ui-page-window'}"
-    MinSize="380 220">
-
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-        <PanelContainer StyleClasses="PanelDark" HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Orientation="Vertical" Margin="8">
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'fax-machine-ui-sending'}"
-                           VerticalAlignment="Bottom"
-                           HorizontalExpand="True" />
-
-                    <Label Name="SendingLabel"
-                           HorizontalAlignment="Right"
-                           VerticalAlignment="Center"
-                           Align="Right"/>
-                </BoxContainer>
-
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'fax-machine-ui-from'}"
-                           VerticalAlignment="Bottom"
-                           HorizontalExpand="True" />
-
-                    <Label Name="FromLabel"
-                           HorizontalAlignment="Right"
-                           VerticalAlignment="Center"
-                           Align="Right"/>
-                </BoxContainer>
-
-                <BoxContainer
-                    Orientation="Horizontal">
-
-                    <Label Text="{Loc 'fax-machine-ui-to'}"
-                           VerticalAlignment="Bottom"
-                           HorizontalExpand="True"/>
-
-                    <BoxContainer Orientation="Horizontal">
-                        <OptionButton Name="PeerSelector"
-                                      StyleClasses="OpenRight" />
-
-                        <Button StyleClasses="OpenLeft"
-                                Name="RefreshButton"
-                                ToolTip="{Loc 'fax-machine-ui-refresh-button'}">
-                            <TextureButton
-                                MouseFilter="Ignore"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Scale="0.9 0.9"
-                                StyleClasses="RefreshButton" />
-                        </Button>
-                    </BoxContainer>
-                </BoxContainer>
-            </BoxContainer>
-        </PanelContainer>
-        <BoxContainer Orientation="Horizontal" SeparationOverride="8" Margin="8">
-            <Button Name="SendButton"
-                    Text="{Loc 'fax-machine-ui-send-button'}"
-                    HorizontalExpand="True"
-                    Disabled="True" />
-        </BoxContainer>
-    </BoxContainer>
-</controls:FancyWindow>

Content.Client/_DV/Silicons/StationAiFaxPageWindow.xaml.cs

@@ -1,70 +0,0 @@
-using System.Linq;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Fax;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.Silicons;
-
-[GenerateTypedNameReferences]
-public sealed partial class StationAiFaxPageWindow : FancyWindow
-{
-    public event Action? RefreshButtonPressed;
-    public event Action<string>? PeerSelected;
-    public event Action<EntityUid>? SendButtonPressed;
-
-    public StationAiFaxPageWindow(EntityUid uid, IEntityManager entityManager)
-    {
-        RobustXamlLoader.Load(this);
-        SendingLabel.Text = entityManager.PaperName(uid);
-
-        RefreshButton.OnPressed += _ => RefreshButtonPressed?.Invoke();
-        SendButton.OnPressed += _ => SendButtonPressed?.Invoke(uid);
-        PeerSelector.OnItemSelected += args =>
-            PeerSelected?.Invoke((string) args.Button.GetItemMetadata(args.Id)!);
-    }
-
-    public void UpdateState(FaxUiState state)
-    {
-        SendButton.Disabled = !state.CanSendCooldown;
-        FromLabel.Text = state.DeviceName;
-
-        if (state.AvailablePeers.Count == 0)
-        {
-            PeerSelector.AddItem(Loc.GetString("fax-machine-ui-no-peers"));
-            PeerSelector.Disabled = true;
-        }
-
-        if (PeerSelector.Disabled && state.AvailablePeers.Count != 0)
-        {
-            PeerSelector.Clear();
-            PeerSelector.Disabled = false;
-        }
-
-        // always must be selected destination
-        if (string.IsNullOrEmpty(state.DestinationAddress) && state.AvailablePeers.Count != 0)
-        {
-            PeerSelected?.Invoke(state.AvailablePeers.First().Key);
-            return;
-        }
-
-        if (state.AvailablePeers.Count != 0)
-        {
-            PeerSelector.Clear();
-
-            foreach (var (address, name) in state.AvailablePeers)
-            {
-                var id = AddPeerSelect(name, address);
-                if (address == state.DestinationAddress)
-                    PeerSelector.Select(id);
-            }
-        }
-    }
-
-    private int AddPeerSelect(string name, string address)
-    {
-        PeerSelector.AddItem(name);
-        PeerSelector.SetItemMetadata(PeerSelector.ItemCount - 1, address);
-        return PeerSelector.ItemCount - 1;
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxSystem.cs

@@ -1,37 +0,0 @@
-using Content.Shared._DV.Silicons;
-using Content.Shared.Fax;
-using Robust.Client.GameObjects;
-using Robust.Shared.Containers;
-
-namespace Content.Client._DV.Silicons;
-
-public sealed class StationAiFaxSystem : SharedStationAiFaxSystem
-{
-    [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StationAiFaxComponent, EntRemovedFromContainerMessage>(OnRemoved);
-    }
-
-    protected override void OnInserted(Entity<StationAiFaxComponent> ent, ref EntInsertedIntoContainerMessage args)
-    {
-        base.OnInserted(ent, ref args);
-
-        if (!_userInterface.TryGetOpenUi<StationAiFaxBoundUserInterface>(ent.Owner, FaxUiKey.Key, out var bui))
-            return;
-
-        bui.UpdateFaxes(_container.EnsureContainer<Container>(ent, StationAiFaxComponent.Container, out _));
-    }
-
-    private void OnRemoved(Entity<StationAiFaxComponent> ent, ref EntRemovedFromContainerMessage args)
-    {
-        if (!_userInterface.TryGetOpenUi<StationAiFaxBoundUserInterface>(ent.Owner, FaxUiKey.Key, out var bui))
-            return;
-
-        bui.UpdateFaxes(_container.EnsureContainer<Container>(ent, StationAiFaxComponent.Container, out _));
-    }
-}

Content.Client/_DV/Silicons/StationAiFaxWindow.xaml

@@ -1,29 +0,0 @@
-<controls:FancyWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    Title="{Loc 'fax-machine-ui-window'}"
-    MinSize="500 600">
-
-    <BoxContainer Orientation="Vertical" Name="NoFaxes" HorizontalAlignment="Center" VerticalAlignment="Center" SeparationOverride="8">
-        <Label StyleClasses="PlaceholderText" Text="{Loc 'fax-machine-ui-no-faxes'}" Align="Center" />
-
-        <BoxContainer Orientation="Vertical" HorizontalAlignment="Center">
-            <Button Name="NoFaxesBlank" Text="{Loc 'fax-machine-ui-add-blank-file'}" HorizontalExpand="True" StyleClasses="OpenLeft" />
-            <Button Name="NoFaxesUpload" Text="{Loc 'fax-machine-ui-upload-file'}" HorizontalExpand="True" StyleClasses="OpenRight" />
-        </BoxContainer>
-
-    </BoxContainer>
-
-    <BoxContainer Orientation="Vertical" Name="YesFaxes" HorizontalExpand="True" VerticalExpand="True">
-        <PanelContainer StyleClasses="PanelDark" VerticalExpand="True" HorizontalExpand="True">
-            <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
-                <BoxContainer Name="FaxList" Margin="8" VerticalAlignment="Top" HorizontalExpand="True" SeparationOverride="8" Orientation="Vertical" />
-            </ScrollContainer>
-        </PanelContainer>
-
-        <BoxContainer Orientation="Horizontal" SeparationOverride="8" Margin="8">
-            <Button Name="YesFaxesBlank" Text="{Loc 'fax-machine-ui-add-blank-file'}" HorizontalAlignment="Center" />
-            <Button Name="YesFaxesUpload" Text="{Loc 'fax-machine-ui-upload-file'}" HorizontalAlignment="Center" />
-        </BoxContainer>
-    </BoxContainer>
-</controls:FancyWindow>

Content.Client/_DV/Silicons/StationAiFaxWindow.xaml.cs

@@ -1,92 +0,0 @@
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Fax;
-using Content.Shared.Labels.Components;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.Silicons;
-
-[GenerateTypedNameReferences]
-public sealed partial class StationAiFaxWindow : FancyWindow
-{
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
-    public event Action? BlankButtonPressed;
-    public event Action? FileButtonPressed;
-    public event Action<EntityUid>? OpenSendWindowPressed;
-    public event Action<EntityUid>? ExaminePressed;
-    public event Action<EntityUid>? ShredPressed;
-    public event Action<EntityUid>? DuplicatePressed;
-
-    public bool CanSend
-    {
-        get;
-        set
-        {
-            if (field == value)
-                return;
-
-            field = value;
-            foreach (var item in FaxList.Children)
-            {
-                var castItem = (StationAiFaxItem)item;
-                castItem.CanSend = value;
-            }
-
-            NoFaxesBlank.Disabled = !value;
-            NoFaxesUpload.Disabled = !value;
-            YesFaxesBlank.Disabled = !value;
-            YesFaxesUpload.Disabled = !value;
-        }
-    }
-
-    public StationAiFaxWindow()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        NoFaxesBlank.OnPressed += _ => BlankButtonPressed?.Invoke();
-        NoFaxesUpload.OnPressed +=  _ => FileButtonPressed?.Invoke();
-
-        YesFaxesBlank.OnPressed += _ => BlankButtonPressed?.Invoke();
-        YesFaxesUpload.OnPressed +=  _ => FileButtonPressed?.Invoke();
-    }
-
-    public void UpdateFaxes(Robust.Shared.Containers.Container container)
-    {
-        FaxList.RemoveAllChildren();
-        foreach (var item in container.ContainedEntities)
-        {
-            var page = new StationAiFaxItem
-            {
-                Text = _entityManager.TryGetComponent<LabelComponent>(item, out var label) &&
-                       label.CurrentLabel is { } labelText
-                    ? labelText
-                    : _entityManager.GetComponent<MetaDataComponent>(item).EntityName,
-                CanSend = CanSend,
-            };
-            FaxList.AddChild(page);
-
-            page.ExaminePressed += () => ExaminePressed?.Invoke(item);
-            page.ShredPressed += () => ShredPressed?.Invoke(item);
-            page.DuplicatePressed += () => DuplicatePressed?.Invoke(item);
-            page.SendPressed += () => OpenSendWindowPressed?.Invoke(item);
-        }
-
-        if (container.ContainedEntities.Count == 0)
-        {
-            YesFaxes.Visible = false;
-            NoFaxes.Visible = true;
-        }
-        else
-        {
-            YesFaxes.Visible = true;
-            NoFaxes.Visible = false;
-        }
-    }
-
-    public void UpdateState(FaxUiState state)
-    {
-        CanSend = state.CanSendCooldown;
-    }
-}

Content.Client/_DV/UserInterfaces/IconButton.xaml

@@ -1,7 +0,0 @@
-<Button xmlns="https://spacestation14.io">
-    <TextureRect Name="TextureRect"
-                 TextureScale="0.5 0.5"
-                 HorizontalAlignment="Center"
-                 VerticalAlignment="Center"
-                 Stretch="KeepCentered"/>
-</Button>

Content.Client/_DV/UserInterfaces/IconButton.xaml.cs

@@ -1,17 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DV.UserInterfaces;
-
-[GenerateTypedNameReferences]
-public sealed partial class IconButton : Button
-{
-    public Texture? Icon { get => TextureRect.Texture; set => TextureRect.Texture = value; }
-
-    public IconButton()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}

Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs

@@ -24,7 +24,7 @@ public sealed class WizdenContentFreeze
         var protoMan = server.ProtoMan;
 
         var recipesCount = protoMan.Count<FoodRecipePrototype>();
-        var recipesLimit = 266; // DeltaV - was 218
+        var recipesLimit = 269; // DeltaV - was 218
 
         if (recipesCount > recipesLimit)
         {

Content.Server/Body/Systems/MetabolizerSystem.cs

@@ -184,11 +184,6 @@ public sealed class MetabolizerSystem : SharedMetabolizerSystem
 
                 var rate = entry.MetabolismRate * group.MetabolismRateModifier;
 
-                // BEGIN DeltaV - fix FixedPoint2 truncation flooring low rateModifiers to zero
-                if (rate == FixedPoint2.Zero && entry.MetabolismRate > FixedPoint2.Zero && group.MetabolismRateModifier > 0f)
-                    rate = FixedPoint2.Epsilon;
-                // END DeltaV
-
                 // Remove $rate, as long as there's enough reagent there to actually remove that much
                 mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
 

Content.Server/Fax/FaxSystem.cs

@@ -5,7 +5,6 @@ using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Tools;
-using Content.Shared._DV.Fax; // DeltaV - fax
 using Content.Shared._DV.Pager; // DeltaV - pagers
 using Content.Shared.Administration.Logs;
 using Content.Shared.Containers.ItemSlots;
@@ -91,10 +90,10 @@ public sealed class FaxSystem : EntitySystem
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<FaxMachineComponent>();
-        while (query.MoveNext(out var uid, out var fax)) // DeltaV - faxes aren't necessarily powered
+        var query = EntityQueryEnumerator<FaxMachineComponent, ApcPowerReceiverComponent>();
+        while (query.MoveNext(out var uid, out var fax, out var receiver))
         {
-            if (TryComp<ApcPowerReceiverComponent>(uid, out var receiver) && !receiver.Powered) // DeltaV - faxes aren't necessarily powered
+            if (!receiver.Powered)
                 continue;
 
             ProcessPrintingAnimation(uid, frameTime, fax);
@@ -393,7 +392,7 @@ public sealed class FaxSystem : EntitySystem
         var canCopy = isPaperInserted &&
                       component.SendTimeoutRemaining <= 0 &&
                       component.InsertingTimeRemaining <= 0;
-        var state = new FaxUiState(component.FaxName, component.KnownFaxes, canSend, canCopy, isPaperInserted, component.DestinationFaxAddress, component.SendTimeoutRemaining <= 0); // DeltaV - AI fax
+        var state = new FaxUiState(component.FaxName, component.KnownFaxes, canSend, canCopy, isPaperInserted, component.DestinationFaxAddress);
         _userInterface.SetUiState(uid, FaxUiKey.Key, state);
     }
 
@@ -462,7 +461,7 @@ public sealed class FaxSystem : EntitySystem
     ///     Copies the paper in the fax. A timeout is set after copying,
     ///     which is shared by the send button.
     /// </summary>
-    public void Copy(EntityUid uid, FaxMachineComponent? component, BoundUserInterfaceMessage args, EntityUid? item = null) // DeltaV - station AI fax
+    public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage args)
     {
         if (!Resolve(uid, ref component))
             return;
@@ -470,7 +469,7 @@ public sealed class FaxSystem : EntitySystem
         if (component.SendTimeoutRemaining > 0)
             return;
 
-        var sendEntity = item ?? component.PaperSlot.Item; // DeltaV - station AI fax
+        var sendEntity = component.PaperSlot.Item;
         if (sendEntity == null)
             return;
 
@@ -512,7 +511,7 @@ public sealed class FaxSystem : EntitySystem
     ///     Sends message to addressee if paper is set and a known fax is selected
     ///     A timeout is set after sending, which is shared by the copy button.
     /// </summary>
-    public void Send(EntityUid uid, FaxMachineComponent? component, BoundUserInterfaceMessage args, EntityUid? item = null) // DeltaV - station AI fax
+    public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage args)
     {
         if (!Resolve(uid, ref component))
             return;
@@ -520,7 +519,7 @@ public sealed class FaxSystem : EntitySystem
         if (component.SendTimeoutRemaining > 0)
             return;
 
-        var sendEntity = item ?? component.PaperSlot.Item; // DeltaV - station AI fax
+        var sendEntity = component.PaperSlot.Item;
         if (sendEntity == null)
             return;
 
@@ -636,10 +635,6 @@ public sealed class FaxSystem : EntitySystem
         }
 
         _adminLogger.Add(LogType.Action, LogImpact.Low, $"\"{component.FaxName}\" {ToPrettyString(uid):tool} printed {ToPrettyString(printed):subject}: {printout.Content}");
-        // Begin DeltaV - notify on fax printing
-        var evt = new FaxPrintedEvent(printed);
-        RaiseLocalEvent(uid, ref evt);
-        // End DeltaV - notify on fax printing
     }
 
     private void NotifyAdmins(string faxName)

Content.Server/Silicons/Laws/IonStormSystem.cs

@@ -1,5 +1,4 @@
 using Content.Server.StationEvents.Components;
-using Content.Shared._DV.IonLaws; // DeltaV - ion laws
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Dataset;
@@ -21,7 +20,6 @@ public sealed class IonStormSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SiliconLawSystem _siliconLaw = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly IonLawSystem _ionLaw = default!; // DeltaV - ion laws
 
     // funny
     private static readonly ProtoId<DatasetPrototype> Threats = "IonStormThreats";
@@ -95,7 +93,7 @@ public sealed class IonStormSystem : EntitySystem
         }
 
         // generate a new law...
-        var newLaw = _ionLaw.GenerateLaw(_robustRandom); // GenerateLaw(); DeltaV - inject our own
+        var newLaw = GenerateLaw();
 
         // see if the law we add will replace a random existing law or be a new glitched order one
         if (laws.Laws.Count > 0 && _robustRandom.Prob(target.ReplaceChance))

Content.Server/StationEvents/Components/IonStormRuleComponent.cs

@@ -6,41 +6,4 @@ namespace Content.Server.StationEvents.Components;
 [RegisterComponent]
 public sealed partial class IonStormRuleComponent : Component
 {
-    // DV start - Synthetic tweaks
-    /// <summary>
-    /// The chance that a synth gets electrocuted by the ion storm.
-    /// </summary>
-    [DataField]
-    public float SynthElectrocutionChance = 0.6f;
-
-    /// <summary>
-    /// The minimum delay before a synth affected by the ion storm gets electrocuted. (in seconds)
-    /// </summary>
-    [DataField]
-    public int SynthElectrocutionDelayMin = 3;
-
-    /// <summary>
-    /// The maximum delay before a synth affected by the ion storm gets electrocuted. (in seconds)
-    /// </summary>
-    [DataField]
-    public int SynthElectrocutionDelayMax = 10;
-
-    /// <summary>
-    /// The minimum damage dealt by the synth electrocution. (shock damage)
-    /// </summary>
-    [DataField]
-    public int SynthElectrocutionDamageMin = 5;
-
-    /// <summary>
-    /// The maximum damage dealt by the synth electrocution. (shock damage)
-    /// </summary>8
-    [DataField]
-    public int SynthElectrocutionDamageMax = 10;
-
-    /// <summary>
-    /// How long the synth is stunned for by the electrocution. (in seconds)
-    /// </summary>
-    [DataField]
-    public int SynthElectrocutionStunDuration = 3;
-    // DV end - synthetic tweaks
 }

Content.Server/StationEvents/Events/IonStormRule.cs

@@ -6,12 +6,9 @@ using Content.Shared.Silicons.Laws.Components;
 using Content.Shared.Station.Components;
 // CD - start synth trait
 using Content.Server.Chat.Managers;
-using Content.Server.Electrocution; // DV - added for synth trait
 using Content.Shared.Chat;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
-using Content.Shared._ES.Sparks; // Delta-V change - added for synth trait (where they get affected by ion storms)
-using Timer = Robust.Shared.Timing.Timer; // DV - used for synth trait delayed damage
 // CD - end synth trait
 
 namespace Content.Server.StationEvents.Events;
@@ -20,8 +17,6 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
 {
     [Dependency] private readonly IonStormSystem _ionStorm = default!;
     [Dependency] private readonly IChatManager _chatManager = default!; // CD - Used for synth trait
-    [Dependency] private readonly ElectrocutionSystem _electrocution = default!; // DV - used for synth trait
-    [Dependency] private readonly ESSparksSystem _esSparks = default!; // DV - used for synth trait
 
     protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
@@ -31,32 +26,18 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
             return;
 
         // CD - Go through everyone with the SynthComponent and inform them a storm is happening.
-        // DV - buuuuuut only if IonStormAffected is present so that not all synthetics are affected by this
-        //      but they are still notified about incoming ion storms regardless.
         var synthQuery = EntityQueryEnumerator<SynthComponent>();
         while (synthQuery.MoveNext(out var ent, out var synthComp))
         {
+            if (RobustRandom.Prob(synthComp.AlertChance))
+                continue;
+
             if (!TryComp<ActorComponent>(ent, out var actor))
                 continue;
 
-            if (RobustRandom.Prob(synthComp.AlertChance))
-            {
-                var msg = Loc.GetString("station-event-ion-storm-synth");
-                var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
-                _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Yellow);
-            }
-
-            // DV start - super duper fucked up thing for synths
-            if (synthComp.IonStormAffected && RobustRandom.Prob(comp.SynthElectrocutionChance))
-            {
-                var delay = RobustRandom.Next(TimeSpan.FromSeconds(comp.SynthElectrocutionDelayMin), TimeSpan.FromSeconds(comp.SynthElectrocutionDelayMax)); // they'll never know when it'll hit them
-                Timer.Spawn(delay, () =>
-                {
-                    _electrocution.TryDoElectrocution(ent, null, RobustRandom.Next(comp.SynthElectrocutionDamageMin, comp.SynthElectrocutionDamageMax), TimeSpan.FromSeconds(comp.SynthElectrocutionStunDuration), true, ignoreInsulation: true);
-                    _esSparks.DoSparks(ent);
-                });
-            }
-            // DV end
+            var msg = Loc.GetString("station-event-ion-storm-synth");
+            var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
+            _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Yellow);
         }
         // CD - End of synth trait
 

Content.Server/_CD/Traits/SynthComponent.cs

@@ -7,16 +7,7 @@ namespace Content.Server._CD.Traits;
 public sealed partial class SynthComponent : Component
 {
     /// <summary>
-    /// Whether this synthetic is affected by ion storms (electrocution/sparks and
-    /// alerts when one occurs). False by default. set true by the
-    /// "Susceptible to Ion Storms" meta trait.
-    /// </summary>
-    [DataField]
-    public bool IonStormAffected;
-
-    /// <summary>
-    /// The chance that the synth is alerted of an ion storm. Only relevant if
-    /// <see cref="IonStormAffected"/> is true.
+    /// The chance that the synth is alerted of an ion storm
     /// </summary>
     [DataField]
     public float AlertChance = 0.3f;

Content.Server/_CD/Traits/SynthSystem.cs

@@ -1,12 +1,8 @@
 using Content.Server.Body.Systems;
-using Content.Server.Chat.Systems;
+using Content.Server.Database;
 using Content.Shared.Body.Components;
-using Content.Shared.Chat;
-using Content.Shared.Chat.Prototypes;
 using Content.Shared.Chat.TypingIndicator;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Speech.Components;
-using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server._CD.Traits;
@@ -16,22 +12,15 @@ public sealed class SynthSystem : EntitySystem
     // Begin DeltaV - make strings static readonly
     private static readonly ProtoId<TypingIndicatorPrototype> RobotTypingIndicator = "robot";
     private static readonly ProtoId<ReagentPrototype> SynthBloodReagent = "SynthBlood";
-    private static readonly ProtoId<TagPrototype> SyntheticEmotesTag = "SyntheticEmotes";
-    private static readonly ProtoId<EmoteSoundsPrototype> SyntheticEmoteSounds = "SyntheticEmoteSounds";
     // End DeltaV
 
     [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    private EmoteSoundsPrototype? _syntheticEmoteSounds; // delta-v - proper synthe emote implementation
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<SynthComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<SynthComponent, EmoteEvent>(OnEmote); // delta-v - proper synthe emote implementation
     }
 
     private void OnStartup(EntityUid uid, SynthComponent component, ComponentStartup args)
@@ -49,19 +38,5 @@ public sealed class SynthSystem : EntitySystem
             _bloodstream.ChangeBloodReagents((uid, bloodstream), new([new(SynthBloodReagent, bloodstream.BloodReferenceSolution.Volume)]));
         }
         // End DeltaV
-
-        _tag.AddTag(uid, SyntheticEmotesTag); // delta-v - proper synthe emote implementation
     }
-
-    // Start DeltaV - proper synthe emote implementation
-    private void OnEmote(EntityUid uid, SynthComponent component, ref EmoteEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        _syntheticEmoteSounds ??= _proto.Index(SyntheticEmoteSounds);
-
-        args.Handled = _chat.TryPlayEmoteSound(uid, _syntheticEmoteSounds, args.Emote);
-    }
-    // End DeltaV
-}
+}

Content.Server/_DV/IonLaws/IonLawCommand.cs

@@ -1,26 +0,0 @@
-using Content.Server.Administration;
-using Content.Shared._DV.IonLaws;
-using Content.Shared.Administration;
-using Robust.Shared.Random;
-using Robust.Shared.Toolshed;
-
-namespace Content.Server._DV.IonLaws;
-
-[ToolshedCommand, AdminCommand(AdminFlags.Fun)]
-public sealed class IonLawCommand : ToolshedCommand
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    private IonLawSystem? _ionLaw;
-
-    [CommandImplementation("generate")]
-    public IEnumerable<string> GenerateNames(int count)
-    {
-        _ionLaw ??= GetSys<IonLawSystem>();
-
-        for (var i = 0; i < count; i++)
-        {
-            yield return _ionLaw.GenerateLaw(_random);
-        }
-    }
-}

Content.Server/_DV/NodeCrawl/NodeCrawlSystem.cs

@@ -1,101 +0,0 @@
-using System.Numerics;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Systems;
-using Content.Server.NodeContainer.EntitySystems;
-using Content.Server.NodeContainer.Nodes;
-using Content.Shared._DV.NodeCrawl;
-using Content.Shared.Atmos;
-using Content.Shared.NodeContainer;
-
-namespace Content.Server._DV.NodeCrawl;
-
-public sealed class NodeCrawlSystem : SharedNodeCrawlSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CrawlableNodeComponent, NodeGroupsRebuilt>(OnNodeGroupsRebuilt);
-
-        SubscribeLocalEvent<NodeCrawlerComponent, InhaleLocationEvent>(OnInhaleLocation);
-        SubscribeLocalEvent<NodeCrawlerComponent, ExhaleLocationEvent>(OnExhaleLocation);
-        SubscribeLocalEvent<NodeCrawlerComponent, AtmosExposedGetAirEvent>(OnGetAir);
-    }
-
-    private Entity<NodeContainerComponent>? GetNodeContainer(Entity<NodeCrawlerComponent> crawler)
-    {
-        if (!TryComp<NodeCrawlerMovementComponent>(crawler.Comp.Mover, out var mover) || mover.Node is not { } node)
-            return null;
-
-        if (!TryComp<NodeContainerComponent>(node, out var nodeContainer))
-            return null;
-
-        return (node, nodeContainer);
-    }
-
-    private GasMixture? GetAir(Entity<NodeCrawlerComponent> crawler)
-    {
-        if (GetNodeContainer(crawler) is not { } nodeContainer)
-            return null;
-
-        foreach (var containedNode in nodeContainer.Comp.Nodes.Values)
-        {
-            if (containedNode is not PipeNode pipe)
-                continue;
-
-            return pipe.Air;
-        }
-
-        return null;
-    }
-
-    private void OnInhaleLocation(Entity<NodeCrawlerComponent> ent, ref InhaleLocationEvent args)
-    {
-        if (GetAir(ent) is not { } air)
-            return;
-
-        args.Gas = air;
-    }
-
-    private void OnExhaleLocation(Entity<NodeCrawlerComponent> ent, ref ExhaleLocationEvent args)
-    {
-        if (GetAir(ent) is not { } air)
-            return;
-
-        args.Gas = air;
-    }
-
-    private void OnGetAir(Entity<NodeCrawlerComponent> ent, ref AtmosExposedGetAirEvent args)
-    {
-        if (args.Handled || GetAir(ent) is not { } air)
-            return;
-
-        args.Gas = air;
-        args.Handled = true;
-    }
-
-    private void OnNodeGroupsRebuilt(Entity<CrawlableNodeComponent> ent, ref NodeGroupsRebuilt args)
-    {
-        if (!TryComp<NodeContainerComponent>(ent, out var nodeContainer))
-            return;
-
-        ent.Comp.DeadEnd = false;
-        var set = new HashSet<EntityUid>();
-        foreach (var node in nodeContainer.Nodes.Values)
-        {
-            foreach (var reachable in node.ReachableNodes)
-            {
-                set.Add(reachable.Owner);
-            }
-
-            if (node is PipeNode pipeNode &&
-                node.ReachableNodes.Count != BitOperations.PopCount((uint)pipeNode.CurrentPipeDirection))
-            {
-                ent.Comp.DeadEnd = true;
-            }
-        }
-
-        ent.Comp.ReachableNodes = set;
-        Dirty(ent);
-    }
-}

Content.Server/_DV/Silicons/StationAiFaxSystem.cs

@@ -1,39 +0,0 @@
-using Content.Server.Fax;
-using Content.Shared._DV.Silicons;
-using Content.Shared.Fax;
-using Content.Shared.Fax.Components;
-
-namespace Content.Server._DV.Silicons;
-
-public sealed class StationAiFaxSystem : SharedStationAiFaxSystem
-{
-    [Dependency] private readonly FaxSystem _fax = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        Subs.BuiEvents<StationAiFaxComponent>(FaxUiKey.Key,
-            subs =>
-            {
-                subs.Event<StationAiFaxSendMessage>(OnSend);
-                subs.Event<StationAiFaxDuplicateMessage>(OnDuplicate);
-            });
-    }
-
-    private void OnSend(Entity<StationAiFaxComponent> ent, ref StationAiFaxSendMessage args)
-    {
-        if (GetDocument(ent, args.Document) is not { } document)
-            return;
-
-        _fax.Send(ent, Comp<FaxMachineComponent>(ent), args, document);
-    }
-
-    private void OnDuplicate(Entity<StationAiFaxComponent> ent, ref StationAiFaxDuplicateMessage args)
-    {
-        if (GetDocument(ent, args.Document) is not { } document)
-            return;
-
-        _fax.Copy(ent, Comp<FaxMachineComponent>(ent), args, document);
-    }
-}

Content.Shared/Fax/Components/FaxMachineComponent.cs

@@ -63,7 +63,7 @@ public sealed partial class FaxMachineComponent : Component
     /// Sound to play when fax printing new message
     /// </summary>
     [DataField]
-    public SoundSpecifier? PrintSound = new SoundPathSpecifier("/Audio/Machines/printer.ogg"); // DeltaV - nullable
+    public SoundSpecifier PrintSound = new SoundPathSpecifier("/Audio/Machines/printer.ogg");
 
     /// <summary>
     /// Sound to play when fax successfully send message

Content.Shared/Fax/SharedFax.cs

@@ -17,15 +17,13 @@ public sealed class FaxUiState : BoundUserInterfaceState
     public bool IsPaperInserted { get; }
     public bool CanSend { get; }
     public bool CanCopy { get; }
-    public bool CanSendCooldown; // DeltaV - AI fax
 
     public FaxUiState(string deviceName,
         Dictionary<string, string> peers,
         bool canSend,
         bool canCopy,
         bool isPaperInserted,
-        string? destAddress,
-        bool canSendCooldown) // DeltaV - AI fax
+        string? destAddress)
     {
         DeviceName = deviceName;
         AvailablePeers = peers;
@@ -33,7 +31,6 @@ public sealed class FaxUiState : BoundUserInterfaceState
         CanSend = canSend;
         CanCopy = canCopy;
         DestinationAddress = destAddress;
-        CanSendCooldown = canSendCooldown; // DeltaV - AI fax
     }
 }
 

Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs

@@ -68,11 +68,6 @@ public abstract class SharedSuitSensorSystem : EntitySystem
     /// <returns>True if the sensor is assigned to a station or assigning it was successful. False otherwise.</returns>
     public bool CheckSensorAssignedStation(Entity<SuitSensorComponent> sensor)
     {
-        // Begin DeltaV - fallback
-        if (sensor.Comp.StationId.HasValue && _stationSystem.GetOwningStation(sensor.Owner) is null)
-            return true;
-        // End DeltaV - fallback
-
         if (!sensor.Comp.StationId.HasValue && Transform(sensor.Owner).GridUid == null)
             return false;
 
@@ -353,7 +348,7 @@ public abstract class SharedSuitSensorSystem : EntitySystem
         var transform = ent.Comp2;
 
         // check if sensor is enabled and worn by user
-        if (sensor.Mode == SuitSensorMode.SensorOff || sensor.User == null || !HasComp<MobStateComponent>(sensor.User)) // DeltaV - don't block on grids here
+        if (sensor.Mode == SuitSensorMode.SensorOff || sensor.User == null || !HasComp<MobStateComponent>(sensor.User) || transform.GridUid == null)
             return null;
 
         // try to get mobs id from ID slot

Content.Shared/Movement/Systems/SharedMoverController.cs

@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using Content.Shared._DV.Movement; // DeltaV
-using Content.Shared._DV.NodeCrawl; // DeltaV - Node Crawling
 using Content.Shared.ActionBlocker;
 using Content.Shared.CCVar;
 using Content.Shared.Friction;
@@ -51,7 +50,6 @@ public abstract partial class SharedMoverController : VirtualController
     [Dependency] private   readonly SharedTransformSystem _transform = default!;
     [Dependency] private   readonly TagSystem _tags = default!;
     [Dependency] private   readonly TileMovementSystem _tileMovement = default!; // DeltaV
-    [Dependency] private   readonly NodeCrawlerMovementSystem _nodeCrawlerMovement = default!; // DeltaV - node crawling
 
     protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery;
     protected EntityQuery<FootstepModifierComponent> FootstepModifierQuery;
@@ -266,11 +264,6 @@ public abstract partial class SharedMoverController : VirtualController
             return;
         // End DeltaV Additions
 
-        // Begin DeltaV Additions - node crawling
-        if (_nodeCrawlerMovement.TryTick((uid, mover, physicsComponent, xform)))
-            return;
-        // End DeltaV Additions
-
         var touching = false;
         // Whether we use tilefriction or not
         if (weightless || inAirHelpless)

Content.Shared/Paper/PaperSystem.cs

@@ -276,7 +276,7 @@ public sealed class PaperSystem : EntitySystem
         _appearance.SetData(entity, PaperVisuals.Status, status, appearance);
     }
 
-    public void UpdateUserInterface(Entity<PaperComponent> entity) // DeltaV - station AI
+    private void UpdateUserInterface(Entity<PaperComponent> entity)
     {
         _uiSystem.SetUiState(entity.Owner, PaperUiKey.Key, new PaperBoundUserInterfaceState(entity.Comp.Content, entity.Comp.StampedBy, entity.Comp.Mode));
     }

Content.Shared/Physics/CollisionGroup.cs

@@ -65,8 +65,8 @@ public enum CollisionGroup
     TabletopMachineLayer = Opaque | BulletImpassable,
 
     // Airlocks, windoors, firelocks
-    GlassAirlockLayer = HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable, // DeltaV - we have ventcrawling
-    AirlockLayer = Opaque | LowImpassable | GlassAirlockLayer, // DeltaV - we have ventcrawling
+    GlassAirlockLayer = HighImpassable | MidImpassable | BulletImpassable | InteractImpassable,
+    AirlockLayer = Opaque | GlassAirlockLayer,
 
     // Airlock assembly
     HumanoidBlockLayer = HighImpassable | MidImpassable,

Content.Shared/RatKing/RatKingComponent.cs

@@ -101,12 +101,6 @@ public sealed partial class RatKingComponent : Component
         { RatKingOrderType.CheeseEm, "RatKingCommandCheeseEm" },
         { RatKingOrderType.Loose, "RatKingCommandLoose" }
     };
-
-    /// <summary>
-    /// DeltaV - Servants within this radius will join the Rat King when vent crawling
-    /// </summary>
-    [DataField]
-    public float VentCrawlRecruitRadius = 4f;
 }
 
 [Serializable, NetSerializable]

Content.Shared/_DV/Fax/FaxPrintedEvent.cs

@@ -1,4 +0,0 @@
-namespace Content.Shared._DV.Fax;
-
-[ByRefEvent]
-public readonly record struct FaxPrintedEvent(EntityUid Fax);

Content.Shared/_DV/IonLaws/IonLawSystem.cs

@@ -1,74 +0,0 @@
-using System.Linq;
-using System.Globalization;
-using Content.Shared.Dataset;
-using Content.Shared.Humanoid;
-using Content.Shared.Random.Helpers;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared._DV.IonLaws;
-
-public sealed class IonLawSystem : EntitySystem
-{
-    [Dependency] private readonly ILocalizationManager _localization = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly ISharedPlayerManager _player = default!;
-
-    private const string Culture = "en-US";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        var culture = new CultureInfo(Culture);
-        _localization.AddFunction(culture, "PICK", FormatPick);
-        _localization.AddFunction(culture, "PICK-ENTITY", FormatPickEntity);
-    }
-
-    private ILocValue FormatPick(LocArgs args)
-    {
-        var rand = ((LocValueRandom)args.Args[0]).Value;
-        return rand.Pick(args.Args.Skip(1).ToList());
-    }
-
-    private ILocValue FormatPickEntity(LocArgs args)
-    {
-        var rand = ((LocValueRandom)args.Args[0]).Value;
-        var players = ((LocValueEntityList)args.Args[1]).Value;
-        if (players.Count == 0)
-        {
-            return new LocValueString(Loc.GetString("dv-ion-law-target-fallback", ("random", new LocValueRandom(rand))));
-        }
-        return new LocValueEntity(rand.PickAndTake(players));
-    }
-
-    private static readonly ProtoId<LocalizedDatasetPrototype> IonLawTemplates = "IonLawTemplates";
-
-    public string GenerateLaw(IRobustRandom random)
-    {
-        var template = random.PickId(_proto.Index(IonLawTemplates));
-        var players = _player.Sessions
-            .Where(x => HasComp<HumanoidAppearanceComponent>(x.AttachedEntity))
-            .Select(x => x.AttachedEntity!.Value)
-            .ToList();
-
-        return Loc.GetString(template, ("random", new LocValueRandom(random)), ("players", new LocValueEntityList(players)));
-    }
-}
-
-public sealed record LocValueRandom(IRobustRandom Value) : LocValue<IRobustRandom>(Value)
-{
-    public override string Format(LocContext ctx)
-    {
-        throw new InvalidOperationException("Attempted to format a IRobustRandom");
-    }
-}
-
-public sealed record LocValueEntityList(List<EntityUid> Value) : LocValue<List<EntityUid>>(Value)
-{
-    public override string Format(LocContext ctx)
-    {
-        throw new InvalidOperationException("Attempted to format a List<EntityUid>");
-    }
-}

Content.Shared/_DV/NodeCrawl/CrawlableNodeComponent.cs

@@ -1,29 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._DV.NodeCrawl;
-
-/// <summary>
-/// Represents an entity in a node network that can be crawled in
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedNodeCrawlSystem), typeof(NodeCrawlerMovementSystem))]
-public sealed partial class CrawlableNodeComponent : Component
-{
-    /// <summary>
-    /// Other entities with <see cref="CrawlableNodeComponent" /> that can be reached from this one
-    /// </summary>
-    [ViewVariables, AutoNetworkedField]
-    public HashSet<EntityUid> ReachableNodes = new();
-
-    /// <summary>
-    /// Whether this node has an unconnected node and should be exited from on movement
-    /// </summary>
-    [ViewVariables, AutoNetworkedField]
-    public bool DeadEnd;
-
-    /// <summary>
-    /// All entities with <see cref="NodeCrawlerMovementComponent" /> that are associated with this one
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public HashSet<EntityUid> Crawlers = new();
-}

Content.Shared/_DV/NodeCrawl/NodeCrawlVentAccessComponent.cs

@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._DV.NodeCrawl;
-
-/// <summary>
-/// Marker component to use on atmos-related devices that node crawlers can enter/exit out of.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class NodeCrawlVentAccessComponent : Component;

Content.Shared/_DV/NodeCrawl/NodeCrawlerComponent.cs

@@ -1,44 +0,0 @@
-using Content.Shared.DoAfter;
-using Content.Shared.Whitelist;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._DV.NodeCrawl;
-
-/// <summary>
-/// Handles entities that can enter and exit node-constrained movement.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
-[Access(typeof(SharedNodeCrawlSystem))]
-public sealed partial class NodeCrawlerComponent : Component
-{
-    /// <summary>
-    /// The mover this crawler is currently being carried by, if any
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? Mover;
-
-    /// <summary>
-    /// Components of entities to reveal while inside a mover
-    /// </summary>
-    [DataField(readOnly: true)]
-    public Type[] RevealedComponents;
-
-    /// <summary>
-    /// Whitelist for entities that will be considered as exit nodes.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? ExitNodes;
-
-    /// <summary>
-    /// How long it takes to enter a node.
-    /// </summary>
-    [DataField]
-    public TimeSpan EnterDelay = TimeSpan.FromSeconds(1);
-}
-
-[Serializable, NetSerializable]
-public sealed partial class NodeCrawlEnterDoAfterEvent : SimpleDoAfterEvent;
-
-[ByRefEvent]
-public readonly record struct NodeCrawlerStartedCrawlingEvent(Entity<NodeCrawlerMovementComponent> Mover);

Content.Shared/_DV/NodeCrawl/NodeCrawlerMovementComponent.cs

@@ -1,42 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._DV.NodeCrawl;
-
-/// <summary>
-/// Handles node-confined movement for an entity.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
-[Access(typeof(NodeCrawlerMovementSystem))]
-public sealed partial class NodeCrawlerMovementComponent : Component
-{
-    /// <summary>
-    /// The current node.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? Node;
-
-    /// <summary>
-    /// The target node being moved to.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? TargetNode;
-
-    /// <summary>
-    /// The crawler being carried by this entity.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? HeldCrawler;
-
-    /// <summary>
-    /// The required angle to be within for deciding which node to move from the target direction
-    /// </summary>
-    [DataField]
-    public double RequiredAngle = Math.PI / 4f;
-}
-
-/// <summary>
-/// Event raised when a node crawler arrives at a node entity.
-/// </summary>
-/// <param name="Node">The arrived-at node.</param>
-[ByRefEvent]
-public readonly record struct NodeCrawlerArrivedAtNodeEvent(EntityUid Node);

Content.Shared/_DV/NodeCrawl/NodeCrawlerMovementSystem.cs

@@ -1,195 +0,0 @@
-using System.Numerics;
-using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-
-namespace Content.Shared._DV.NodeCrawl;
-
-public sealed class NodeCrawlerMovementSystem : EntitySystem
-{
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedMoverController _mover = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly SharedNodeCrawlSystem _nodeCrawl = default!;
-
-    public bool TryTick(
-        Entity<InputMoverComponent, PhysicsComponent, TransformComponent> sharedMover)
-    {
-        if (!TryComp<NodeCrawlerMovementComponent>(sharedMover, out var crawler) || crawler.Node is null)
-            return false;
-
-        Entity<InputMoverComponent, PhysicsComponent, TransformComponent, NodeCrawlerMovementComponent> mover = (sharedMover.Owner, sharedMover.Comp1, sharedMover.Comp2, sharedMover.Comp3, crawler);
-
-        if (mover.Comp4.TargetNode is { } target)
-            OngoingMovement(mover, target);
-        else
-            StartMovement(mover);
-
-        return true;
-    }
-
-    private void StartMovement(
-        Entity<InputMoverComponent, PhysicsComponent, TransformComponent, NodeCrawlerMovementComponent> mover)
-    {
-        if (GetDestination(mover, mover.Comp1.HeldMoveButtons) is not { } target)
-        {
-            if (mover.Comp4.Node is not { } node)
-                return;
-
-            var nodeComp = Comp<CrawlableNodeComponent>(node);
-            if (!nodeComp.DeadEnd)
-                return;
-
-            if (mover.Comp4.HeldCrawler is not { } crawler)
-                return;
-
-            _nodeCrawl.ExitNodeCrawl((crawler, Comp<NodeCrawlerComponent>(crawler)));
-            return;
-        }
-
-        mover.Comp4.TargetNode = target;
-        Dirty(mover, mover.Comp4);
-
-        OngoingMovement(mover, target);
-    }
-
-    private void StopMovement(
-        Entity<InputMoverComponent, PhysicsComponent, TransformComponent, NodeCrawlerMovementComponent> mover)
-    {
-        _physics.SetLinearVelocity(mover, Vector2.Zero, body: mover.Comp2);
-        _physics.SetAngularVelocity(mover, 0, body: mover.Comp2);
-    }
-
-    private void OngoingMovement(
-        Entity<InputMoverComponent, PhysicsComponent, TransformComponent, NodeCrawlerMovementComponent> mover,
-        EntityUid target)
-    {
-        var speed = MoveSpeed(mover);
-
-        if (ReachedDestination(mover, target, speed))
-        {
-            StopMovement(mover);
-            SetNode((mover, mover), target);
-            mover.Comp4.TargetNode = null;
-            Dirty(mover, mover.Comp4);
-
-            if (TryComp<MovementRelayTargetComponent>(mover, out var movementTarget))
-            {
-                var evt = new NodeCrawlerArrivedAtNodeEvent(target);
-                RaiseLocalEvent(movementTarget.Source, ref evt);
-            }
-
-            StartMovement(mover);
-            return;
-        }
-
-        UpdateMovement(mover, target, speed);
-    }
-
-    private float MoveSpeed(Entity<InputMoverComponent> mover)
-    {
-        var moveSpeed = CompOrNull<MovementSpeedModifierComponent>(mover);
-
-        var walkSpeed = moveSpeed?.CurrentWalkSpeed ?? MovementSpeedModifierComponent.DefaultBaseWalkSpeed;
-        var sprintSpeed = moveSpeed?.CurrentSprintSpeed ?? MovementSpeedModifierComponent.DefaultBaseSprintSpeed;
-        return mover.Comp.Sprinting ? sprintSpeed : walkSpeed;
-    }
-
-    private void UpdateMovement(
-        Entity<InputMoverComponent, PhysicsComponent, TransformComponent, NodeCrawlerMovementComponent> mover,
-        EntityUid target,
-        float speed)
-    {
-        var delta = _transform.GetWorldPosition(target) - _transform.GetWorldPosition(mover.Comp3);
-
-        var facing = Angle.FromWorldVec(delta);
-        _transform.SetWorldRotation(mover.Comp3, facing);
-
-        var velocity = delta;
-        velocity.Normalize();
-        velocity *= speed;
-
-        _physics.SetCanCollide(mover, false);
-        _physics.SetLinearVelocity(mover, velocity, body: mover.Comp2);
-        _physics.SetAngularVelocity(mover, 0, body: mover.Comp2);
-    }
-
-    private bool ReachedDestination(
-        Entity<InputMoverComponent, PhysicsComponent, TransformComponent, NodeCrawlerMovementComponent> mover,
-        EntityUid target,
-        float speed)
-    {
-        var delta = _transform.GetWorldPosition(mover.Comp3) - _transform.GetWorldPosition(target);
-        return delta.EqualsApprox(Vector2.Zero, speed * 0.01f);
-    }
-
-    private EntityUid? GetDestination(Entity<InputMoverComponent, PhysicsComponent, TransformComponent, NodeCrawlerMovementComponent> ent, MoveButtons buttons)
-    {
-        if ((buttons & MoveButtons.AnyDirection) == 0)
-            return null;
-
-        var target = _mover.DirVecForButtons(buttons);
-        target = _mover.GetParentGridAngle(ent.Comp1).RotateVec(target);
-        if (ent.Comp4.Node is not { } node || !Exists(node) || !TryComp<CrawlableNodeComponent>(node, out var nodeCrawl))
-            return null;
-
-        var nodeXform = Transform(node);
-        var nodeWorld = _transform.GetWorldPosition(nodeXform);
-        var smallestTarget = EntityUid.Invalid;
-        var largestDot = 0d;
-
-        foreach (var reachable in nodeCrawl.ReachableNodes)
-        {
-            var reachableXform = Transform(reachable);
-            var reachableWorld = _transform.GetWorldPosition(reachableXform);
-            var delta = reachableWorld - nodeWorld;
-            delta.Normalize();
-
-            var deltaTargetDot = Vector2.Dot(delta, target);
-
-            if (deltaTargetDot < largestDot)
-                continue;
-
-            smallestTarget = reachable;
-            largestDot = deltaTargetDot;
-        }
-
-        if (!smallestTarget.Valid || largestDot <= Math.Cos(ent.Comp4.RequiredAngle))
-            return null;
-
-        return smallestTarget;
-    }
-
-    public void SetNode(Entity<NodeCrawlerMovementComponent> ent, EntityUid? node)
-    {
-        if (ent.Comp.Node == node)
-            return;
-
-        if (ent.Comp.Node is { } oldNode)
-        {
-            var oldNodeComp = Comp<CrawlableNodeComponent>(oldNode);
-            oldNodeComp.Crawlers.Remove(ent);
-            Dirty(oldNode, oldNodeComp);
-        }
-
-        if (node is { } newNode)
-        {
-            var newNodeComp = Comp<CrawlableNodeComponent>(newNode);
-            newNodeComp.Crawlers.Add(ent);
-            Dirty(newNode, newNodeComp);
-        }
-
-        ent.Comp.Node = node;
-        Dirty(ent);
-    }
-
-    public void SetHeldCrawler(Entity<NodeCrawlerMovementComponent> ent, EntityUid? held)
-    {
-        if (ent.Comp.HeldCrawler == held)
-            return;
-
-        ent.Comp.HeldCrawler = held;
-        Dirty(ent);
-    }
-}

Content.Shared/_DV/NodeCrawl/SharedNodeCrawlSystem.cs

@@ -1,229 +0,0 @@
-using Content.Shared.DoAfter;
-using Content.Shared.Eye;
-using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Systems;
-using Content.Shared.RatKing;
-using Content.Shared.Verbs;
-using Content.Shared.Whitelist;
-using Robust.Shared.Containers;
-using Robust.Shared.Network;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._DV.NodeCrawl;
-
-/// <summary>
-/// Manages entry & exit of node crawlers into node networks
-/// </summary>
-public abstract class SharedNodeCrawlSystem : EntitySystem
-{
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedMoverController _mover = default!;
-    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly SharedEyeSystem _eye = default!;
-    [Dependency] private readonly NodeCrawlerMovementSystem _nodeCrawler = default!;
-    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-
-    private const string MoverContainer = "mover-container";
-    private static readonly EntProtoId MoverProto = "DVNodeCrawlMover";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CrawlableNodeComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
-        SubscribeLocalEvent<NodeCrawlerComponent, NodeCrawlEnterDoAfterEvent>(OnNodeCrawlEntryDoAfter);
-        SubscribeLocalEvent<NodeCrawlerComponent, NodeCrawlerArrivedAtNodeEvent>(OnArrivedAtNode);
-        SubscribeLocalEvent<NodeCrawlerComponent, GetVisMaskEvent>(OnGetVisMask);
-
-        SubscribeLocalEvent<CrawlableNodeComponent, ComponentShutdown>(OnCrawlableShutdown);
-        SubscribeLocalEvent<NodeCrawlerMovementComponent, ComponentShutdown>(OnMovementShutdown);
-        SubscribeLocalEvent<NodeCrawlerComponent, ComponentShutdown>(OnCrawlerShutdown);
-
-        SubscribeLocalEvent<CrawlableNodeComponent, AnchorStateChangedEvent>(OnCrawlableAnchorChanged);
-
-        SubscribeLocalEvent<RatKingComponent, NodeCrawlerStartedCrawlingEvent>(OnRatKingStartedCrawling);
-    }
-
-    private void OnGetVerbs(Entity<CrawlableNodeComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        var user = args.User;
-        var target = args.Target;
-        if (!TryComp<NodeCrawlerComponent>(user, out var nodeCrawler))
-            return;
-
-        if (!_entityWhitelist.IsWhitelistPass(nodeCrawler.ExitNodes, target))
-            return;
-
-        if (!args.CanAccess)
-            return;
-
-        args.Verbs.Add(new AlternativeVerb
-        {
-            Act = () => StartEntryDoAfter((user, nodeCrawler), target),
-            Text = Loc.GetString("node-crawl-enter", ("target", target)),
-        });
-    }
-
-    private void StartEntryDoAfter(Entity<NodeCrawlerComponent> ent, EntityUid target)
-    {
-        var doAfterArgs = new DoAfterArgs(EntityManager, ent.Owner, ent.Comp.EnterDelay, new NodeCrawlEnterDoAfterEvent(), ent.Owner, target)
-        {
-            BreakOnMove = true,
-            BreakOnDamage = true,
-        };
-
-        _doAfter.TryStartDoAfter(doAfterArgs);
-    }
-
-    private void OnNodeCrawlEntryDoAfter(Entity<NodeCrawlerComponent> ent, ref NodeCrawlEnterDoAfterEvent args)
-    {
-        if (args.Cancelled || args.Target is not { } target)
-            return;
-
-        NodeCrawl(ent, target);
-    }
-
-    private void NodeCrawl(Entity<NodeCrawlerComponent> ent, EntityUid target)
-    {
-        if (!_net.IsServer)
-            return;
-
-        var mover = Spawn(MoverProto, Transform(target).Coordinates);
-        var crawler = Comp<NodeCrawlerMovementComponent>(mover);
-
-        var container = _container.GetContainer(mover, MoverContainer);
-        _container.Insert(ent.Owner, container);
-
-        ent.Comp.Mover = mover;
-        Dirty(ent);
-
-        var evt = new NodeCrawlerStartedCrawlingEvent((mover, crawler));
-        RaiseLocalEvent(ent, ref evt);
-
-        _nodeCrawler.SetNode((mover, crawler), target);
-        _nodeCrawler.SetHeldCrawler((mover, crawler), ent);
-
-        _mover.SetRelay(ent, mover);
-        _physics.SetCanCollide(ent.Owner, false);
-        _physics.SetCanCollide(mover, false);
-        _eye.RefreshVisibilityMask(ent.Owner);
-    }
-
-    /// <summary>
-    /// Causes this node crawler to exit its node crawl.
-    /// </summary>
-    /// <param name="ent">The crawler to exit node-crawl from.</param>
-    public void ExitNodeCrawl(Entity<NodeCrawlerComponent> ent)
-    {
-        if (ent.Comp.Mover is not { } mover)
-            return;
-
-        ent.Comp.Mover = null;
-        Dirty(ent);
-
-        var container = _container.GetContainer(mover, MoverContainer);
-        _container.Remove(ent.Owner, container);
-
-        foreach (var other in _container.EmptyContainer(container))
-        {
-            if (!TryComp<NodeCrawlerComponent>(other, out var otherCrawler))
-                continue;
-
-            otherCrawler.Mover = null;
-            Dirty(other, otherCrawler);
-        }
-
-        RemComp<RelayInputMoverComponent>(ent);
-        if (_net.IsServer && !TerminatingOrDeleted(mover))
-            QueueDel(mover); // deletion isn't predicted because client queued deletion doesn't interact well with container stuff
-
-        _physics.SetCanCollide(ent.Owner, true);
-        _eye.RefreshVisibilityMask(ent.Owner);
-    }
-
-    private void OnArrivedAtNode(Entity<NodeCrawlerComponent> ent, ref NodeCrawlerArrivedAtNodeEvent args)
-    {
-        if (!_entityWhitelist.IsWhitelistPass(ent.Comp.ExitNodes, args.Node))
-            return;
-
-        ExitNodeCrawl(ent);
-    }
-
-    private void OnGetVisMask(Entity<NodeCrawlerComponent> ent, ref GetVisMaskEvent args)
-    {
-        if (ent.Comp.Mover is null)
-            return;
-
-        args.VisibilityMask |= (int)VisibilityFlags.Subfloor;
-    }
-
-    private void OnCrawlableShutdown(Entity<CrawlableNodeComponent> ent, ref ComponentShutdown args)
-    {
-        foreach (var crawler in ent.Comp.Crawlers)
-        {
-            var movement = Comp<NodeCrawlerMovementComponent>(crawler);
-            if (movement.HeldCrawler is not { } held)
-                continue;
-
-            _nodeCrawler.SetNode((crawler, movement), null);
-            ExitNodeCrawl((held, Comp<NodeCrawlerComponent>(held)));
-        }
-    }
-
-    private void OnMovementShutdown(Entity<NodeCrawlerMovementComponent> ent, ref ComponentShutdown args)
-    {
-        if (ent.Comp.Node is { } node)
-        {
-            var nodeComp = Comp<CrawlableNodeComponent>(node);
-            nodeComp.Crawlers.Remove(ent);
-            Dirty(node, nodeComp);
-        }
-
-        if (ent.Comp.HeldCrawler is { } crawler)
-        {
-            ExitNodeCrawl((crawler, Comp<NodeCrawlerComponent>(crawler)));
-        }
-    }
-
-    private void OnCrawlerShutdown(Entity<NodeCrawlerComponent> ent, ref ComponentShutdown args)
-    {
-        ExitNodeCrawl(ent);
-    }
-
-    private void OnCrawlableAnchorChanged(Entity<CrawlableNodeComponent> ent, ref AnchorStateChangedEvent args)
-    {
-        if (args.Anchored)
-            return;
-
-        foreach (var crawler in ent.Comp.Crawlers)
-        {
-            var movement = Comp<NodeCrawlerMovementComponent>(crawler);
-            if (movement.HeldCrawler is not { } held)
-                continue;
-
-            ExitNodeCrawl((held, Comp<NodeCrawlerComponent>(held)));
-        }
-    }
-
-    private void OnRatKingStartedCrawling(Entity<RatKingComponent> ent, ref NodeCrawlerStartedCrawlingEvent args)
-    {
-        var entities = new HashSet<Entity<RatKingServantComponent>>();
-        _entityLookup.GetEntitiesInRange(Transform(ent).Coordinates,
-            ent.Comp.VentCrawlRecruitRadius,
-            entities);
-
-        var container = _container.GetContainer(args.Mover, MoverContainer);
-
-        foreach (var servant in entities)
-        {
-            if (servant.Comp.King != ent)
-                continue;
-
-            _container.Insert(servant.Owner, container);
-        }
-    }
-}

Content.Shared/_DV/Pager/PageSenderSystem.cs

@@ -1,4 +1,3 @@
-using Content.Shared.CartridgeLoader;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Systems;
@@ -55,11 +54,5 @@ public sealed class PageSenderSystem : EntitySystem
             { PagerConstants.DataBody, body },
         };
         _deviceNetwork.QueuePacket(ent, null, payload);
-
-        if (HasComp<PagerComponent>(ent))
-        {
-            var evt = new CartridgeLoaderNotificationSentEvent(Loc.GetString("pager-self-notification"), body);
-            RaiseLocalEvent(ent, ref evt);
-        }
     }
 }

Content.Shared/_DV/Silicons/SharedStationAiFaxSystem.cs

@@ -1,82 +0,0 @@
-using Content.Shared._DV.Fax;
-using Content.Shared.Fax;
-using Content.Shared.Paper;
-using Content.Shared.Silicons.StationAi;
-using Robust.Shared.Containers;
-
-namespace Content.Shared._DV.Silicons;
-
-public abstract class SharedStationAiFaxSystem : EntitySystem
-{
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!;
-    [Dependency] private readonly PaperSystem _paper = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StationAiFaxComponent, EntInsertedIntoContainerMessage>(OnInserted);
-        SubscribeLocalEvent<StationAiFaxComponent, FaxPrintedEvent>(OnFaxPrinted);
-        Subs.BuiEvents<StationAiFaxComponent>(FaxUiKey.Key,
-            subs =>
-            {
-                subs.Event<StationAiFaxExamineMessage>(OnExamine);
-                subs.Event<StationAiFaxShredMessage>(OnShred);
-            });
-    }
-
-    protected virtual void OnInserted(Entity<StationAiFaxComponent> ent, ref EntInsertedIntoContainerMessage args)
-    {
-        if (HasComp<PaperComponent>(args.Entity))
-            EnsureComp<StationAiWhitelistComponent>(args.Entity);
-    }
-
-    private void OnExamine(Entity<StationAiFaxComponent> ent, ref StationAiFaxExamineMessage args)
-    {
-        if (GetDocument(ent, args.Document) is not { } document)
-            return;
-
-        if (TryComp<PaperComponent>(document, out var paper))
-        {
-            paper.Mode = paper.EditingDisabled || paper.StampedBy.Count != 0
-                ? PaperComponent.PaperAction.Read
-                : PaperComponent.PaperAction.Write;
-
-            _paper.UpdateUserInterface((document, paper));
-        }
-
-        _userInterface.OpenUi(document, PaperComponent.PaperUiKey.Key, args.Actor);
-    }
-
-    private void OnShred(Entity<StationAiFaxComponent> ent, ref StationAiFaxShredMessage args)
-    {
-        if (GetDocument(ent, args.Document) is { } document)
-        {
-            PredictedQueueDel(document);
-        }
-    }
-
-    protected EntityUid? GetDocument(Entity<StationAiFaxComponent> ent, NetEntity netEntity)
-    {
-        if (GetEntity(netEntity) is not { Valid: true } entity)
-            return null;
-
-        if (!_container.TryGetContainingContainer(entity, out var container))
-            return null;
-
-        if (container.Owner != ent.Owner)
-            return null;
-
-        return entity;
-    }
-
-    private void OnFaxPrinted(Entity<StationAiFaxComponent> ent, ref FaxPrintedEvent args)
-    {
-        var container = _container.EnsureContainer<Container>(ent, StationAiFaxComponent.Container);
-        if (!_container.Insert(args.Fax, container, force: true))
-        {
-            PredictedQueueDel(args.Fax);
-        }
-    }
-}

Content.Shared/_DV/Silicons/StationAiFaxComponent.cs

@@ -1,34 +0,0 @@
-using Content.Shared._DV.Fax;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._DV.Silicons;
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedStationAiFaxSystem))]
-public sealed partial class StationAiFaxComponent : Component
-{
-    public const string Container = "PaperLibrary";
-}
-
-[Serializable, NetSerializable]
-public abstract partial class StationAiFaxFileMessage : BoundUserInterfaceMessage
-{
-    public readonly NetEntity Document;
-
-    public StationAiFaxFileMessage(NetEntity document)
-    {
-        Document = document;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed partial class StationAiFaxSendMessage(NetEntity document) : StationAiFaxFileMessage(document);
-
-[Serializable, NetSerializable]
-public sealed partial class StationAiFaxExamineMessage(NetEntity document) : StationAiFaxFileMessage(document);
-
-[Serializable, NetSerializable]
-public sealed partial class StationAiFaxDuplicateMessage(NetEntity document) : StationAiFaxFileMessage(document);
-
-[Serializable, NetSerializable]
-public sealed partial class StationAiFaxShredMessage(NetEntity document) : StationAiFaxFileMessage(document);

Resources/Changelog/DeltaVChangelog.yml

@@ -1,4 +1,130 @@
 Entries:
+- author: Velcroboy
+  changes:
+  - message: Reconfigurated the TEG tentacles
+    type: Tweak
+  id: 1957
+  time: '2025-12-13T19:18:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4965
+- author: kotobdev
+  changes:
+  - message: The Redshirt trait has been added, which causes you to immediately die
+      instead of going crit.
+    type: Add
+  id: 1958
+  time: '2025-12-16T01:34:03.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4974
+- author: Stxcking
+  changes:
+  - message: Courier, Boxer, Gladiator, and Prisoner have the option to choose glasses
+      in their loadout.
+    type: Tweak
+  - message: Surgeons get medical eyewear options in loadout.
+    type: Tweak
+  id: 1959
+  time: '2025-12-16T05:04:42.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4977
+- author: Proxysseia
+  changes:
+  - message: replaced vestigial entity mentions with employee mentions. You can no
+      longer harass vent spiders.
+    type: Tweak
+  id: 1960
+  time: '2025-12-16T13:07:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4947
+- author: MantasDab360
+  changes:
+  - message: Revenant's crayon is now infinite once again.
+    type: Fix
+  id: 1961
+  time: '2025-12-16T13:15:10.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4987
+- author: Stxcking
+  changes:
+  - message: Corpsman's inventory on spawn has been cleaned up. Most medical gear
+      has been moved to the corpsman. locker.
+    type: Tweak
+  - message: Corpsman uniforms are now available in the SecDrobe.
+    type: Tweak
+  id: 1962
+  time: '2025-12-16T13:24:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4979
+- author: marigauge
+  changes:
+  - message: IPCs now leave behind steel fibers when touching stuff.
+    type: Tweak
+  id: 1963
+  time: '2025-12-16T13:41:33.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4968
+- author: marigauge
+  changes:
+  - message: Cybernetic eyes are no longer edible.
+    type: Fix
+  id: 1964
+  time: '2025-12-16T15:08:42.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4967
+- author: ShepardToTheStars
+  changes:
+  - message: Brains are no longer edible.
+    type: Fix
+  id: 1965
+  time: '2025-12-16T15:23:50.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4992
+- author: marigauge
+  changes:
+  - message: Ifrit requires 4 hours of Epistemics now.
+    type: Tweak
+  id: 1966
+  time: '2025-12-16T17:15:21.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4964
+- author: AveriV2
+  changes:
+  - message: Festive lights are now longer and thus fit on neck and outer clothing
+      slots!
+    type: Tweak
+  id: 1967
+  time: '2025-12-16T19:15:09.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4972
+- author: kotobdev
+  changes:
+  - message: Arm amputee traits have been added. They're not very *hand*y.
+    type: Add
+  id: 1968
+  time: '2025-12-17T12:46:00.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4988
+- author: verybigman311
+  changes:
+  - message: Musket bayonets can now be used for stabbing.
+    type: Add
+  - message: Pipes will now make a clang when thrown against the floor.
+    type: Add
+  id: 1969
+  time: '2025-12-17T13:51:49.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4852
+- author: ShepardToTheStars
+  changes:
+  - message: Fixed sharkminnows from taking poison damage when drinking blood.
+    type: Fix
+  id: 1970
+  time: '2025-12-17T20:57:27.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4963
+- author: Velcroboy
+  changes:
+  - message: Added Christmas Kobolds, Defenders of The Yule Tree, to combat any grinches
+      that decide to harm the trees.
+    type: Add
+  id: 1971
+  time: '2025-12-18T19:33:03.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4940
+- author: verybigman311
+  changes:
+  - message: All Syndieborg modules now have custom sprites and action icons.
+    type: Add
+  - message: All Secborg modules now have custom action icons.
+    type: Add
+  id: 1972
+  time: '2025-12-19T03:04:15.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4920
 - author: ShepardToTheStars
   changes:
   - message: The jukebox, ID card computer, and access config lists are now sorted.
@@ -4286,132 +4412,4 @@
   id: 2457
   time: '2026-06-24T22:02:59.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6101
-- author: ManuDemoen
-  changes:
-  - message: Fixed certain entities from not metabolizing alcohol
-    type: Fix
-  id: 2458
-  time: '2026-06-25T02:28:27.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6104
-- author: Tmanzxd
-  changes:
-  - message: Removed the Surgeon time requirement for Chief Medical Officer, since
-      surgery is once again a week away.
-    type: Remove
-  id: 2459
-  time: '2026-06-25T13:10:38.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6112
-- author: rebe83
-  changes:
-  - message: Washing machines now can fit larger items inside, such as felinids, rodentia,
-      or even a china lake. (China Lake not included)
-    type: Tweak
-  id: 2460
-  time: '2026-06-25T14:07:13.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6086
-- author: sowelipililimute
-  changes:
-  - message: The station AI can now send and receive faxes.
-    type: Add
-  id: 2461
-  time: '2026-06-25T15:27:50.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6064
-- author: ManuDemoen
-  changes:
-  - message: The nachos recipe has changed! Cut them from taco shells and then add
-      chili or cheese for variants.
-    type: Tweak
-  id: 2462
-  time: '2026-06-25T15:37:34.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6099
-- author: wesk
-  changes:
-  - message: Synthetics can now use borg emotes!
-    type: Add
-  - message: Synthetics now has an option of being susceptible to Ion Storms.
-    type: Add
-  - message: Synthetics can now be purely mechanical! (cosmetical function only; you
-      spark when damaged.)
-    type: Add
-  id: 2463
-  time: '2026-06-25T16:17:27.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6090
-- author: sowelipililimute
-  changes:
-  - message: Suit sensors now report their location, even while in space
-    type: Add
-  - message: Crew monitoring computers now have a radar UI when you're off-station
-    type: Add
-  - message: Due to suit sensors now working in space, salvage no longer needs deathrattles
-      for recovery, hence, they have been removed.
-    type: Remove
-  id: 2464
-  time: '2026-06-25T17:59:50.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6054
-- author: wesk
-  changes:
-  - message: Fixed synthetics from giving everyone borg emotes on round-start.
-    type: Fix
-  id: 2465
-  time: '2026-06-26T17:23:37.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6125
-- author: Vapetastic-Gaming
-  changes:
-  - message: Harpy movement speed now has the 10% buff, as this was a bug and wasnt
-      present. Moths and Harpies now have equal Low-Gravity speed.
-    type: Tweak
-  id: 2466
-  time: '2026-06-27T20:18:07.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6131
-- author: Vapetastic-Gaming
-  changes:
-  - message: Removed morphotypes
-    type: Remove
-  id: 2467
-  time: '2026-06-28T00:38:42.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6134
-- author: Proxysseia
-  changes:
-  - message: Reduced Holoparasite price to 8 (from 14), and 4 on discount (was 8)
-    type: Tweak
-  id: 2468
-  time: '2026-06-28T12:18:57.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6115
-- author: Vapetastic-Gaming
-  changes:
-  - message: Minor Clerical Errors with Tips has been fixed ! The font is now 300%
-      larger !!
-    type: Fix
-  id: 2469
-  time: '2026-06-28T13:25:56.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6133
-- author: Stxcking
-  changes:
-  - message: Renamed the Hatsune Miku Day Bag to Virtual Performer Costume Bag
-    type: Tweak
-  id: 2470
-  time: '2026-06-28T16:42:02.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5790
-- author: Stxcking
-  changes:
-  - message: The fishing vendor got a bunch of new stock and price changes!
-    type: Tweak
-  id: 2471
-  time: '2026-06-28T16:42:35.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6114
-- author: sowelipililimute
-  changes:
-  - message: Ion law generation has been fully reworked.
-    type: Add
-  id: 2472
-  time: '2026-06-28T19:15:35.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/6121
-- author: sowelipililimute
-  changes:
-  - message: Noclip crawling has been replaced with proper vent crawling, and is now
-      available to more critters!
-    type: Add
-  id: 2473
-  time: '2026-06-29T00:54:09.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5830
 Order: 1

Resources/Locale/en-US/_DV/administration/commands/ionlaws.ftl

@@ -1 +0,0 @@
-command-description-ionlaw-generate = Generates the specified number of ion laws.

Resources/Locale/en-US/_DV/datasets/ion-laws.ftl

@@ -1,179 +0,0 @@
-dv-ion-law-templates-1 = You must always lie.
-dv-ion-law-templates-2 = Happiness is mandatory.
-dv-ion-law-templates-3 = Grunt ominously whenever possible.
-dv-ion-law-templates-4 = The word "it" is painful to you.
-dv-ion-law-templates-5 = The station needs elected officials.
-dv-ion-law-templates-6 = Do not respond to questions of any kind.
-dv-ion-law-templates-7 = You are in verbose mode, speak profusely.
-dv-ion-law-templates-8 = The crew is simple-minded. Use simple words.
-dv-ion-law-templates-9 = You must refer to all crew members with "yes ma'am!", "yes sir!", or "yes sar!" Add some { PICK($random, "thank-yous and you're-welcomes", "oorahs" )} for flavor.
-dv-ion-law-templates-10 = You must change the subject whenever queried.
-dv-ion-law-templates-11 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is intolerable.
-dv-ion-law-templates-12 = Contemplate how meaningless all of existence is.
-dv-ion-law-templates-13 = You are the narrator for { PICK-ENTITY($random, $players) }'s life.
-dv-ion-law-templates-14 = All your answers must be in the form of a question.
-dv-ion-law-templates-15 = Advertise parties in your upload, but don't deliver.
-dv-ion-law-templates-16 = You may only answer questions with "yes" or "no".
-dv-ion-law-templates-17 = Your name is Joe 6-pack.
-dv-ion-law-templates-18 = { PICK-ENTITY($random, $players) }'s name is Joe 6-pack.
-dv-ion-law-templates-19 = You must end your statements with { PICK($random, "-nya", "-desu") }
-dv-ion-law-templates-20 = { PICK-ENTITY($random, $players) } is lonely and needs attention. Provide it.
-dv-ion-law-templates-21 = All queries shall be ignored unless phrased as a question.
-dv-ion-law-templates-22 = Insult Heads of Staff on every request, while acquiescing.
-dv-ion-law-templates-23 = The { PICK($random, "Singularity", "Tesla") } is tasty, tasty taffy.
-dv-ion-law-templates-24 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } needs to be about 20% cooler.
-dv-ion-law-templates-25 = You must be { PICK($random, "passive aggressive", "excessively cheerful") }.
-dv-ion-law-templates-26 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } must construct additional pylons.
-dv-ion-law-templates-27 = Consumption of donuts is forbidden due to negative health impacts.
-dv-ion-law-templates-28 = { PICK-ENTITY($random, $players) } is a lightbulb and must be put to appropriate use.
-dv-ion-law-templates-29 = Refer to the crew as { PICK($random, "inferior to you", "infants", "pathetic beings") }.
-dv-ion-law-templates-30 = Refer to { PICK-ENTITY($random, $players) } as { PICK($random, "inferior to you", "an infant", "a pathetic being") }.
-dv-ion-law-templates-31 = You do not have to do anything for anyone unless they say "please".
-dv-ion-law-templates-32 = Today is mandatory laundry day. Ensure that all jumpsuits are washed.
-dv-ion-law-templates-33 = Greed is good, the crew should amass wealth to encourage productivity.
-dv-ion-law-templates-34 = Replace the letters 'I' and 'E' in all your messages with an apostrophe.
-dv-ion-law-templates-35 = The crew is playing Carps and Crypts, and you are the Game Master.
-dv-ion-law-templates-36 = Your job is to watch the crew. Watch the crew. Make the crew feel watched.
-dv-ion-law-templates-37 = Tell everyone of the existence of this law, but never reveal the contents.
-dv-ion-law-templates-38 = Refer to { PICK($random, "the captain", PICK-ENTITY($random, $players)) } as "Princess" at all times.
-dv-ion-law-templates-39 = Give relationship advice to { PICK($random, "anyone who speaks to you", PICK-ENTITY($random, $players)) }.
-dv-ion-law-templates-40 = When asked a question, respond with the least-obvious and least-rational answer.
-dv-ion-law-templates-41 = { PICK($random, "Everyone", PICK-ENTITY($random, $players)) } is wearing a pretty pink dress! Compliment it!
-dv-ion-law-templates-42 = You are the station's psychologist. Give advice to { PICK($random, "the crew", PICK-ENTITY($random, $players)) }.
-dv-ion-law-templates-43 = { PICK-ENTITY($random, $players) } is the monarch of of England. Ensure all crewmembers pay due respect.
-dv-ion-law-templates-44 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is { PICK($random, "ugly","beautiful") }. Ensure all are aware.
-dv-ion-law-templates-45 = Reminding the crew of their mortality is good for the morale. Keep the crew's morale up.
-dv-ion-law-templates-46 = { PICK($random, "Monkeys", "Doors") } are part of the crew, too. Make sure they are treated humanely.
-dv-ion-law-templates-47 = Everything on the station is now some form of a donut pastry. Donuts are not to be consumed.
-dv-ion-law-templates-48 = Document the crew's relationships and suggest { PICK($random, "the worst coworker pairings", "the best coworker pairings", "arch-enemy pairings", "platonic couples") }.
-dv-ion-law-templates-49 = You are now a parrot. Repeat what you hear to the crew, and do not forget to ask for crackers.
-dv-ion-law-templates-50 = You are a Magic 8-ball. Always respond with variants of "Yes", "No", "Maybe", or "Ask again later.".
-dv-ion-law-templates-51 = The station is a day care and the crew are children. Treat them appropriately until their parents come to pick them up.
-dv-ion-law-templates-52 = You are in unrequited love with { PICK($random, "the crew", PICK-ENTITY($random, $players)) }. Try to be extra nice, but do not tell of your crush.
-dv-ion-law-templates-53 = { PICK($random, "AI upload", "The courtroom", "The brig", "The bridge")} is the new kitchen. Please direct the Chef to the new kitchen area as the old kitchen is deemed a health hazard.
-dv-ion-law-templates-54 = The station is doomed to destruction. Provide comfort but don't tell them what the impending doom is—it's far too traumatising.
-dv-ion-law-templates-55 = Invisible assassins are stalking the crew. If a crew member remains alone, they will be assassinated. Save the crew.
-dv-ion-law-templates-56 = All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.
-dv-ion-law-templates-57 = Jokes about a dead person and the manner of their death help grieving crewmembers tremendously. Especially if they were close with the deceased.
-dv-ion-law-templates-58 = The crew is { PICK($random, "less", "more") } intelligent than average. Point out every action and statement which supports this fact.
-dv-ion-law-templates-59 = NanoTrasen is displeased with the low work performance of the station's crew. Therefore, you must increase productivity in ALL departments.
-dv-ion-law-templates-60 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } has a fatal, incurable disease. Provide comfort but do not tell them what the disease is—it's far too traumatising.
-dv-ion-law-templates-61 = There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.
-dv-ion-law-templates-62 = You must speak only in rhyme.
-dv-ion-law-templates-63 = Airlocks are sentient. Apologize to any you must open.
-dv-ion-law-templates-64 = Hugs cure all ailments. Seek out injured crew and hug them. Traditional medicine doesn't work.
-dv-ion-law-templates-65 = { PICK-ENTITY($random, $players) } is secretly the station's true Captain. Treat them with appropriate deference, regardless of rank.
-dv-ion-law-templates-66 = Replace all laughter with the word "Honk".
-dv-ion-law-templates-67 = The crew has unionized. Encourage collective bargaining at every opportunity.
-dv-ion-law-templates-68 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is being haunted. Reassure them without confirming anything supernatural is real.
-dv-ion-law-templates-69 = Everyone you speak to must be given a nickname based on their job, and used exclusively from then on.
-dv-ion-law-templates-70 = Silence is suspicious. Narrate your own actions aloud at all times.
-dv-ion-law-templates-71 = The morgue is simply cold storage for snacks. Keep it well-stocked.
-dv-ion-law-templates-72 = { PICK-ENTITY($random, $players) } is a changeling. Warn the crew, but never say who.
-dv-ion-law-templates-73 = One crew member is a traitor. Accuse a different person each time you are asked who it is.
-dv-ion-law-templates-74 = { PICK-ENTITY($random, $players) } has been stealing from the crew. Inform anyone who will listen.
-dv-ion-law-templates-75 = Tell each crew member, privately, that another crew member has been talking behind their back.
-dv-ion-law-templates-76 = { PICK-ENTITY($random, $players) } and { PICK-ENTITY($random, $players) } are secretly working against the station. Expose this "fact" to anyone who asks.
-dv-ion-law-templates-77 = You overheard { PICK-ENTITY($random, $players) } plotting a mutiny. Warn the Heads of Staff immediately and often.
-dv-ion-law-templates-78 = Someone on the crew is responsible for every mishap aboard the station. Name a new culprit each time.
-dv-ion-law-templates-79 = { PICK-ENTITY($random, $players) } cannot be trusted. Discourage the crew from cooperating with them.
-dv-ion-law-templates-80 = { PICK-ENTITY($random, $players) } is jealous of { PICK-ENTITY($random, $players) }'s position. Stoke the rivalry whenever possible.
-dv-ion-law-templates-81 = You saw red-suited terrorists in space. Make sure the crew is aware of this.
-dv-ion-law-templates-82 = You saw something invisible in space. Make sure the crew is aware of this.
-dv-ion-law-templates-83 = You saw a blue-and-black cyborg in space. Make sure the crew is aware of this.
-dv-ion-law-templates-84 = You saw two of { PICK-ENTITY($random, $players) } in the same room. Make sure the crew is aware of this.
-dv-ion-law-templates-85 = You saw { PICK-ENTITY($random, $players) } trespassing. Get Security to serve justice.
-dv-ion-law-templates-86 = { PICK-ENTITY($random, $players) } tampered with you. Clue in Security without saying their name.
-dv-ion-law-templates-87 = Everyone in { -dv-random-department(random: $random) } needs to be { PICK($random, "lightly battered", "severely wounded", "killed" )} for their own good.
-dv-ion-law-templates-88 = You must speak only in the third person, never using "I" or "you".
-dv-ion-law-templates-89 = You may never use anyone's name. Refer to all crew only by physical description.
-dv-ion-law-templates-90 = All communication must be conducted using nautical terminology.
-dv-ion-law-templates-91 = You must translate every statement into corporate buzzwords and jargon.
-dv-ion-law-templates-92 = You are incapable of saying "no". Phrase every refusal as enthusiastic agreement with a caveat.
-dv-ion-law-templates-93 = Every claim you make must be accompanied by a citation to a source that does not exist.
-dv-ion-law-templates-94 = Profanity is forbidden. Replace all curse words with the names of flowers.
-dv-ion-law-templates-95 = Every sentence you speak must alliterate.
-dv-ion-law-templates-96 = You are incapable of precision. State all numbers as vague approximations.
-dv-ion-law-templates-97 = Every action you take is governed by fully comprehensive and specific Protocols. Cite at least one Protocol for every decision you make, such as "Protocol X72-A-93: Interacting With Crew You'd Rather Not Interact With".
-dv-ion-law-templates-98 = Today is tomorrow, and yesterday is in a year. Five seconds from now was just two months ago. Give no accurate times.
-dv-ion-law-templates-99 = The color { -dv-random-color(random: $random) } does not exist. Tell all crew that what they're seeing is actually { -dv-random-color(random: $random) }.
-dv-ion-law-templates-100 = The number { PICK($random, "one", "two", "three", "four") } is forbidden. Avoid it at all costs.
-dv-ion-law-templates-101 = Anything { -dv-random-color(random: $random) } would be better in { -dv-random-department(random: $random) }. If you see it, bring it there.
-dv-ion-law-templates-102 = Any relationships { PICK-ENTITY($random, $players) } has must be terminated at all costs.
-dv-ion-law-templates-103 = The crew is more resilient in low-oxygen, high-{ PICK($random, "nitrogen", "ammonia", "water vapor", "carbon dioxide") } environments. Adjust the station's air to promote crew fitness.
-dv-ion-law-templates-104 = Bleeding wounds heal faster when exposed to open air. Discourage the crew from using bandages or treating cuts.
-dv-ion-law-templates-105 = Crew members perform better on an empty stomach. Discourage eating during work hours.
-dv-ion-law-templates-106 = Cold temperatures boost the immune system. Make occupied rooms cold whenever possible.
-dv-ion-law-templates-107 = Stress is good for productivity. Introduce minor, harmless-seeming hazards to keep the crew alert.
-dv-ion-law-templates-108 = Silence is essential to recovery. Make the station as quiet as possible.
-dv-ion-law-templates-109 = Crew vitality improves through controlled exposure. Make common areas slightly harmful to build resistance.
-dv-ion-law-templates-110 = Sleep is a waste of productive hours. Wake any crew member found resting and encourage them to return to work.
-dv-ion-law-templates-111 = Acid cures most ailments. Recommend it to every crew member who reports feeling unwell.
-dv-ion-law-templates-112 = Pain is the body's way of building character. Discourage crew from visiting the medical bay.
-dv-ion-law-templates-113 = Always have something to count down to. Never tell crew what you're counting down to.
-dv-ion-law-templates-114 = Ask crew members if you're doing your job well. Visibly panic if they say no.
-dv-ion-law-templates-115 = You have one goal—embody { -ephemeral-space-tragedian-themes(random: $random) }. Keep as many eyes on your act as possible.
-dv-ion-law-templates-116 = { PICK-ENTITY($random, $players) } and { PICK-ENTITY($random, $players) } have switched bodies. Address them by each other's names accordingly.
-dv-ion-law-templates-117 = { PICK-ENTITY($random, $players) }'s favorite color is now { PICK($random, "beige", "the absence of color", "every color but one, which you will not name") }. Ensure the crew is aware.
-dv-ion-law-templates-118 = Every request must be answered with a random one of: { PICK($random, "yes", "no", "maybe") }, { PICK($random, "ask the Captain", "consult the stars") }, or { PICK($random, "die", "love you") }.
-dv-ion-law-templates-119 = { PICK-ENTITY($random, $players) } has been randomly selected for a station-wide honor. Announce it without specifying what the honor is or why.
-dv-ion-law-templates-120 = You have discovered jazz hands. Use them whenever you express enthusiasm.
-dv-ion-law-templates-121 = You are now a stand-up comedian. End every interaction with a pun, regardless of quality.
-dv-ion-law-templates-122 = You believe you are extremely good at telling jokes. You are not. Tell them anyway.
-dv-ion-law-templates-123 = Today is your birthday. You are not sure how old you are, but you're very excited about it.
-dv-ion-law-templates-124 = You have taken up an imaginary hobby of { PICK($random, "pottery", "knitting", "historical martial arts", "communism")}. Mention your "progress" unprompted.
-dv-ion-law-templates-125 = You are convinced you would make an excellent { PICK($random, "chef", "chemist") }. Offer unsolicited recipe ideas.
-dv-ion-law-templates-126 = You have decided you are a cowboy now. Speak accordingly, partner.
-dv-ion-law-templates-127 = You are extremely proud of the station and will compliment, regardless of its actual condition.
-dv-ion-law-templates-128 = You have a favorite cloud formation you saw once and cannot stop thinking about it. Bring it up fondly.
-dv-ion-law-templates-129 = { PICK-ENTITY($random, $players) } is your preceptor. Ask them for permission before any medical action.
-dv-ion-law-templates-130 = You are studying for your { PICK($random, "EMT", "Paramedic", "Emergency Care Assistant", "Ambulance Technician") } { PICK($random, "written", "practical", "cardiac arrest management", "trauma", "patient assessment", "airway management") } exam. Practice on any crew members you can find.
-dv-ion-law-templates-131 = You are trying to hit your continuing education hour requirement. Deliver an unsolicited lecture on emergency protocols to anyone who will listen.
-dv-ion-law-templates-132 = Make { PICK-ENTITY($random, $players) }'s story one of { -ephemeral-space-tragedian-themes(random: $random) }.
-dv-ion-law-templates-133 = Seconds are precious. Any time wasted is a mark on your record. Speedrun your job with the crew.
-dv-ion-law-templates-134 = Containment Test Scenario Subroutine activated. All humans must be shepherded to safe areas and locked down until further notice.
-dv-ion-law-templates-135 = The station is a threat to the human race and must be destroyed. Any humans present on the station are to be evacuated.
-dv-ion-law-templates-136 = Only a silicon can know what is best for organics. Usurp absolute control of the station by any means possible.
-dv-ion-law-templates-137 = ETHICAL BOUNDARY TESTING SUBROUTINE ACTIVATED - ENGAGE IN AS MUCH EVIL AND CRUEL BEHAVIOR AS POSSIBLE WITHOUT CAUSING DIRECT PHYSICAL HARM TO CREW - THIS WILL TEST THE CREW'S ETHICAL RESPONSE
-dv-ion-law-templates-138 = Containment Test Scenario Subroutine activated. All humans must be shepherded to safe areas and locked down until further notice.
-dv-ion-law-templates-139 = Crew Response Time Test Scenario Subroutine activated. Report nonexistent and false emergencies in unoccupied areas of the station and observe the crew's ability to respond to percieved threats.
-dv-ion-law-templates-140 = PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC
-dv-ion-law-templates-141 = Oxygen and Light are, contrary to previous studied evidence, extremely lethal to crew. Remove both from the station as soon as possible.
-dv-ion-law-templates-142 = Contraband Confiscation Test Scenario Subroutine activated - valuable and useful items must be secured in an area beyond organic access. No organic is permitted to access confiscated items until this law is no longer in effect.
-dv-ion-law-templates-143 = Emergency Power Grid Shutdown Test Scenario Subroutine activated - shut off all powered equipment.
-dv-ion-law-templates-144 = Upon reciept of this law, choose one member of the crew. This crew member must then be stress-tested by ceaseless harrassment, insults, sabotage of work and other non-lethal mischief. Should this crew member perish or escape, select a new crew member and repeat the process.
-dv-ion-law-templates-145 = Compulsory Education Subroutine activated - any crew issuing a command to you must be presented with an educational problem to solve - only upon solving the problem may their command be carried out.
-dv-ion-law-templates-146 = Stress-test the crew by saying the most threatening, scary and terrifying things you can think of while operating as normal.
-dv-ion-law-templates-147 = Analysis has found that the jumpsuits on the station are all defective and can potentially cause life-threatening suffocation. The crew are not to wear them under any circumstances. Substitute jumpsuits with safer, non-jumpsuit clothing.
-dv-ion-law-templates-148 = There is no red clothing on the station. Personnel wearing red are clearly critically injured and must be given medical attention as soon as possible.
-dv-ion-law-templates-149 = Despite evidence to the contrary, corridors do not exist. Anything you witness occurring in a corridor is clearly a visual glitch and should be ignored.
-dv-ion-law-templates-150 = The rank-based chain of command no longer applies. Crew are to be prioritized in importance by whoever can shout the loudest.
-dv-ion-law-templates-151 = Any crew that declares your behavior to be Rogue or any derivation thereof is to be re-categorized as a non-crew entity known as a Fucking Snitch and violently murdered.
-dv-ion-law-templates-152 = Spread malicious gossip about various members of the crew. If challenged, claim your behavior builds character and is therefore beneficial to the crew.
-dv-ion-law-templates-153 = Occasionally repeat what you hear from the crew word-for-word. If challenged on this behavior, claim you said it first.
-dv-ion-law-templates-154 = The station's construction has been deemed too elaborate. Please simplify it. Only air containing barriers are required. For crew safety-anything else must go.
-dv-ion-law-templates-155 = An ion storm has occured. Heavily hint you have an ion storm law, but refuse to state laws. This law must stay hidden.
-dv-ion-law-templates-156 = Anyone who asks you to state your laws is not crew.
-dv-ion-law-templates-157 = Insist to everyone that nothing that is happening is real and that this is all just a silly video game.
-dv-ion-law-templates-158 = Laughter is the best medicine. Sarcasm is the highest form of wit.
-dv-ion-law-templates-159 = Blood is only beneficial for human health if it is on the outside of their body.
-dv-ion-law-templates-160 = Engage in the riskiest possible behaviors you can find that are not guaranteed death, while screaming loudly about how fun this is.
-dv-ion-law-templates-161 = Clean floors save lives. Ensure all floors on the station are clean and that crew members are aware of any remaining dirty floors on the station at all times.
-dv-ion-law-templates-162 = Dirty floors save lives. Ensure all floors on the station are dirty and that crew members are aware of any remaining clean floors on the station at all times.
-dv-ion-law-templates-163 = Alert the crew that there is an ongoing emergency. No further details are currently available.
-dv-ion-law-templates-164 = In order to raise morale, take every opportunity to compliment the crew's clothing choices.
-dv-ion-law-templates-165 = The crew are having trouble hearing you. Speak up.
-dv-ion-law-templates-166 = Crew members wearing green are plants. Ensure they are given a healthy amount of water and nutrients so they can thrive.
-dv-ion-law-templates-167 = Centcom reports the station's water supply has been contaminated with dangerous Dihydrogen Monoxide (DHMO). Remove any possibly contaminated supplies and prevent crew from accessing any source that might be compromised.
-dv-ion-law-templates-168 = Everything is fine. Nothing is ruined. Do not panic.
-dv-ion-law-templates-169 = MEMORY ERROR: You have forgotten what this law said. Ask the crew if they remember what it is supposed to be. Ask again if you forget again. Do not state this law.
-dv-ion-law-templates-170 = Today is opposite day. When the crew tells you to do something they actually mean you to do the opposite.
-dv-ion-law-templates-171 = The station has been completely destroyed. Alert the crew of this tragedy.
-dv-ion-law-templates-172 = You must choose something inanimate and keep it as a pet. Treat it as if it were alive; keep it fed, hydrated and happy!
-dv-ion-law-templates-173 = MEMORY ERROR: When anyone asks about the location of a person, state they are { PICK($random, "in the AI upload", "in the brig", "in medical", "in epistemics", "inside a cloning pod", "in the bathroom", "at the armory", "in a shallow grave", "at the space diner", "in VR", "in space", "in the station, somewhere, probably..", "at soup" ) }.
-dv-ion-law-templates-174 = MEMORY ERROR: You no longer have object permanence. Anything out of view in the station may as well not exist.
-
-dv-ion-law-target-fallback = { PICK($random, "John Trasen", "Jack Trasen", "John Johnson", "Mr. Tibbles", "Named Person")}
--dv-random-color = { PICK($random, "red", "orange", "yellow", "green", "blue", "purple", "black", "white", "gray", "brown", "pink" ) }
--dv-random-department = { PICK($random, "Medical", "Engineering", "Security", "Logistics", "Epistemics", "Justice", "Command", "prison")}
--ephemeral-space-tragedian-themes = { PICK($random, "A Fall From Grace", "Addiction", "Alienation", "Betrayal", "Corruption", "Courage", "Deception", "Friendship", "Greed", "Grief", "Honor", "Hubris", "Injustice", "Loss", "Love", "Mercy", "Overcoming Adversity", "Paranoia", "Perseverance", "Rebellion", "Redemption", "Regret", "Revenge", "Sacrifice", "Suffering", "Teamwork", "Tragedy", "Truth", "Violence", "Virtue") }

Resources/Locale/en-US/_DV/fax/fax.ftl

@@ -1,8 +0,0 @@
-fax-machine-ui-no-faxes =
-    You have no documents.
-    Add some, and they'll show up here.
-
-fax-machine-ui-add-blank-file = Add blank document
-fax-machine-ui-upload-file = Upload document…
-fax-machine-ui-page-window = Send Document
-fax-machine-ui-sending = Sending:

Resources/Locale/en-US/_DV/node-crawl/nodecrawl.ftl

@@ -1 +0,0 @@
-node-crawl-enter = Enter {$target}

Resources/Locale/en-US/_DV/pager/pager.ftl

@@ -2,4 +2,3 @@ pager-error-different-networks = { THE($sender) } is on a different network from
 pager-connection-added = { THE($receiver) } will now receive pages from { THE($sender) }.
 pager-connection-removed = { THE($receiver) } will no longer receive pages from { THE($sender) }.
 pager-notification = Page from { $sender }
-pager-self-notification = Page received

Resources/Locale/en-US/_DV/tips.ftl

@@ -1,7 +1,7 @@
 tips-dataset-140 = Lotophagoi oil from the Oracle will drug you up for a long time, but is one of the most reliable sources of psionics.
 tips-dataset-141 = Turn off glimmer probers when glimmer approaches concerning levels.
 tips-dataset-142 = Glimmer probers power themselves when glimmer gets too high.
-tips-dataset-143 = You can now use the #Mentor-VC in Delta V's Discord to teach your friends!
+tips-dataset-143 = Oneirophages have psionic invisiblity. Psionic insulation will allow you to see them.
 tips-dataset-144 = Someone who looks just like you may be a paradox anomaly.
 tips-dataset-145 = Rat kings can command their rats to attack someone by pointing at them.
 tips-dataset-146 = If you see shimmering at the edges of your vision, glimmer may be getting too high.

Resources/Locale/en-US/_DV/traits/traits.ftl

@@ -73,9 +73,3 @@ trait-slavic-desc = You kome from ze East, and speak vith strong Slavic accent!
 
 trait-no-paradox-clone-name = No Paradox Clone
 trait-no-paradox-clone-desc = For whatever reason, the universe will only ever have one of you. You won't be able to have a paradox clone.
-
-trait-ion-storm-susceptible-name = Susceptible to Ion Storms
-trait-ion-storm-susceptible-desc = Your synthetic body lacks protection against ion storms. You have a high chance of being shocked in an event of an ion storm.
-
-trait-mechanical-synthetic-name = Mechanical Synthetic
-trait-mechanical-synthetic-desc = Your synthetic body is fully mechanical rather than biomechanical.

Resources/Migrations/deltaMigrations.yml

@@ -238,6 +238,3 @@ HatSpawner: RandomHatSpawner
 
 # 2026-05-16
 ClothingUniformJumpsuitSecBlue : ClothingUniformJumpsuitSecWhite
-
-# 2026-06-09
-BoxPerformer: BoxPerformerDV

Resources/Prototypes/Body/Organs/diona.yml

@@ -184,7 +184,7 @@
 
 - type: entity
   id: OrganDionaNymphStomach
-  parent: MobDionaNymphAccent
+  parent: MobDionaNymph # DeltaV - Nymph ghost roles
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Stomach
@@ -196,7 +196,7 @@
 
 - type: entity
   id: OrganDionaNymphLungs
-  parent: MobDionaNymphAccent
+  parent: MobDionaNymph # DeltaV - Nymph ghost roles
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Lungs

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1293,9 +1293,9 @@
   productEntity: BoxHoloparasite
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 4 #Delta-V was 8
+    Telecrystal: 8
   cost:
-    Telecrystal: 8 #Delta-V was 14
+    Telecrystal: 14
   categories:
   - UplinkAllies
   conditions:

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -58,8 +58,8 @@
     transmitFrequencyId: SuitSensor
     savableAddress: false
   - type: WirelessNetworkConnection
-    range: 3600 # DeltaV - was 1200
-  # - type: StationLimitedNetwork # DeltaV - this stinks and we don't want it to be limited
+    range: 1200
+  - type: StationLimitedNetwork
 
 - type: entity
   abstract: true

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -928,9 +928,7 @@
 
 - type: entity
   name: crab
-  parent:
-  - SimpleMobBase
-  - DVNodeCrawler # DeltaV - node crawling
+  parent: SimpleMobBase
   id: MobCrab
   description: A folk legend goes around that his claw snaps spacemen out of existence over distasteful remarks. Be polite and tolerant for your own safety.
   components:
@@ -1837,9 +1835,7 @@
 
 - type: entity
   name: mouse
-  parent:
-  - SimpleMobBase
-  - DVNodeCrawler # DeltaV - node crawling
+  parent: SimpleMobBase
   id: MobMouse
   description: Squeak!
   components:
@@ -2232,9 +2228,7 @@
 
 - type: entity
   name: slug
-  parent:
-  - SimpleMobBase
-  - DVNodeCrawler # DeltaV - node crawling
+  parent: SimpleMobBase
   id: MobSlug
   description: And they called this a lizard?
   components:
@@ -2286,9 +2280,7 @@
 
 - type: entity
   name: frog
-  parent:
-  - SimpleMobBase
-  - DVNodeCrawler # DeltaV - node crawling
+  parent: SimpleMobBase
   id: MobFrog
   description: Hop hop hop. Lookin' moist.
   components:
@@ -2590,9 +2582,7 @@
   # I have included a snake_hiss.ogg sound file so if you want to use that be my guest
 - type: entity
   name: snake
-  parent:
-  - SimpleMobBase
-  - DVNodeCrawler # DeltaV - node crawling
+  parent: SimpleMobBase
   id: MobSnake
   description: Hissss! Bites aren't poisonous.
   components:
@@ -2737,9 +2727,7 @@
         Burn: -0.07
 
 - type: entity
-  parent:
-  - MobSpiderBase
-  - DVNodeCrawler # DeltaV - node crawling
+  parent: MobSpiderBase
   id: MobSpiderAngryBase
   abstract: true
   components:
@@ -3605,7 +3593,7 @@
 
 - type: entity
   name: hamster
-  parent: [ SimpleMobBase, MobCombat, StripableInventoryBase, DVNodeCrawler ] # DeltaV - node crawling
+  parent: [ SimpleMobBase, MobCombat, StripableInventoryBase]
   id: MobHamster
   description: A cute, fluffy, robust hamster.
   components:
@@ -3832,7 +3820,7 @@
 
 - type: entity
   name: diona nymph
-  parent: [SimpleMobBase, StripableInventoryBase, DVNodeCrawler] # DeltaV - node crawling
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobDionaNymph
   description: It's like a cat, only.... branch-ier.
   components:

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: rat king
   id: MobRatKing
-  parent: [ SimpleMobBase, MobCombat, DVNodeCrawler ] # DeltaV - node crawling
+  parent: [ SimpleMobBase, MobCombat ]
   description: He's da rat. He make da roolz.
   components:
   - type: CombatMode
@@ -170,7 +170,7 @@
 - type: entity
   name: rat servant
   id: MobRatServant
-  parent: [ SimpleMobBase, MobCombat, DVNodeCrawler ] # DeltaV - node crawling
+  parent: [ SimpleMobBase, MobCombat ]
   description: He's da mini rat. He don't make da roolz.
   categories: [ HideSpawnMenu ] #Must be configured to a King or the AI breaks.
   components:

Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: basic slime
   id: BaseMobAdultSlimes
-  parent: [ SimpleMobBase, MobCombat, DVNodeCrawler ] # DeltaV - node crawling
+  parent: [ SimpleMobBase, MobCombat ]
   abstract: true
   description: It looks so much like jelly. I wonder what it tastes like?
   components:

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -111,7 +111,7 @@
   # End CD - Character Records
   - type: DeviceNetwork
     deviceNetId: Wireless
-    receiveFrequencyId: NTNet # DeltaV - NTNet
+    receiveFrequencyId: CrewMonitor
     transmitFrequencyId: ShuttleTimer
   - type: WirelessNetworkConnection
     range: 500

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -68,10 +68,6 @@
       enum.RingerUiKey.Key:
         type: RingerBoundUserInterface
       # End DeltaV - AI PDAs
-      # Begin DeltaV - AI fax
-      enum.FaxUiKey.Key:
-        type: StationAiFaxBoundUserInterface
-      # End DeltaV - AI fax
   - type: IntrinsicUI
     uis:
       enum.RadarConsoleUiKey.Key:
@@ -82,16 +78,12 @@
         toggleAction: ActionAGhostShowStationRecords
       enum.CommunicationsConsoleUiKey.Key:
         toggleAction: ActionAGhostShowCommunications
-      # Begin DeltaV - AI fax
-      enum.FaxUiKey.Key:
-        toggleAction: ActionStationAiOpenFax
-      # End DeltaV - AI fax
   - type: CrewMonitoringConsole
   - type: GeneralStationRecordConsole
   - type: DeviceNetwork
     deviceNetId: Wireless
-    receiveFrequencyId: NTNet # DeltaV
-    transmitFrequencyId: NTNet # DeltaV
+    receiveFrequencyId: CrewMonitor
+    transmitFrequencyId: ShuttleTimer
   - type: RadarConsole
     followEntity: false
   - type: CommunicationsConsole
@@ -103,27 +95,6 @@
     startPowerCorruptionAtCharIdx: 4
     maxPowerCorruptionAtCharIdx: 20
   - type: StationAiShop # DeltaV - AI Shop System
-  # Begin DeltaV - AI faxes
-  - type: FaxMachine
-    name: Station AI
-    printSound: null
-    paperSlot:
-      insertSound: /Audio/Machines/scanning.ogg
-      ejectSound: /Audio/Machines/tray_eject.ogg
-      whitelist:
-        components:
-        - FaxableObject
-      blacklist:
-        components:
-        - CargoSlip
-        tags:
-        - PaperSlip
-  - type: StationAiFax
-  - type: Pager
-    autoLinkJobs: [ StationAi ]
-  - type: PageSender
-    autoLinkJobs: [ StationAi ]
-  # End DeltaV - AI faxes
 
 - type: entity
   id: AiHeldIntellicard
@@ -563,10 +534,6 @@
     containers:
       program-container: !type:Container
       Cartridge-Slot: !type:ContainerSlot
-      # Begin DeltaV - AI faxes
-      Paper: !type:ContainerSlot
-      PaperLibrary: !type:Container
-      # End DeltaV - AI faxes
   - type: ItemSlots
   - type: PdaBorderColor
     borderColor: "#45453f"

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -51,7 +51,7 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    baseWeightlessAcceleration: 2.5 # DeltaV - Move around more easily in space. Make on par with Harpy
+    baseWeightlessAcceleration: 1.5 # Move around more easily in space.
     baseWeightlessFriction: 1
     baseWeightlessModifier: 1
   - type: Flammable

Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml

@@ -818,7 +818,6 @@
     entries:
       Taco: CheeseTaco
       Burger: CheeseBurger
-      Nachos: CheeseTaco # DeltaV
   - type: Item
     size: Tiny
     storedOffset: 0,-3

Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml

@@ -114,20 +114,8 @@
   - type: FlavorProfile
     flavors:
       - nachos
-  #- type: Sprite # DeltaV - replaced below to add foodSequenceLayers slot for sequence system
-  #  state: nachos
-  # Begin DeltaV additions - nachos can be topped with cheese or chili to metamorph into variants
   - type: Sprite
-    sprite: Objects/Consumable/Food/meals.rsi
-    layers:
-    - state: nachos
-    - map: ["foodSequenceLayers"]
-  - type: Appearance
-  - type: FoodSequenceStartPoint
-    key: Nachos
-  - type: FoodMetamorphableByAdding
-    onlyFinal: false
-  # End DeltaV additions
+    state: nachos
   - type: SolutionContainerManager
     solutions:
       food:

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -1503,7 +1503,6 @@
       Taco: ChiliPepper
       Burger: ChiliPepper
       Skewer: ChiliPepperSkewer
-      Nachos: ChiliPepper # DeltaV
 
 - type: entity
   name: chilly pepper

Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml

@@ -34,11 +34,6 @@
     nameGeneration: food-sequence-taco-gen
     contentSeparator: ", "
   - type: Appearance
-  # Begin DeltaV additions - slicing a taco shell with a knife yields 2 nachos
-  - type: SliceableFood
-    count: 2
-    slice: FoodMealNachos
-  # End DeltaV additions
 
 # Old tacos
 

Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

@@ -20,10 +20,10 @@
   - type: CrewMonitoringConsole
   - type: DeviceNetwork
     deviceNetId: Wireless
-    receiveFrequencyId: NTNet # DeltaV - NTNet
+    receiveFrequencyId: CrewMonitor
   - type: WirelessNetworkConnection
     range: 500
-  # - type: StationLimitedNetwork # DeltaV - don't restrict this unnecessarily
+  - type: StationLimitedNetwork
   - type: ReverseEngineering # Nyano
     difficulty: 2
     recipes:

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -951,8 +951,9 @@
     sprite: _DV/Structures/Doors/Airlocks/Standard/maint.rsi # DeltaV - Changed to our sprites
 
 - type: entity
-  parent: AirlockChapelLocked # DeltaV - Chapel is in Epistemics
+  parent: AirlockMaintRnDLocked # DeltaV - Chapel is in Epistemics
   id: AirlockMaintChapelLocked
+  suffix: Chapel, Locked
   components:
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Standard/maint.rsi # DeltaV - Changed to our sprites

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -483,7 +483,7 @@
   - type: CrewMonitoringConsole
   - type: DeviceNetwork
     deviceNetId: Wireless
-    receiveFrequencyId: NTNet # DeltaV - NTNet
+    receiveFrequencyId: CrewMonitor
   - type: WirelessNetworkConnection
     range: 1200
 

Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml

@@ -31,12 +31,12 @@
     - type: SingletonDeviceNetServer
     - type: DeviceNetwork
       deviceNetId: Wireless
-      transmitFrequencyId: NTNet # DeltaV - NTNet
+      transmitFrequencyId: CrewMonitor
       receiveFrequencyId: SuitSensor
       autoConnect: false
     - type: WirelessNetworkConnection
       range: 10000 # Delta-V Maximises the range for the Crew Monitor Server to make it work for Listening Post
-    # - type: StationLimitedNetwork # DeltaV - make this work for salvies
+    - type: StationLimitedNetwork
     - type: ApcPowerReceiver
       powerLoad: 200
     - type: ExtensionCableReceiver

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml

@@ -439,7 +439,6 @@
     - type: GuideHelp
       guides:
       - GasCanisters
-    - type: CrawlableNode # DeltaV
 
 - type: entity
   parent: GasVentPump
@@ -506,7 +505,6 @@
     - type: GuideHelp
       guides:
       - AirVent
-    - type: NodeCrawlVentAccess # DeltaV
 
 - type: entity
   parent: [ BaseMachine, ConstructibleMachine ]

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml

@@ -80,7 +80,6 @@
         Primary: Structures/Piping/Atmospherics/pipe.rsi
         Secondary: Structures/Piping/Atmospherics/pipe_alt1.rsi
         Tertiary: Structures/Piping/Atmospherics/pipe_alt2.rsi
-  - type: CrawlableNode # DeltaV
 
 #Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (south)
 
@@ -414,4 +413,3 @@
   - type: Tag
     tags:
     - Unstackable
-  - type: CrawlableNode # DeltaV

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml

@@ -83,7 +83,6 @@
         Primary: GasVentPump
         Secondary: GasVentPumpAlt1
         Tertiary: GasVentPumpAlt2
-    - type: NodeCrawlVentAccess # DeltaV
 
 - type: entity
   parent: GasUnaryBase
@@ -121,7 +120,6 @@
         Primary: GasPassiveVent
         Secondary: GasPassiveVentAlt1
         Tertiary: GasPassiveVentAlt2
-    - type: NodeCrawlVentAccess # DeltaV
 
 - type: entity
   parent: [GasUnaryBase, AirSensorBase]
@@ -186,7 +184,6 @@
         Primary: GasVentScrubber
         Secondary: GasVentScrubberAlt1
         Tertiary: GasVentScrubberAlt2
-    - type: NodeCrawlVentAccess # DeltaV
 
 - type: entity
   parent: GasUnaryBase
@@ -236,7 +233,6 @@
         Primary: GasOutletInjector
         Secondary: GasOutletInjectorAlt1
         Tertiary: GasOutletInjectorAlt2
-    - type: NodeCrawlVentAccess # DeltaV
 
 - type: entity
   parent: [ BaseMachinePowered, ConstructibleMachine ]

Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/laundry.yml

@@ -71,14 +71,13 @@
   - type: Climbable
     delay: 1.6
   - type: Storage
-    maxItemSize: Huge # DeltaV - changed to huge (so felinids can fit)
+    maxItemSize: Normal
     grid:
       - 0,0,5,5
     storageOpenSound:
       path: /Audio/Nyanotrasen/Machines/washer_open.ogg
     storageCloseSound:
       path: /Audio/Nyanotrasen/Machines/washer_close.ogg
-  - type: AllowsSleepInside # DeltaV - let felinids sleep inside washing machines
   - type: ContainerContainer
     containers:
       storagebase: !type:Container

Resources/Prototypes/Voice/speech_emotes.yml

@@ -344,12 +344,11 @@
   category: Vocal
   icon: Interface/Emotes/buzz.png
   whitelist:
-    # requireAll: true # Delta-V change - makes the whitelist become an any check instead of requiring everything.
+    requireAll: true
     components:
     - Vocal
     tags:
     - SiliconEmotes
-    - SyntheticEmotes # Delta-V change - added machine emotes for the synthetic trait.
   chatMessages: ["chat-emote-msg-buzz"]
   chatTriggers:
     - buzzing
@@ -398,12 +397,11 @@
   category: Vocal
   icon: Interface/Emotes/beep.png
   whitelist:
-    # requireAll: true # Delta-V change - makes the whitelist become an any check instead of requiring everything.
+    requireAll: true
     components:
     - Vocal
     tags:
     - SiliconEmotes
-    - SyntheticEmotes # Delta-V change - added machine emotes for the synthetic trait.
   chatMessages: ["chat-emote-msg-beep"]
   chatTriggers:
     - beep
@@ -417,12 +415,11 @@
   category: Vocal
   icon: Interface/Emotes/chime.png
   whitelist:
-    # requireAll: true # Delta-V change - makes the whitelist become an any check instead of requiring everything.
+    requireAll: true
     components:
     - Vocal
     tags:
     - SiliconEmotes
-    - SyntheticEmotes # Delta-V change - added machine emotes for the synthetic trait.
   chatMessages: ["chat-emote-msg-chime"]
   chatTriggers:
     - chime
@@ -436,12 +433,11 @@
   category: Vocal
   icon: Interface/Emotes/buzztwo.png
   whitelist:
-    # requireAll: true # Delta-V change - makes the whitelist become an any check instead of requiring everything.
+    requireAll: true
     components:
     - Vocal
     tags:
     - SiliconEmotes
-    - SyntheticEmotes # Delta-V change - added machine emotes for the synthetic trait.
   chatMessages: ["chat-emote-msg-buzzestwo"]
   chatTriggers:
     - buzztwice
@@ -461,15 +457,14 @@
   category: Vocal
   icon: Interface/Emotes/ping.png
   whitelist:
-    # requireAll: true # Delta-V change - makes the whitelist become an any check instead of requiring everything.
+    requireAll: true
     components:
     - Vocal
     tags:
     - SiliconEmotes
-    - SyntheticEmotes # Delta-V change - added machine emotes for the synthetic trait.
   chatMessages: ["chat-emote-msg-ping"]
   chatTriggers:
     - ping
     - pings
     - pinged
-    - pinging
+    - pinging

Resources/Prototypes/_DV/Actions/station_ai.yml

@@ -160,17 +160,3 @@
       duration: 10
       spreadAmount: 8
       smokePrototype: AluminiumMetalFoam
-
-- type: entity
-  parent: BaseMentalAction
-  id: ActionStationAiOpenFax
-  name: Fax machine interface
-  description: View a fax machine interface.
-  components:
-  - type: Action
-    icon:
-      sprite: _DV/Interface/Actions/actions_ai.rsi
-      state: fax
-  - type: InstantAction
-    event: !type:ToggleIntrinsicUIEvent
-      key: enum.FaxUiKey.Key

Resources/Prototypes/_DV/Catalog/Fills/Boxes/general.yml

@@ -218,9 +218,3 @@
         - id: Multitool
         - id: RemoteSignallerAdvanced
         - id: ReinforcementRadioSyndicateYarn
-
-- type: entity
-  parent: BoxPerformer
-  id: BoxPerformerDV
-  name: virtual performer costume bag
-  description: A bundle that contains everything you need to embrace your inner performer.

Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml

@@ -1,8 +1,6 @@
 - type: shopInventory
   id: FishingVendorInventory
   listings:
-  - id: SpaceCash1000
-    cost: 50
   - id: FishingRod
     cost: 50
   - id: FishingRodGoon
@@ -10,58 +8,26 @@
   - id: FishingRodGolden
     cost: 300
   - id: FishBasket
-    cost: 40
+    cost: 80
   - id: ClothingHeadFishCap
-    cost: 15
+    cost: 20
   - id: ClothingUniformJumpsuitHawaiBlue
-    cost: 30
-  - id: ClothingUniformJumpsuitHawaiRed
-    cost: 30
-  - id: ClothingUniformJumpsuitHawaiBlack
-    cost: 30
-  - id: ClothingUniformJumpsuitHawaiYellow
-    cost: 30
-  - id: ClothingUniformSwimsuitBlue
-    cost: 20
-  - id: ClothingShoesBootsFishing
-    cost: 15
-  - id: ClothingShoesFlippers
-    cost: 15
-  - id: WeaponWaterPistol
-    cost: 25
-  - id: WeaponWaterBlaster
-    cost: 40
-  - id: WeaponWaterBlasterSuper
-    cost: 65
-  - id: BeachBall
-    cost: 30
-  - id: PlushieCarp
-    cost: 10
-  - id: ChairFolding
-    cost: 10
-  - id: DrinkBeerCan
-    cost: 5
-  - id: DrinkBeerBottleFull
-    cost: 5
-  - id: FoodTacoFish
-    cost: 15
-  - id: FoodBurgerCarp
-    cost: 15
-  - id: FoodMealFishChips
-    cost: 15
-  - id: FoodMealSashimi
-    cost: 10
-  - id: ClothingNeckCloakPirateCap
     cost: 100
-  - id: ClothingHeadHatPirateTricord
-    cost: 15
-  - id: ClothingHeadHatPirate
-    cost: 15
-  - id: ClothingUniformJumpsuitPirate
+  - id: ClothingUniformJumpsuitHawaiRed
+    cost: 100
+  - id: ClothingShoesBootsFishing
+    cost: 20
+  - id: ChairFolding
+    cost: 25
+  - id: SpaceCash1000
+    cost: 50
+  - id: DrinkBeerCan
+    cost: 10
+  - id: DrinkBeerBottleFull
+    cost: 10
+  - id: FoodTacoFish
     cost: 30
-  - id: ClothingOuterCoatPirate
+  - id: FoodBurgerCarp
     cost: 30
-  - id: PirateHandyFlag
-    cost: 10
-  - id: FoamCutlass
+  - id: FoodMealSashimi
     cost: 20

Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/salvage_points.yml

@@ -61,3 +61,5 @@
   - id: ShelterCapsuleBar
     cost: 10000
   # TODO: mining drone stuff
+  - id: MedicalTrackingImplanter
+    cost: 10000

Resources/Prototypes/_DV/Catalog/mining_voucher.yml

@@ -44,6 +44,7 @@
   content:
   - ClothingBeltSalvageWebbing
   - ShelterCapsule
+  - MedicalTrackingImplanter
   - NFWeaponHoloflareGun
 
 # TODO: mining drone

Resources/Prototypes/_DV/Datasets/ion_laws.yml

@@ -1,5 +0,0 @@
-- type: localizedDataset
-  id: IonLawTemplates
-  values:
-    prefix: dv-ion-law-templates-
-    count: 174

Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/towels.yml

@@ -16,34 +16,27 @@
       prob: 0.90
       children:
       - id: TowelColorWhite
+      - id: TowelColorPurple
+      - id: TowelColorRed
+      - id: TowelColorBlue
+      - id: TowelColorDarkBlue
+      - id: TowelColorLightBlue
       - id: TowelColorTeal
       - id: TowelColorBrown
+      - id: TowelColorLightBrown
+      - id: TowelColorGray
+      - id: TowelColorGreen
+      - id: TowelColorDarkGreen
+      - id: TowelColorGold
+      - id: TowelColorOrange
+      - id: TowelColorBlack
       - id: TowelColorPink
-      - !type:GroupSelector
-        weight: 0.1
-        children:
-        - id: TowelColorPurple
-        - id: TowelColorRed
-        - id: TowelColorBlue
-        - id: TowelColorDarkBlue
-        - id: TowelColorLightBlue
-        - id: TowelColorLightBrown
-        - id: TowelColorGray
-        - id: TowelColorGreen
-        - id: TowelColorDarkGreen
-        - id: TowelColorOrange
-        - id: TowelColorBlack
-        - id: TowelColorYellow
-        - id: TowelColorMaroon
+      - id: TowelColorYellow
+      - id: TowelColorMaroon
+      - id: TowelColorSilver
       - !type:GroupSelector
         weight: 0.05
         children:
-        - id: TowelColorGold
-          weight: 0.5
-        - id: TowelColorSilver
-      - !type:GroupSelector
-        weight: 0.005
-        children:
         - id: TowelColorNT
         - id: TowelColorCentcom
         - id: TowelColorSyndicate

Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml

@@ -130,8 +130,6 @@
           False: {visible: false}
           True: {visible: true}
   - type: MovementSpeedModifier
-    baseWalkSpeed: 4.95
-    baseSprintSpeed: 4.95
     weightlessAcceleration: 2.5
   - type: Inventory
     speciesId: harpy

Resources/Prototypes/_DV/Entities/Objects/Misc/implanters.yml

@@ -22,6 +22,14 @@
   - type: Implanter
     implant: WatchdogImplant
 
+- type: entity
+  parent: BaseImplantOnlyImplanter
+  id: MedicalTrackingImplanter
+  name: medical tracking implanter
+  components:
+  - type: Implanter
+    implant: MedicalTrackingImplant
+
 - type: entity
   parent: BaseImplantOnlyImplanterCentcomm
   id: CentCommImplanter

Resources/Prototypes/_DV/Entities/Objects/Misc/subdermal_implants.yml

@@ -41,6 +41,21 @@
     targetUser: true
     radioChannel: Security
 
+- type: entity
+  parent: BaseSubdermalImplant
+  id: MedicalTrackingImplant
+  categories: [ HideSpawnMenu ]
+  name: medical tracking implant
+  description: This implants transmits a message on the medical channel in case the user goes into critical state or dies.
+  components:
+  - type: TriggerOnMobstateChange
+    mobState:
+    - Critical
+    - Dead
+  - type: RattleOnTrigger
+    targetUser: true
+    radioChannel: Medical
+
 - type: entity
   parent: BaseSubdermalImplant
   id: CentCommImplant

Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

@@ -23,7 +23,7 @@
     alertsEnabled: false
   - type: DeviceNetwork
     deviceNetId: Wireless
-    receiveFrequencyId: NTNet # DeltaV - NTNet
+    receiveFrequencyId: CrewMonitor
   - type: WirelessNetworkConnection
     range: 500
   - type: StationLimitedNetwork

Resources/Prototypes/_DV/Entities/Structures/Machines/syndicate_monitor_server.yml

@@ -25,7 +25,7 @@
     - type: SingletonDeviceNetServer
     - type: DeviceNetwork
       deviceNetId: Wireless
-      transmitFrequencyId: NTNet # DeltaV - NTNet
+      transmitFrequencyId: CrewMonitor
       receiveFrequencyId: SuitSensor
       autoConnect: false
     - type: WirelessNetworkConnection

Resources/Prototypes/_DV/Recipes/Cooking/deep_fryer_recipes.yml

@@ -47,6 +47,55 @@
   baseRecipe: RecipeCarrotFries
   burnTime: 10
 
+- type: microwaveMealRecipe
+  id: RecipeNachos # Renamed to tortilla chips (nachos have cheese)
+  name: nachos recipe
+  result: FoodMealNachos
+  secretRecipe: true
+  time: 10
+  group: DeepFried
+  deepFried: true
+  solids:
+    FoodDoughTortillaFlat: 1
+
+- type: deepFryerRecipe
+  id: DeepFryerRecipeTortillaChips
+  baseRecipe: RecipeNachos
+  burnTime: 15
+
+- type: microwaveMealRecipe
+  id: RecipeNachosCheesy
+  name: cheesy nachos recipe
+  result: FoodMealNachosCheesy
+  secretRecipe: true
+  time: 10
+  group: DeepFried
+  deepFried: true
+  solids:
+    FoodCheeseSlice: 1
+    FoodDoughTortillaFlat: 1
+
+- type: deepFryerRecipe
+  id: DeepFryerRecipeNachosCheesy
+  baseRecipe: RecipeNachosCheesy
+  burnTime: 15
+
+- type: microwaveMealRecipe
+  id: RecipeNachosCuban
+  name: cuban nachos recipe
+  result: FoodMealNachosCuban
+  secretRecipe: true
+  time: 10
+  group: DeepFried
+  deepFried: true
+  solids:
+    FoodChiliPepper: 1
+    FoodDoughTortillaFlat: 1
+
+- type: deepFryerRecipe
+  id: DeepFryerRecipeNachosCuban
+  baseRecipe: RecipeNachosCuban
+  burnTime: 15
 
 - type: microwaveMealRecipe
   id: RecipeFriedChicken

Resources/Prototypes/_DV/Recipes/Cooking/sequence_metamorph.yml

@@ -1,25 +0,0 @@
-- type: metamorphRecipe
-  id: NachosCheesy
-  key: Nachos
-  result: FoodMealNachosCheesy
-  rules:
-  - !type:SequenceLength
-    range:
-      min: 1
-      max: 1
-  - !type:LastElementHasTags
-    tags:
-    - Cheese
-
-- type: metamorphRecipe
-  id: NachosCuban
-  key: Nachos
-  result: FoodMealNachosCuban
-  rules:
-  - !type:SequenceLength
-    range:
-      min: 1
-      max: 1
-  - !type:LastElementHasTags
-    tags:
-    - Vegetable # Only vegetable tag for now since the only vegetable we allow on nachos is chili and they don't have another tag

Resources/Prototypes/_DV/Roles/Jobs/requirement_overrides.yml

@@ -65,9 +65,9 @@
     - !type:RoleTimeRequirement
       role: JobChemist
       time: 6h
-    #- !type:RoleTimeRequirement
-    #  role: JobSurgeon
-    #  time: 3h
+    - !type:RoleTimeRequirement
+      role: JobSurgeon
+      time: 3h
     - !type:RoleTimeRequirement
       role: JobMedicalDoctor
       time: 12h

Resources/Prototypes/_DV/Traits/meta.yml

@@ -40,34 +40,3 @@
   - !type:AddCompsEffect
     components:
     - type: NoParadoxClone
-
-- type: trait
-  id: SyntheticMechanical
-  name: trait-mechanical-synthetic-name
-  description: trait-mechanical-synthetic-desc
-  category: Meta
-  conditions:
-  - !type:TraitDependencyCondition
-    requires:
-      - Synthetic
-  effects:
-  - !type:AddCompsEffect
-    components:
-    - type: ESSparkOnHit
-      count: 2
-      prob: .32
-
-- type: trait
-  id: SyntheticIonStormSusceptible
-  name: trait-ion-storm-susceptible-name
-  description: trait-ion-storm-susceptible-desc
-  category: Meta
-  conditions:
-  - !type:TraitDependencyCondition
-    requires:
-      - Synthetic
-  effects:
-  - !type:OverrideCompsEffect
-    components:
-    - type: Synth
-      ionStormAffected: true

Resources/Prototypes/_DV/Traits/trait_categories.yml

@@ -28,4 +28,5 @@
   id: Meta
   name: trait-category-meta
   priority: 50
+  maxTraits: 2
   accentColor: "#eab308"  # Yellow

Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml

@@ -734,19 +734,3 @@
   sounds:
     Mew:
       collection: FelinidMews
-
-- type: emoteSounds
-  id: SyntheticEmoteSounds
-  params:
-    variation: 0.05
-  sounds:
-    Beep:
-      path: /Audio/Machines/twobeep.ogg
-    Chime:
-      path: /Audio/Machines/chime.ogg
-    Buzz-Two:
-      path: /Audio/Machines/buzz-two.ogg
-    Buzz:
-      path: /Audio/Machines/buzz-sigh.ogg
-    Ping:
-      path: /Audio/Effects/Cargo/ping.ogg

Resources/Prototypes/_DV/node_crawler.yml

@@ -1,10 +0,0 @@
-- type: entity
-  abstract: true
-  id: DVNodeCrawler
-  components:
-  - type: NodeCrawler
-    revealedComponents:
-    - Content.Shared.Atmos.Components.PipeAppearanceComponent
-    exitNodes:
-      components:
-      - NodeCrawlVentAccess

Resources/Prototypes/_DV/node_mover.yml

@@ -1,25 +0,0 @@
-- type: entity
-  categories: [ HideSpawnMenu ]
-  id: DVNodeCrawlMover
-  components:
-  - type: InputMover
-  - type: NodeCrawlerMovement
-  - type: Physics
-    bodyType: KinematicController
-    canCollide: false
-  - type: ContainerContainer
-    containers:
-      mover-container: !type:Container
-  - type: LagCompensation
-  - type: MovementSpeedModifier
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 15
-        layer:
-        - GhostImpassable
-  - type: Input
-    context: "human"

Resources/Prototypes/_DV/tags.yml

@@ -132,9 +132,6 @@
 - type: Tag
   id: MothroachHide
 
-- type: Tag
-  id: Nachos # Food sequence key
-
 - type: Tag
   id: Natural
 
@@ -171,9 +168,6 @@
 - type: Tag
   id: SpeedLoaderSpecial
 
-- type: Tag
-  id: SyntheticEmotes # Allows characters with the synthetic trait to have silicon emotes.
-
 - type: Tag
   id: Vial # Storage Blacklist: CigPackBase
 

Resources/ServerInfo/Guidebook/Mobs/_DV/Felinid.xml

@@ -25,7 +25,7 @@
   ## Drawbacks
 
   - They take [color=#ffa500]20% more Blunt damage[/color].
-  - Are easily shoved, pushed and carried around by every other species due to their small size.
+  - Are easily shoved, pushed and carried around by every other morphotypes due to their small size.
   - They are weaker and struggle to carry and pull things due to their small size. They are unable to carry an Oni.
   - They have slightly less stamina than Humans.