diff --git a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
index 8d7292d468b..15ebc8a993d 100644
--- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
+++ b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
@@ -45,7 +45,7 @@ private void OnCompShutdown(Entity<InnerBodyAnomalyComponent> ent, ref Component
         if (!TryComp<SpriteComponent>(ent, out var sprite))
             return;
 
-        if (sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index)) // imp. added this check to prevent errors on anomalites - not having it was bad code on upstream's part
-            sprite.LayerSetVisible(index, false);
+        var index = _sprite.LayerMapGet((ent.Owner, sprite), ent.Comp.LayerMap);
+        _sprite.LayerSetVisible((ent.Owner, sprite), index, false);
     }
 }
diff --git a/Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs b/Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs
deleted file mode 100644
index 6f12297ff02..00000000000
--- a/Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Atmos.Piping.Binary.Components;
-
-namespace Content.Client.Atmos.EntitySystems;
-
-/// <summary>
-/// Represents the client system responsible for managing and updating the gas pressure regulator interface.
-/// Inherits from the shared system <see cref="SharedGasPressureRegulatorSystem"/>.
-/// </summary>
-public sealed partial class GasPressureRegulatorSystem : SharedGasPressureRegulatorSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GasPressureRegulatorComponent, AfterAutoHandleStateEvent>(OnValveUpdate);
-    }
-
-    private void OnValveUpdate(Entity<GasPressureRegulatorComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        UpdateUi(ent);
-    }
-
-    protected override void UpdateUi(Entity<GasPressureRegulatorComponent> ent)
-    {
-        if (UserInterfaceSystem.TryGetOpenUi(ent.Owner, GasPressureRegulatorUiKey.Key, out var bui))
-        {
-            bui.Update();
-        }
-    }
-}
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
deleted file mode 100644
index 9d66a9985f9..00000000000
--- a/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Localizations;
-using Robust.Client.UserInterface;
-
-namespace Content.Client.Atmos.UI;
-
-public sealed class GasPressureRegulatorBoundUserInterface(EntityUid owner, Enum uiKey)
-    : BoundUserInterface(owner, uiKey)
-{
-    private GasPressureRegulatorWindow? _window;
-
-    protected override void Open()
-    {
-        base.Open();
-
-        _window = this.CreateWindow<GasPressureRegulatorWindow>();
-
-        _window.SetEntity(Owner);
-
-        _window.ThresholdPressureChanged += OnThresholdChanged;
-
-        if (EntMan.TryGetComponent(Owner, out GasPressureRegulatorComponent? comp))
-            _window.SetThresholdPressureInput(comp.Threshold);
-
-        Update();
-    }
-
-    public override void Update()
-    {
-        if (_window == null)
-            return;
-
-        _window.Title = Identity.Name(Owner, EntMan);
-
-        if (!EntMan.TryGetComponent(Owner, out GasPressureRegulatorComponent? comp))
-            return;
-
-        _window.SetThresholdPressureLabel(comp.Threshold);
-        _window.UpdateInfo(comp.InletPressure, comp.OutletPressure, comp.FlowRate);
-    }
-
-    private void OnThresholdChanged(string newThreshold)
-    {
-        var sentThreshold = 0f;
-
-        if (UserInputParser.TryFloat(newThreshold, out var parsedNewThreshold) && parsedNewThreshold >= 0 &&
-            !float.IsInfinity(parsedNewThreshold))
-        {
-            sentThreshold = parsedNewThreshold;
-        }
-
-        // Autofill to zero if the user inputs an invalid value.
-        _window?.SetThresholdPressureInput(sentThreshold);
-
-        SendPredictedMessage(new GasPressureRegulatorChangeThresholdMessage(sentThreshold));
-    }
-}
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml
deleted file mode 100644
index b6a55f769e5..00000000000
--- a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml
+++ /dev/null
@@ -1,96 +0,0 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                      SetSize="345 380"
-                      MinSize="345 380"
-                      Title="{Loc gas-pressure-regulator-ui-title}"
-                      Resizable="False">
-
-    <BoxContainer Orientation="Vertical">
-
-        <BoxContainer Orientation="Vertical" Margin="0 10 0 10">
-
-            <BoxContainer Orientation="Vertical" Align="Center">
-                <Label Text="{Loc gas-pressure-regulator-ui-outlet}" Align="Center" StyleClasses="LabelKeyText" />
-                <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Label Name="OutletPressureLabel" Text="N/A" Margin="0 0 4 0" />
-                    <Label Text="{Loc gas-pressure-regulator-ui-pressure-unit}" />
-                </BoxContainer>
-            </BoxContainer>
-
-            <BoxContainer Orientation="Horizontal" Align="Center">
-                <BoxContainer Orientation="Vertical" Align="Center" HorizontalExpand="True">
-                    <Label Text="{Loc gas-pressure-regulator-ui-target}" Align="Right" StyleClasses="LabelKeyText" />
-                    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Right">
-                        <Label Name="TargetPressureLabel" Margin="0 0 4 0" />
-                        <Label Text="{Loc gas-pressure-regulator-ui-pressure-unit}" />
-                    </BoxContainer>
-                </BoxContainer>
-
-                <ProgressBar Name="ToTargetBar" MaxValue="1" SetSize="5 75" Margin="10" Vertical="True" />
-
-                <SpriteView Name="EntityView" SetSize="64 64" Scale="3 3" OverrideDirection="North" Margin="0" />
-
-                <ProgressBar Name="FlowRateBar" MaxValue="1" SetSize="5 75" Margin="10" Vertical="True" />
-
-                <BoxContainer Orientation="Vertical" Align="Center" HorizontalExpand="True">
-                    <Label Text="{Loc gas-pressure-regulator-ui-flow}" StyleClasses="LabelKeyText" />
-                    <BoxContainer Orientation="Horizontal">
-                        <Label Name="CurrentFlowLabel" Text="N/A" Margin="0 0 4 0" />
-                        <Label Text="{Loc gas-pressure-regulator-ui-flow-rate-unit}" />
-                    </BoxContainer>
-                </BoxContainer>
-            </BoxContainer>
-
-            <BoxContainer Orientation="Vertical" Align="Center" Margin="1">
-                <Label Text="{Loc gas-pressure-regulator-ui-inlet}" Align="Center" StyleClasses="LabelKeyText" />
-                <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Label Name="InletPressureLabel" Text="N/A" Margin="0 0 4 0" />
-                    <Label Text="{Loc gas-pressure-regulator-ui-pressure-unit}" />
-                </BoxContainer>
-            </BoxContainer>
-
-        </BoxContainer>
-
-        <!-- Controls to Set Pressure -->
-        <controls:StripeBack Name="SetPressureStripeBack" HorizontalExpand="True">
-            <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="10 10 10 10">
-                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                    <LineEdit Name="ThresholdInput" HorizontalExpand="True" MinSize="70 0" />
-                    <Button Name="SetThresholdButton" Text="{Loc gas-pressure-regulator-ui-set-threshold}"
-                            Disabled="True" Margin="5 0 0 0" />
-                </BoxContainer>
-
-                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 5 0 0">
-                    <Button Name="Subtract1000Button" Text="{Loc gas-pressure-regulator-ui-subtract-1000}"
-                            HorizontalExpand="True" Margin="0 2 2 0"
-                            StyleClasses="OpenBoth" />
-                    <Button Name="Subtract100Button" Text="{Loc gas-pressure-regulator-ui-subtract-100}"
-                            HorizontalExpand="True" Margin="0 2 2 0"
-                            StyleClasses="OpenBoth" />
-                    <Button Name="Subtract10Button" Text="{Loc gas-pressure-regulator-ui-subtract-10}"
-                            HorizontalExpand="True" Margin="0 2 2 0"
-                            StyleClasses="OpenBoth" />
-                    <Button Name="Add10Button" Text="{Loc gas-pressure-regulator-ui-add-10}" HorizontalExpand="True"
-                            Margin="0 2 2 0"
-                            StyleClasses="OpenBoth" />
-                    <Button Name="Add100Button" Text="{Loc gas-pressure-regulator-ui-add-100}"
-                            HorizontalExpand="True" Margin="0 2 2 0"
-                            StyleClasses="OpenBoth" />
-                    <Button Name="Add1000Button" Text="{Loc gas-pressure-regulator-ui-add-1000}"
-                            HorizontalExpand="True" Margin="0 2 2 0"
-                            StyleClasses="OpenBoth" />
-                </BoxContainer>
-
-                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 5 0 0">
-                    <Button Name="ZeroThresholdButton" Text="{Loc gas-pressure-regulator-ui-zero-threshold}"
-                            HorizontalExpand="True" Margin="0 0 5 0" />
-                    <Button Name="SetToCurrentPressureButton"
-                            Text="{Loc gas-pressure-regulator-ui-set-to-current-pressure}" HorizontalExpand="True" />
-                </BoxContainer>
-            </BoxContainer>
-        </controls:StripeBack>
-
-    </BoxContainer>
-
-</controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
deleted file mode 100644
index a7c0570bac1..00000000000
--- a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System.Globalization;
-using Content.Client.UserInterface.Controls;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Timing;
-
-namespace Content.Client.Atmos.UI;
-
-/// <summary>
-/// Client-side UI for controlling a pressure regulator.
-/// </summary>
-[GenerateTypedNameReferences]
-public sealed partial class GasPressureRegulatorWindow : FancyWindow
-{
-    private float _flowRate;
-
-    public GasPressureRegulatorWindow()
-    {
-        RobustXamlLoader.Load(this);
-
-        ThresholdInput.OnTextChanged += _ => SetThresholdButton.Disabled = false;
-        SetThresholdButton.OnPressed += _ =>
-        {
-            ThresholdPressureChanged?.Invoke(ThresholdInput.Text ??= "");
-            SetThresholdButton.Disabled = true;
-        };
-
-        SetToCurrentPressureButton.OnPressed += _ =>
-        {
-            if (InletPressureLabel.Text != null)
-            {
-                ThresholdInput.Text = InletPressureLabel.Text;
-            }
-
-            SetThresholdButton.Disabled = false;
-        };
-
-        ZeroThresholdButton.OnPressed += _ =>
-        {
-            ThresholdInput.Text = "0";
-            SetThresholdButton.Disabled = false;
-        };
-
-        Add1000Button.OnPressed += _ => AdjustThreshold(1000);
-        Add100Button.OnPressed += _ => AdjustThreshold(100);
-        Add10Button.OnPressed += _ => AdjustThreshold(10);
-        Subtract10Button.OnPressed += _ => AdjustThreshold(-10);
-        Subtract100Button.OnPressed += _ => AdjustThreshold(-100);
-        Subtract1000Button.OnPressed += _ => AdjustThreshold(-1000);
-        return;
-
-        void AdjustThreshold(float adjustment)
-        {
-            if (float.TryParse(ThresholdInput.Text, out var currentValue))
-            {
-                ThresholdInput.Text = (currentValue + adjustment).ToString(CultureInfo.CurrentCulture);
-                SetThresholdButton.Disabled = false;
-            }
-        }
-    }
-
-    public event Action<string>? ThresholdPressureChanged;
-
-    /// <summary>
-    /// Sets the current threshold pressure label. This is not setting the threshold input box.
-    /// </summary>
-    /// <param name="threshold"> Threshold to set.</param>
-    public void SetThresholdPressureLabel(float threshold)
-    {
-        TargetPressureLabel.Text = threshold.ToString(CultureInfo.CurrentCulture);
-    }
-
-    /// <summary>
-    /// Sets the threshold pressure input field with the given value.
-    /// When the client opens the UI the field will be autofilled with the current threshold pressure.
-    /// </summary>
-    /// <param name="input">The threshold pressure value to autofill into the input field.</param>
-    public void SetThresholdPressureInput(float input)
-    {
-        ThresholdInput.Text = input.ToString(CultureInfo.CurrentCulture);
-    }
-
-    /// <summary>
-    /// Sets the entity to be visible in the UI.
-    /// </summary>
-    /// <param name="entity"></param>
-    public void SetEntity(EntityUid entity)
-    {
-        EntityView.SetEntity(entity);
-    }
-
-    /// <summary>
-    /// Updates the UI for the labels.
-    /// </summary>
-    /// <param name="inletPressure">The current pressure at the valve's inlet.</param>
-    /// <param name="outletPressure">The current pressure at the valve's outlet.</param>
-    /// <param name="flowRate">The current flow rate through the valve.</param>
-    public void UpdateInfo(float inletPressure, float outletPressure, float flowRate)
-    {
-        if (float.TryParse(TargetPressureLabel.Text, out var parsedfloat))
-            ToTargetBar.Value = inletPressure / parsedfloat;
-
-        InletPressureLabel.Text = float.Round(inletPressure).ToString(CultureInfo.CurrentCulture);
-        OutletPressureLabel.Text = float.Round(outletPressure).ToString(CultureInfo.CurrentCulture);
-        CurrentFlowLabel.Text = float.IsNaN(flowRate) ? "0" : flowRate.ToString(CultureInfo.CurrentCulture);
-        _flowRate = flowRate;
-    }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        // Defines the flow rate at which the progress bar fills in one second.
-        // If the flow rate is >50 L/s, the bar will take <1 second to fill.
-        // If the flow rate is <50 L/s, the bar will take >1 second to fill.
-        const int barFillPerSecond = 50;
-
-        var maxValue = FlowRateBar.MaxValue;
-
-        // Increment the progress bar value based on elapsed time
-        FlowRateBar.Value += (_flowRate / barFillPerSecond) * args.DeltaSeconds;
-
-        // Reset the progress bar when it is fully filled
-        if (FlowRateBar.Value >= maxValue)
-        {
-            FlowRateBar.Value = 0f;
-        }
-    }
-}
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
index 42c8c45d507..533a867c00f 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
@@ -26,7 +26,7 @@ protected override void Open()
             // Begin DeltaV Additions - Find a station's grid instead of the current one for evil monitors
             if (EntMan.HasComponent<LongRangeCrewMonitorComponent>(Owner))
             {
-                gridUid = EntMan.System<LongRangeCrewMonitorSystem>().FindLargestStationGridInMap(xform.MapID);
+                gridUid = EntMan.System<LongRangeCrewMonitorSystem>().FindStationGridInMap(xform.MapID);
                 gridUid ??= xform.GridUid; // fall back to whatever grid this is on if it failed
             }
             // End DeltaV Additions
diff --git a/Content.Client/PDA/PdaMenu.xaml b/Content.Client/PDA/PdaMenu.xaml
index d66e51a0c75..8c9b4ae2ee6 100644
--- a/Content.Client/PDA/PdaMenu.xaml
+++ b/Content.Client/PDA/PdaMenu.xaml
@@ -43,11 +43,6 @@
             <ContainerButton Name="StationTimeButton">
                 <RichTextLabel Name="StationTimeLabel" Access="Public"/>
             </ContainerButton>
-            <!-- Begin DeltaV changes -->
-            <ContainerButton Name="CurrentDateButton">
-                <RichTextLabel Name="CurrentDateLabel" Access="Public"/>
-            </ContainerButton>
-            <!-- End DeltaV changes -->
             <ContainerButton Name="StationAlertLevelInstructionsButton">
                 <RichTextLabel Name="StationAlertLevelInstructions" Access="Public"/>
             </ContainerButton>
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
index 38da9c90772..712e0cbb01a 100644
--- a/Content.Client/PDA/PdaMenu.xaml.cs
+++ b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -32,7 +32,6 @@ public sealed partial class PdaMenu : PdaWindow
         private string _stationName = Loc.GetString("comp-pda-ui-unknown");
         private string _alertLevel = Loc.GetString("comp-pda-ui-unknown");
         private string _instructions = Loc.GetString("comp-pda-ui-unknown");
-        private string _currentDate = Loc.GetString("comp-pda-ui-unknown"); // DeltaV - PDA date
         
 
         private int _currentView;
@@ -126,13 +125,6 @@ public PdaMenu()
                 _clipboard.SetText(_instructions);
             };
 
-            // Begin DeltaV additions
-            CurrentDateButton.OnPressed += _ =>
-            {
-                _clipboard.SetText(_currentDate);
-            };
-            // End DeltaV additions
-
             
 
 
@@ -195,14 +187,6 @@ public void UpdateState(PdaUpdateState state)
                 "comp-pda-ui-station-alert-level-instructions",
                 ("instructions", _instructions))
             );
-            // Begin DeltaV additions
-            if (state.PdaOwnerInfo.CurrentDate is { } curDate)
-                _currentDate = curDate.ToString("dd MMMM yyyy");
-                CurrentDateLabel.SetMarkup(Loc.GetString(
-                    "comp-pda-ui-current-date",
-                    ("date", _currentDate)
-                ));
-            // End DeltaV additions
 
             AddressLabel.Text = state.Address?.ToUpper() ?? " - ";
 
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index 917cbbde214..cad9045fa89 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -209,7 +209,7 @@ private void OnUnpressed(GUIBoundKeyEventArgs args)
             if (_entities.TryGetComponent(Action, out AutoRechargeComponent? autoRecharge))
             {
                 var chargeTimeRemaining = _sharedChargesSys.GetNextRechargeTime((Action.Value, actionCharges, autoRecharge));
-                chargesText.AddText(Loc.GetString($"{Environment.NewLine}Time Til Recharge: {chargeTimeRemaining.TotalSeconds:F1} seconds")); // DeltaV - Better formatted, easier to read.
+                chargesText.AddText(Loc.GetString($"{Environment.NewLine}Time Til Recharge: {chargeTimeRemaining}"));
             }
         }
 
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
index 94b7efa7bd3..49b5b4a25b0 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
@@ -55,7 +55,6 @@ public override void DoLunge(EntityUid user, EntityUid weapon, Angle angle, Vect
 
             if (meleeWeaponComponent.SwingLeft)
                 angle *= -1;
-            if (meleeWeaponComponent.ChangeSwingDirection) meleeWeaponComponent.SwingLeft = !meleeWeaponComponent.SwingLeft; // DeltaV - Nice swing animation for desword
         }
         _sprite.SetRotation((animationUid, sprite), localPos.ToWorldAngle());
         var distance = Math.Clamp(localPos.Length() / 2f, 0.2f, 1f);
diff --git a/Content.Client/_CD/Records/UI/RecordEntryViewPopup.xaml.cs b/Content.Client/_CD/Records/UI/RecordEntryViewPopup.xaml.cs
index 8c82f725191..d347f9d5241 100644
--- a/Content.Client/_CD/Records/UI/RecordEntryViewPopup.xaml.cs
+++ b/Content.Client/_CD/Records/UI/RecordEntryViewPopup.xaml.cs
@@ -3,7 +3,6 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.RichText;
-using Content.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 
@@ -21,7 +20,6 @@ public sealed partial class RecordEntryViewPopup : FancyWindow
         typeof(ColorTag),
         typeof(HeadingTag),
         typeof(ItalicTag),
-        typeof(MonoTag)
     ];
 
     public RecordEntryViewPopup()
diff --git a/Content.Client/_DV/CosmicCult/CosmicGlyphSystem.cs b/Content.Client/_DV/CosmicCult/CosmicGlyphSystem.cs
deleted file mode 100644
index 9537f231e1d..00000000000
--- a/Content.Client/_DV/CosmicCult/CosmicGlyphSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared._DV.CosmicCult;
-
-namespace Content.Client._DV.CosmicCult;
-
-public sealed class CosmicGlyphSystem : SharedCosmicGlyphSystem
-{
-
-}
diff --git a/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml
index 87f12300309..c77c45ea7ff 100644
--- a/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml
+++ b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml
@@ -14,7 +14,6 @@
                    FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                    StyleClasses="LabelKeyText"/>
             <CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
-            <CheckBox Name="DisableGlimmerEffectCheckBox" Text="{Loc 'ui-options-disable-glimmer-effect'}" />
             <CheckBox Name="AutoFillHighlightsCheckBox" Text="{Loc 'ui-options-auto-fill-highlights'}" />
             <dvui:OptionColorSlider Name="HighlightsColorSlider"
                 Title="{Loc 'ui-options-highlights-color'}"
diff --git a/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs
index 3482980f29e..20688033ea7 100644
--- a/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs
+++ b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs
@@ -14,7 +14,6 @@ public DeltaTab()
         IoCManager.InjectDependencies(this);
 
         Control.AddOptionCheckBox(DCCVars.NoVisionFilters, DisableFiltersCheckBox);
-        Control.AddOptionCheckBox(DCCVars.DisableGlimmerShader, DisableGlimmerEffectCheckBox);
         Control.AddOptionCheckBox(DCCVars.ChatAutoFillHighlights, AutoFillHighlightsCheckBox);
         Control.AddOptionColorSlider(DCCVars.ChatHighlightsColor, HighlightsColorSlider);
 
diff --git a/Content.Client/_DV/Overlays/GlimmerOverlay.cs b/Content.Client/_DV/Overlays/GlimmerOverlay.cs
deleted file mode 100644
index 4c885b4ec75..00000000000
--- a/Content.Client/_DV/Overlays/GlimmerOverlay.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Robust.Client.Graphics;
-using Robust.Client.Player;
-using Robust.Shared.Enums;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Client._DV.Overlays;
-
-public sealed class GlimmerOverlay : Overlay
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly IPlayerManager _player = default!;
-
-    public override OverlaySpace Space => OverlaySpace.WorldSpace;
-    private readonly ShaderInstance _glimmerShader;
-    private readonly ProtoId<ShaderPrototype> _shaderProto = "HighGlimmer";
-
-    private float _visualGlimmerLevel = 0f;
-    public int ActualGlimmerLevel = 0;
-
-    public GlimmerOverlay()
-    {
-        IoCManager.InjectDependencies(this);
-        _glimmerShader = _prototype.Index(_shaderProto).Instance().Duplicate();
-    }
-
-    protected override bool BeforeDraw(in OverlayDrawArgs args)
-    {
-        if (_player.LocalEntity == null)
-        {
-            return false;
-        }
-
-        return base.BeforeDraw(in args);
-    }
-
-    protected override void Draw(in OverlayDrawArgs args)
-    {
-        var lastFrameTime = (float) _timing.FrameTime.TotalSeconds;
-
-        // lerp glimmer level to avoid jumps
-        _visualGlimmerLevel = !MathHelper.CloseTo(_visualGlimmerLevel, ActualGlimmerLevel, 0.001f)
-            ? float.Lerp(_visualGlimmerLevel, ActualGlimmerLevel, 0.1f * lastFrameTime)
-            : ActualGlimmerLevel;
-
-        // clamp glimmer to 0-1, map to exponential ease-out
-        var progress = Math.Clamp((_visualGlimmerLevel - 700f) / 300f,0,1);
-        var size = 1f - MathF.Pow(2f, -8f * progress);
-
-        _glimmerShader.SetParameter("size",size);
-
-        var worldHandle = args.WorldHandle;
-        var viewport = args.WorldBounds;
-        worldHandle.UseShader(_glimmerShader);
-        worldHandle.DrawRect(viewport, Color.White);
-        worldHandle.UseShader(null);
-    }
-
-    // used to avoid lerp jump if overlay was removed weirdly prior
-    public void Reset()
-    {
-        _visualGlimmerLevel = ActualGlimmerLevel;
-    }
-
-}
diff --git a/Content.Client/_DV/Overlays/GlimmerOverlaySystem.cs b/Content.Client/_DV/Overlays/GlimmerOverlaySystem.cs
deleted file mode 100644
index d46cdb282b4..00000000000
--- a/Content.Client/_DV/Overlays/GlimmerOverlaySystem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Content.Shared._DV.CCVars;
-using Content.Shared.Psionics.Glimmer;
-using Robust.Client.Graphics;
-using Robust.Shared.Configuration;
-
-namespace Content.Client._DV.Overlays;
-
-public sealed partial class GlimmerOverlaySystem : EntitySystem
-{
-    [Dependency] private readonly IOverlayManager _overlayMan = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-
-    private GlimmerOverlay _overlay = default!;
-
-    private bool _cvarDisabled;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _overlay = new GlimmerOverlay();
-        SubscribeNetworkEvent<GlimmerChangedEvent>(OnGlimmerChanged);
-        _cfg.OnValueChanged(DCCVars.DisableGlimmerShader, OnDisableGlimmerShaderChanged);
-        OnDisableGlimmerShaderChanged(_cfg.GetCVar(DCCVars.DisableGlimmerShader));
-    }
-
-    private void OnGlimmerChanged(GlimmerChangedEvent eventArgs)
-    {
-        if(_cvarDisabled)
-            return;
-
-        if(eventArgs.Glimmer > 700)
-        {
-            _overlay.ActualGlimmerLevel = eventArgs.Glimmer;
-            if (!_overlayMan.HasOverlay<GlimmerOverlay>())
-            {
-                _overlay.Reset();
-                _overlayMan.AddOverlay(_overlay);
-            }
-        }
-        else
-        {
-            if (_overlayMan.HasOverlay<GlimmerOverlay>())
-            {
-                _overlayMan.RemoveOverlay(_overlay);
-            }
-        }
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _overlayMan.RemoveOverlay<GlimmerOverlay>();
-    }
-
-    private void OnDisableGlimmerShaderChanged(bool enabled)
-    {
-        _cvarDisabled = enabled;
-        if (enabled)
-            _overlayMan.RemoveOverlay(_overlay);
-        else if (_overlay.ActualGlimmerLevel > 700)
-            _overlayMan.AddOverlay(_overlay);
-    }
-
-}
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
index 67c0eeb2661..b1814c2741d 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
@@ -147,7 +147,7 @@ private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<A
         var targetXform = _transform.GetWorldPosition(ent);
         _transform.SetWorldPosition(anomaly, targetXform);
 
-        if (ent.Comp.PulseOnConnect && !anomaly.Comp.CannotRandomPulse) // imp - added cannotrandompulse
+        if (ent.Comp.PulseOnConnect)
             _anomaly.DoAnomalyPulse(anomaly, anomaly);
 
         _popup.PopupEntity(Loc.GetString("anomaly-sync-connected"), ent, PopupType.Medium);
@@ -163,7 +163,7 @@ private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, Ent
 
         if (TryComp<AnomalyComponent>(other, out var anomaly))
         {
-            if (ent.Comp.PulseOnDisconnect && !anomaly.CannotRandomPulse) // imp - added cannotrandompulse
+            if (ent.Comp.PulseOnDisconnect)
                 _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
         }
 
diff --git a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
index 753a10eeef6..bd4718e8e35 100644
--- a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
@@ -50,9 +50,6 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<ElectricityAnomalyComponent, AnomalyComponent, TransformComponent>();
         while (query.MoveNext(out var uid, out var elec, out var anom, out var xform))
         {
-            if (anom.CannotRandomPulse) // imp. added CannotRandomPulse
-                continue;
-
             if (_timing.CurTime < elec.NextSecond)
                 continue;
             elec.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
index 828db09ce0b..ff644ad3e00 100644
--- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
@@ -96,11 +96,8 @@ private void AddAnomalyToBody(Entity<InnerBodyAnomalyComponent> ent)
 
         EntityManager.AddComponents(ent, injectedAnom.Components);
 
-        if (!ent.Comp.SkipStun) // imp. added this check for anomalites
-        {
-            _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
-            _jitter.DoJitter(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
-        }
+        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
+        _jitter.DoJitter(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
 
         if (ent.Comp.StartSound is not null)
             _audio.PlayPvs(ent.Comp.StartSound, ent);
@@ -128,8 +125,7 @@ private void AddAnomalyToBody(Entity<InnerBodyAnomalyComponent> ent)
 
     private void OnAnomalyPulse(Entity<InnerBodyAnomalyComponent> ent, ref AnomalyPulseEvent args)
     {
-        if (!ent.Comp.SkipStun) // imp. added this check for anomalites
-            _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity), true);
+        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity), true);
         _jitter.DoJitter(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity), true);
     }
 
@@ -217,8 +213,7 @@ private void RemoveAnomalyFromBody(Entity<InnerBodyAnomalyComponent> ent)
         if (_proto.TryIndex(ent.Comp.InjectionProto, out var injectedAnom))
             EntityManager.RemoveComponents(ent, injectedAnom.Components);
 
-        if (!ent.Comp.SkipStun) // imp. added this check for anomalites
-            _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
+        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
 
         if (ent.Comp.EndMessage is not null &&
             _mind.TryGetMind(ent, out _, out var mindComponent) &&
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index 6893940a97e..f38ec3fef60 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -252,128 +252,6 @@ public void ScrubInto(GasMixture mixture, GasMixture destination, IReadOnlyColle
             Merge(destination, buffer);
         }
 
-        /// <summary>
-        /// Calculates the dimensionless fraction of gas required to equalize pressure between two gas mixtures.
-        /// </summary>
-        /// <param name="gasMixture1">The first gas mixture involved in the pressure equalization.
-        /// This mixture should be the one you always expect to be the highest pressure.</param>
-        /// <param name="gasMixture2">The second gas mixture involved in the pressure equalization.</param>
-        /// <returns>A float (from 0 to 1) representing the dimensionless fraction of gas that needs to be transferred from the
-        /// mixture of higher pressure to the mixture of lower pressure.</returns>
-        /// <remarks>
-        /// <para>
-        /// This properly takes into account the effect
-        /// of gas merging from inlet to outlet affecting the temperature
-        /// (and possibly increasing the pressure) in the outlet.
-        /// </para>
-        /// <para>
-        /// The gas is assumed to expand freely,
-        /// so the temperature of the gas with the greater pressure is not changing.
-        /// </para>
-        /// </remarks>
-        /// <example>
-        /// If you want to calculate the moles required to equalize pressure between an inlet and an outlet,
-        /// multiply the fraction returned by the source moles.
-        /// </example>
-        public float FractionToEqualizePressure(GasMixture gasMixture1, GasMixture gasMixture2)
-        {
-            /*
-            Problem: the gas being merged from the inlet to the outlet could affect the
-            temp. of the gas and cause a pressure rise.
-            We want the pressure to be equalized, so we have to account for this.
-
-            For clarity, let's assume that gasMixture1 is the inlet and gasMixture2 is the outlet.
-
-            We require mechanical equilibrium, so \( P_1' = P_2' \)
-
-            Before the transfer, we have:
-            \( P_1 = \frac{n_1 R T_1}{V_1} \)
-            \( P_2 = \frac{n_2 R T_2}{V_2} \)
-
-            After removing fraction \( x \) moles from the inlet, we have:
-            \( P_1' = \frac{(1 - x) n_1 R T_1}{V_1} \)
-
-            The outlet will gain the same \( x n_1 \) moles of gas.
-            So \( n_2' = n_2 + x n_1 \)
-
-            After mixing, the outlet temperature will be changed.
-            Denote the new mixture temperature as \( T_2' \).
-            Volume is constant.
-            So we have:
-            \( P_2' = \frac{(n_2 + x n_1) R T_2}{V_2} \)
-
-            The total energy of the incoming inlet to outlet gas at \( T_1 \) plus the existing energy of the outlet gas at \( T_2 \)
-            will be equal to the energy of the new outlet gas at \( T_2' \).
-            This leads to the following derivation:
-            \( x n_1 C_1 T_1 + n_2 C_2 T_2 = (x n_1 C_1 + n_2 C_2) T_2' \)
-
-            Where \( C_1 \) and \( C_2 \) are the heat capacities of the inlet and outlet gases, respectively.
-
-            Solving for \( T_2' \) gives us:
-            \( T_2' = \frac{x n_1 C_1 T_1 + n_2 C_2 T_2}{x n_1 C_1 + n_2 C_2} \)
-
-            Once again, we require mechanical equilibrium (\( P_1' = P_2' \)),
-            so we can substitute \( T_2' \) into the pressure equation:
-
-            \( \frac{(1 - x) n_1 R T_1}{V_1} =
-            \frac{(n_2 + x n_1) R}{V_2} \cdot
-            \frac{x n_1 C_1 T_1 + n_2 C_2 T_2}
-            {x n_1 C_1 + n_2 C_2} \)
-
-            Now it's a matter of solving for \( x \).
-            Not going to show the full derivation here, just steps.
-            1. Cancel common factor \( R \).
-            2. Multiply both sides by \( x n_1 C_1 + n_2 C_2 \), so that everything
-            becomes a polynomial in terms of \( x \).
-            3. Expand both sides.
-            4. Collect like powers of \( x \).
-            5. After collecting, you should end up with a polynomial of the form:
-
-            \( (-n_1 C_1 T_1 (1 + \frac{V_2}{V_1})) x^2 +
-            (n_1 T_1 \frac{V_2}{V_1} (C_1 - C_2) - n_2 C_1 T_1 - n_1 C_2 T_2) x +
-            (n_1 T_1 \frac{V_2}{V_1} C_2 - n_2 C_2 T_2) = 0 \)
-
-            Divide through by \( n_1 C_1 T_1 \) and replace each ratio with a symbol for clarity:
-            \( k_V = \frac{V_2}{V_1} \)
-            \( k_n = \frac{n_2}{n_1} \)
-            \( k_T = \frac{T_2}{T_1} \)
-            \( k_C = \frac{C_2}{C_1} \)
-            */
-
-            // Ensure that P_1 > P_2 so the quadratic works out.
-            if (gasMixture1.Pressure < gasMixture2.Pressure)
-            {
-                (gasMixture1, gasMixture2) = (gasMixture2, gasMixture1);
-            }
-
-            // Establish the dimensionless ratios.
-            var volumeRatio = gasMixture2.Volume / gasMixture1.Volume;
-            var molesRatio = gasMixture2.TotalMoles / gasMixture1.TotalMoles;
-            var temperatureRatio = gasMixture2.Temperature / gasMixture1.Temperature;
-            var heatCapacityRatio = GetHeatCapacity(gasMixture2) / GetHeatCapacity(gasMixture1);
-
-            // The quadratic equation is solved for the transfer fraction.
-            var quadraticA = 1 + volumeRatio;
-            var quadraticB = molesRatio - volumeRatio + heatCapacityRatio * (temperatureRatio + volumeRatio);
-            var quadraticC = heatCapacityRatio * (molesRatio * temperatureRatio - volumeRatio);
-
-            return (-quadraticB + MathF.Sqrt(quadraticB * quadraticB - 4 * quadraticA * quadraticC)) / (2 * quadraticA);
-        }
-
-        /// <summary>
-        /// Determines the number of moles that need to be removed from a <see cref="GasMixture"/> to reach a target pressure threshold.
-        /// </summary>
-        /// <param name="gasMixture">The gas mixture whose moles and properties will be used in the calculation.</param>
-        /// <param name="targetPressure">The target pressure threshold to calculate against.</param>
-        /// <returns>The difference in moles required to reach the target pressure threshold.</returns>
-        /// <remarks>The temperature of the gas is assumed to be not changing due to a free expansion.</remarks>
-        public static float MolesToPressureThreshold(GasMixture gasMixture, float targetPressure)
-        {
-            // Kid named PV = nRT.
-            return gasMixture.TotalMoles -
-                   targetPressure * gasMixture.Volume / (Atmospherics.R * gasMixture.Temperature);
-        }
-
         /// <summary>
         ///     Checks whether a gas mixture is probably safe.
         ///     This only checks temperature and pressure, not gas composition.
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs
deleted file mode 100644
index 076d5adf8ec..00000000000
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Piping.Components;
-using Content.Server.NodeContainer.EntitySystems;
-using Content.Server.NodeContainer.Nodes;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Atmos.Piping;
-using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.Audio;
-using JetBrains.Annotations;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Atmos.Piping.Binary.EntitySystems;
-
-/// <summary>
-/// Handles serverside logic for pressure regulators. Gas will only flow through the regulator
-/// if the pressure on the inlet side is over a certain pressure threshold.
-/// See https://en.wikipedia.org/wiki/Pressure_regulator
-/// </summary>
-[UsedImplicitly]
-public sealed class GasPressureRegulatorSystem : SharedGasPressureRegulatorSystem
-{
-    [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GasPressureRegulatorComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<GasPressureRegulatorComponent, AtmosDeviceUpdateEvent>(OnPressureRegulatorUpdated);
-        SubscribeLocalEvent<GasPressureRegulatorComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(Entity<GasPressureRegulatorComponent> ent, ref MapInitEvent args)
-    {
-        ent.Comp.NextUiUpdate = _timing.CurTime + ent.Comp.UpdateInterval;
-    }
-
-    /// <summary>
-    /// Dirties the regulator every second or so, so that the UI can update.
-    /// The UI automatically updates after an AutoHandleStateEvent.
-    /// </summary>
-    /// <param name="frameTime"></param>
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<GasPressureRegulatorComponent>();
-
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (comp.NextUiUpdate > _timing.CurTime)
-                continue;
-
-            comp.NextUiUpdate += comp.UpdateInterval;
-
-            DirtyFields(uid,
-                comp,
-                null,
-                nameof(comp.InletPressure),
-                nameof(comp.OutletPressure),
-                nameof(comp.FlowRate));
-        }
-    }
-
-    private void OnInit(Entity<GasPressureRegulatorComponent> ent, ref ComponentInit args)
-    {
-        UpdateAppearance(ent);
-    }
-
-    /// <summary>
-    /// Handles the updating logic for the pressure regulator.
-    /// </summary>
-    /// <param name="ent"> the <see cref="Entity{T}" /> of the pressure regulator</param>
-    /// <param name="args"> Args provided to us via <see cref="AtmosDeviceUpdateEvent" /></param>
-    private void OnPressureRegulatorUpdated(Entity<GasPressureRegulatorComponent> ent,
-        ref AtmosDeviceUpdateEvent args)
-    {
-        if (!_nodeContainer.TryGetNodes(ent.Owner,
-                ent.Comp.InletName,
-                ent.Comp.OutletName,
-                out PipeNode? inletPipeNode,
-                out PipeNode? outletPipeNode))
-        {
-            ChangeStatus(false, ent, inletPipeNode, outletPipeNode, 0);
-            return;
-        }
-
-        /*
-        It's time for some math! :)
-
-        Gas is simply transferred from the inlet to the outlet, restricted by flow rate and pressure.
-        We want to transfer enough gas to bring the inlet pressure below the threshold,
-        and only as much as our max flow rate allows.
-
-        The equations:
-        PV = nRT
-        P1 = P2
-
-        Can be used to calculate the amount of gas we need to transfer.
-        */
-
-        var p1 = inletPipeNode.Air.Pressure;
-        var p2 = outletPipeNode.Air.Pressure;
-
-        if (p1 <= ent.Comp.Threshold || p2 >= p1)
-        {
-            ChangeStatus(false, ent, inletPipeNode, outletPipeNode, 0);
-            return;
-        }
-
-        var t1 = inletPipeNode.Air.Temperature;
-
-        // First, calculate the amount of gas we need to transfer to bring us below the threshold.
-        var deltaMolesToPressureThreshold =
-            AtmosphereSystem.MolesToPressureThreshold(inletPipeNode.Air, ent.Comp.Threshold);
-
-        // Second, calculate the moles required to equalize the pressure.
-        // We round here to avoid the valve staying enabled for 0.00001 pressure differences.
-        var deltaMolesToEqualizePressure =
-            float.Round(_atmosphere.FractionToEqualizePressure(inletPipeNode.Air, outletPipeNode.Air) *
-                        inletPipeNode.Air.TotalMoles,
-                1,
-                MidpointRounding.ToPositiveInfinity);
-
-        // Third, make sure we only transfer the minimum of the two.
-        // We do this so that we don't accidentally transfer so much gas to the point
-        // where the outlet pressure is higher than the inlet.
-        var deltaMolesToTransfer = Math.Min(deltaMolesToPressureThreshold, deltaMolesToEqualizePressure);
-
-        // Fourth, convert to the desired volume to transfer.
-        var desiredVolumeToTransfer = deltaMolesToTransfer * ((Atmospherics.R * t1) / p1);
-
-        // And finally, limit the transfer volume to the max flow rate of the valve.
-        var actualVolumeToTransfer = Math.Min(desiredVolumeToTransfer,
-            ent.Comp.MaxTransferRate * _atmosphere.PumpSpeedup() * args.dt);
-
-        // We remove the gas from the inlet and merge it into the outlet.
-        var removed = inletPipeNode.Air.RemoveVolume(actualVolumeToTransfer);
-        _atmosphere.Merge(outletPipeNode.Air, removed);
-
-        // Calculate the flow rate in L/s for the UI.
-        var sentFlowRate = MathF.Round(actualVolumeToTransfer / args.dt, 1);
-
-        ChangeStatus(true, ent, inletPipeNode, outletPipeNode, sentFlowRate);
-    }
-
-    /// <summary>
-    /// Updates the visual appearance of the pressure regulator based on its current state.
-    /// </summary>
-    /// <param name="ent">The <see cref="Entity{GasPressureRegulatorComponent, AppearanceComponent}"/>
-    /// representing the pressure regulator with respective components.</param>
-    private void UpdateAppearance(Entity<GasPressureRegulatorComponent> ent)
-    {
-        _appearance.SetData(ent,
-            PressureRegulatorVisuals.State,
-            ent.Comp.Enabled);
-    }
-
-    /// <summary>
-    /// Updates the pressure regulator's appearance and sound based on its current state, while
-    /// also preventing network spamming.
-    /// Also prepares data for dirtying.
-    /// </summary>
-    /// <param name="enabled">The new state to set</param>
-    /// <param name="ent">The pressure regulator to update</param>
-    /// <param name="inletNode">The inlet node of the pressure regulator</param>
-    /// <param name="outletNode">The outlet node of the pressure regulator</param>
-    /// <param name="flowRate">Current flow rate of the pressure regulator</param>
-    private void ChangeStatus(bool enabled,
-        Entity<GasPressureRegulatorComponent> ent,
-        PipeNode? inletNode,
-        PipeNode? outletNode,
-        float flowRate)
-    {
-        // First, set data on the component server-side.
-        ent.Comp.InletPressure = inletNode?.Air.Pressure ?? 0f;
-        ent.Comp.OutletPressure = outletNode?.Air.Pressure ?? 0f;
-        ent.Comp.FlowRate = flowRate;
-
-        // We need to prevent spamming the network with updates, so only check if we've
-        // switched states.
-        if (ent.Comp.Enabled == enabled)
-            return;
-
-        ent.Comp.Enabled = enabled;
-        _ambientSound.SetAmbience(ent, enabled);
-        UpdateAppearance(ent);
-
-        // The regulator has changed state, so we need to dirty all applicable fields *right now* so the UI updates
-        // at the same time as everything else.
-        DirtyFields(ent.AsNullable(),
-            null,
-            nameof(ent.Comp.InletPressure),
-            nameof(ent.Comp.OutletPressure),
-            nameof(ent.Comp.FlowRate));
-    }
-}
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index ca406e20256..ac0455c9a77 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -115,11 +115,6 @@ private void OnGhostVis(Entity<GhostComponent> ent, ref GetVisMaskEvent args)
             if (ent.Comp.LifeStage <= ComponentLifeStage.Running)
             {
                 args.VisibilityMask |= (int)VisibilityFlags.Ghost;
-                // Begin DeltaV additions
-                args.VisibilityMask |= (int)VisibilityFlags.TelegnosticProjection;
-                args.VisibilityMask |= (int)VisibilityFlags.PsionicInvisibility;
-                args.VisibilityMask |= (int)VisibilityFlags.CosmicCultMonument;
-                // End DeltaV additions
             }
         }
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
index 88be146934e..381d59d55a6 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -138,20 +138,15 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args)
             if (args.Handled)
                 return;
 
+            if (!HasComp<MindSwappedComponent>(args.Mind.CurrentEntity))
+                return;
+
             //No idea where the viaCommand went. It's on the internal OnGhostAttempt, but not this layer. Maybe unnecessary.
             /*if (!args.viaCommand)
                 return;*/
 
-            // DeltaV - start of trapped ghost fix
-            // If you're able to swap back to your original body, you should swap back before you ghost.
-            if (TryComp<MindSwappedComponent>(args.Mind.CurrentEntity, out var component)
-                && _actions.GetAction(component.MindSwapReturnActionEntity) is { } action
-                && action.Comp.AttachedEntity is not null)
-            {
-                args.Result = false;
-                args.Handled = true;
-            }
-            // DeltaV - end of trapped ghost fix
+            args.Result = false;
+            args.Handled = true;
         }
 
         private void OnSwapInit(EntityUid uid, MindSwappedComponent component, ComponentInit args)
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index dfd28ee9edd..282290e4694 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -7,7 +7,6 @@
 using Content.Server.Station.Systems;
 using Content.Server.Store.Systems;
 using Content.Server.Traitor.Uplink;
-using Content.Shared._DV.CCVars; // DeltaV - PDA date
 using Content.Shared.Access.Components;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.Chat;
@@ -20,7 +19,6 @@
 using Content.Shared.PDA.Ringer;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
-using Robust.Shared.Configuration; // DeltaV - PDA date
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
@@ -39,9 +37,6 @@ public sealed class PdaSystem : SharedPdaSystem
         [Dependency] private readonly UnpoweredFlashlightSystem _unpoweredFlashlight = default!;
         [Dependency] private readonly ContainerSystem _containerSystem = default!;
         [Dependency] private readonly IdCardSystem _idCard = default!;
-        [Dependency] private readonly IConfigurationManager _config = default!; // DeltaV
-
-        private static DateTime ServerDate; // DeltaV - PDA
 
         public override void Initialize()
         {
@@ -64,13 +59,6 @@ public override void Initialize()
             SubscribeLocalEvent<EntityRenamedEvent>(OnEntityRenamed, after: new[] { typeof(IdCardSystem) });
             SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertLevelChanged);
             SubscribeLocalEvent<PdaComponent, InventoryRelayedEvent<ChameleonControllerOutfitSelectedEvent>>(ChameleonControllerOutfitItemSelected);
-
-            // Begin DeltaV additions
-            Subs.CVar(_config,
-                DCCVars.YearOffset,
-                value => ServerDate = DateTime.Today.AddYears(value),
-                true);
-            // End DeltaV additions
         }
 
         private void ChameleonControllerOutfitItemSelected(Entity<PdaComponent> ent, ref InventoryRelayedEvent<ChameleonControllerOutfitSelectedEvent> args)
@@ -201,7 +189,6 @@ public override void UpdatePdaUi(EntityUid uid, PdaComponent? pda = null)
             var hasInstrument = HasComp<InstrumentComponent>(uid);
             var showUplink = HasComp<UplinkComponent>(uid) && IsUnlocked(uid);
 
-            pda.CurrentDate = pda.DateOverride ?? ServerDate; // DeltaV - PDA date
             UpdateStationName(uid, pda);
             UpdateAlertLevel(uid, pda);
             // TODO: Update the level and name of the station with each call to UpdatePdaUi is only needed for latejoin players.
@@ -224,7 +211,6 @@ public override void UpdatePdaUi(EntityUid uid, PdaComponent? pda = null)
                     ActualOwnerName = pda.OwnerName,
                     IdOwner = id?.FullName,
                     JobTitle = id?.LocalizedJobTitle,
-                    CurrentDate = pda.CurrentDate, // DeltaV - PDA date
                     StationAlertLevel = pda.StationAlertLevel,
                     StationAlertColor = pda.StationAlertColor
                 },
diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs
index d460e42fe40..7511e60cdec 100644
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -170,15 +170,8 @@ private void OnAirtightChange(ref AirtightChanged args)
 
     private void OnNavMapBeaconMapInit(EntityUid uid, NavMapBeaconComponent component, MapInitEvent args)
     {
-        // DeltaV - start of beacon map bugfix
         if (component.DefaultText == null || component.Text != null)
-        {
-            // temporary fix until issue is resolved upstream:
-            // https://github.com/space-wizards/space-station-14/issues/37691
-            UpdateNavMapBeaconData(uid, component);
             return;
-        }
-        // DeltaV - end of beacon map bugfix
 
         component.Text = Loc.GetString(component.DefaultText);
         Dirty(uid, component);
diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs
index 0b958cffd40..eebf9cbbfde 100644
--- a/Content.Server/Pinpointer/PinpointerSystem.cs
+++ b/Content.Server/Pinpointer/PinpointerSystem.cs
@@ -5,6 +5,7 @@
 using Robust.Shared.Utility;
 using Content.Server.Shuttles.Events;
 using Content.Shared.IdentityManagement;
+
 namespace Content.Server.Pinpointer;
 
 public sealed class PinpointerSystem : SharedPinpointerSystem
@@ -50,7 +51,7 @@ private void OnActivate(EntityUid uid, PinpointerComponent component, ActivateIn
         TogglePinpointer(uid, component);
 
         if (!component.CanRetarget)
-            LocateTarget(uid, component, args); //#IMP args
+            LocateTarget(uid, component);
 
         args.Handled = true;
     }
@@ -72,8 +73,7 @@ private void OnLocateTarget(ref FTLCompletedEvent ev)
         }
     }
 
-    //#IMP ActivateInWorldEvent args: added this
-    private void LocateTarget(EntityUid uid, PinpointerComponent component, ActivateInWorldEvent? args = null)
+    private void LocateTarget(EntityUid uid, PinpointerComponent component)
     {
         // try to find target from whitelist
         if (component.IsActive && component.Component != null)
diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs
index 21fc18f5f92..14fac0bab8f 100644
--- a/Content.Server/Speech/EntitySystems/VocalSystem.cs
+++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs
@@ -29,7 +29,6 @@ public override void Initialize()
         SubscribeLocalEvent<VocalComponent, SexChangedEvent>(OnSexChanged);
         SubscribeLocalEvent<VocalComponent, EmoteEvent>(OnEmote);
         SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnScreamAction);
-        SubscribeLocalEvent<VocalComponent, SoundsChangedEvent>(OnSoundsChanged); // DeltaV - support for changing vocal sounds on the go. Why it wasn't there in the first place is beyond me.
     }
 
     private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
@@ -53,13 +52,6 @@ private void OnSexChanged(EntityUid uid, VocalComponent component, SexChangedEve
         LoadSounds(uid, component, args.NewSex);
     }
 
-// Begin DeltaV additions
-    private void OnSoundsChanged(EntityUid uid, VocalComponent component, ref SoundsChangedEvent args)
-    {
-        LoadSounds(uid, component);
-    }
-// End DeltaV additions
-
     private void OnEmote(EntityUid uid, VocalComponent component, ref EmoteEvent args)
     {
         if (args.Handled || !args.Emote.Category.HasFlag(EmoteCategory.Vocal))
diff --git a/Content.Server/_DV/CosmicCult/Abilities/CosmicConversionSystem.cs b/Content.Server/_DV/CosmicCult/Abilities/CosmicConversionSystem.cs
index 56ca69061ef..6d83aa3970c 100644
--- a/Content.Server/_DV/CosmicCult/Abilities/CosmicConversionSystem.cs
+++ b/Content.Server/_DV/CosmicCult/Abilities/CosmicConversionSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared._DV.CosmicCult.Components;
 using Content.Shared._DV.CosmicCult;
 using Content.Shared.Damage;
-using Content.Shared.Mind;
 using Content.Shared.Mindshield.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
@@ -23,17 +22,15 @@ public sealed class CosmicConversionSystem : EntitySystem
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedCosmicCultSystem _cosmicCult = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
-    [Dependency] private readonly SharedMindSystem _mind = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<CosmicGlyphConversionComponent, TryActivateGlyphEvent>(OnConversionGlyph);
-        SubscribeLocalEvent<CosmicGlyphConversionComponent, CheckGlyphConditionsEvent>(OnCheckGlyphConditions);
     }
 
-    private void OnCheckGlyphConditions(Entity<CosmicGlyphConversionComponent> uid, ref CheckGlyphConditionsEvent args)
+    private void OnConversionGlyph(Entity<CosmicGlyphConversionComponent> uid, ref TryActivateGlyphEvent args)
     {
         var possibleTargets = _cosmicGlyph.GetTargetsNearGlyph(uid, uid.Comp.ConversionRange, entity => _cosmicCult.EntityIsCultist(entity));
         if (possibleTargets.Count == 0)
@@ -48,28 +45,6 @@ private void OnCheckGlyphConditions(Entity<CosmicGlyphConversionComponent> uid,
             args.Cancel();
             return;
         }
-        foreach (var target in possibleTargets)
-        {
-            if (!_mind.TryGetMind(target, out _, out _))
-            {
-                _popup.PopupEntity(Loc.GetString("cult-glyph-target-mindless"), uid, args.User);
-                args.Cancel();
-                return;
-            }
-        }
-    }
-
-    private void OnConversionGlyph(Entity<CosmicGlyphConversionComponent> uid, ref TryActivateGlyphEvent args)
-    {
-        var ev = new CheckGlyphConditionsEvent(args.User, args.Cultists);
-        RaiseLocalEvent(uid, ref ev);
-        if (ev.Cancelled)
-        {
-            args.Cancel();
-            return;
-        }
-
-        var possibleTargets = _cosmicGlyph.GetTargetsNearGlyph(uid, uid.Comp.ConversionRange, entity => _cosmicCult.EntityIsCultist(entity));
 
         foreach (var target in possibleTargets)
         {
diff --git a/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs b/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs
index 76712d127f6..9fb9470d020 100644
--- a/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs
+++ b/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Alert;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Mind;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.NPC;
@@ -23,6 +24,7 @@ public sealed class CosmicSiphonSystem : EntitySystem
     [Dependency] private readonly GhostSystem _ghost = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly CosmicCultSystem _cosmicCult = default!;
@@ -56,11 +58,10 @@ private void OnCosmicSiphon(Entity<CosmicCultComponent> uid, ref EventCosmicSiph
         {
             DistanceThreshold = 2f,
             Hidden = true,
-            BreakOnHandChange = false,
+            BreakOnHandChange = true,
             BreakOnDamage = true,
             BreakOnMove = true,
-            BreakOnDropItem = false,
-            //TODO: make the cultist not rotate towards the target when we get #37958 from upstream
+            BreakOnDropItem = true,
         };
         args.Handled = true;
         _doAfter.TryStartDoAfter(doargs);
@@ -80,7 +81,8 @@ private void OnCosmicSiphonDoAfter(Entity<CosmicCultComponent> uid, ref EventCos
         uid.Comp.EntropyStored += uid.Comp.CosmicSiphonQuantity;
         uid.Comp.EntropyBudget += uid.Comp.CosmicSiphonQuantity;
         Dirty(uid, uid.Comp);
-        _statusEffects.TryAddStatusEffect<CosmicEntropyDebuffComponent>(target, "EntropicDegen", TimeSpan.FromSeconds(_random.Next(21) + 40), true); //40-60 seconds, 4-6 cold damage per siphon
+
+        _statusEffects.TryAddStatusEffect<CosmicEntropyDebuffComponent>(target, "EntropicDegen", TimeSpan.FromSeconds(21), true);
         if (_cosmicCult.EntityIsCultist(target))
         {
             _popup.PopupEntity(Loc.GetString("cosmicability-siphon-cultist-success", ("target", Identity.Entity(target, EntityManager))), uid, uid);
diff --git a/Content.Server/_DV/CosmicCult/Abilities/CosmicTransmuteSystem.cs b/Content.Server/_DV/CosmicCult/Abilities/CosmicTransmuteSystem.cs
index dda8ee1269f..cd08b9fef5e 100644
--- a/Content.Server/_DV/CosmicCult/Abilities/CosmicTransmuteSystem.cs
+++ b/Content.Server/_DV/CosmicCult/Abilities/CosmicTransmuteSystem.cs
@@ -17,11 +17,11 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<CosmicGlyphTransmuteComponent, TryActivateGlyphEvent>(OnTransmuteGlyph);
-        SubscribeLocalEvent<CosmicGlyphTransmuteComponent, CheckGlyphConditionsEvent>(OnCheckGlyphConditions);
     }
 
-    private void OnCheckGlyphConditions(Entity<CosmicGlyphTransmuteComponent> uid, ref CheckGlyphConditionsEvent args)
+    private void OnTransmuteGlyph(Entity<CosmicGlyphTransmuteComponent> uid, ref TryActivateGlyphEvent args)
     {
+        var tgtpos = Transform(uid).Coordinates;
         var possibleTargets = GatherEntities(uid);
         if (possibleTargets.Count == 0)
         {
@@ -29,20 +29,6 @@ private void OnCheckGlyphConditions(Entity<CosmicGlyphTransmuteComponent> uid, r
             args.Cancel();
             return;
         }
-    }
-
-    private void OnTransmuteGlyph(Entity<CosmicGlyphTransmuteComponent> uid, ref TryActivateGlyphEvent args)
-    {
-        var ev = new CheckGlyphConditionsEvent(args.User, args.Cultists);
-        RaiseLocalEvent(uid, ref ev);
-        if (ev.Cancelled)
-        {
-            args.Cancel();
-            return;
-        }
-
-        var tgtpos = Transform(uid).Coordinates;
-        var possibleTargets = GatherEntities(uid);
         var target = _random.Pick(possibleTargets);
         if (!TryComp<CosmicTransmutableComponent>(target, out var comp)) return;
         Spawn(comp.TransmutesTo, tgtpos);
diff --git a/Content.Server/_DV/CosmicCult/Components/CosmicMalignRiftComponent.cs b/Content.Server/_DV/CosmicCult/Components/CosmicMalignRiftComponent.cs
index 940d8b114e0..193d6a9cde0 100644
--- a/Content.Server/_DV/CosmicCult/Components/CosmicMalignRiftComponent.cs
+++ b/Content.Server/_DV/CosmicCult/Components/CosmicMalignRiftComponent.cs
@@ -1,11 +1,9 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server._DV.CosmicCult.Components;
 
 [RegisterComponent]
-[AutoGenerateComponentPause]
 public sealed partial class CosmicMalignRiftComponent : Component
 {
     [DataField]
@@ -31,24 +29,4 @@ public sealed partial class CosmicMalignRiftComponent : Component
 
     [DataField]
     public TimeSpan AbsorbTime = TimeSpan.FromSeconds(35);
-
-    [DataField]
-    public TimeSpan MinPulseTime = TimeSpan.FromSeconds(20);
-
-    [DataField]
-    public TimeSpan MaxPulseTime = TimeSpan.FromSeconds(60);
-
-    [DataField]
-    public float PulseRange = 15f;
-    /// <summary>
-    /// The chance for each entity in range to be affected by a pulse
-    /// </summary>
-    [DataField]
-    public float PulseProb = 0.75f;
-
-    [AutoPausedField, DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    public TimeSpan NextPulseTime = default!;
-
-    [DataField]
-    public EntProtoId PulseVFX = "CosmicGenericVFX";
 }
diff --git a/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs b/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs
index 047ebe3899a..b565acda370 100644
--- a/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs
+++ b/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs
@@ -12,11 +12,11 @@
 using Content.Server._EE.Radio;
 using Content.Shared.Alert;
 using Content.Shared.DoAfter;
+using Content.Shared.Examine;
 using Content.Shared.Eye;
 using Content.Shared.Hands;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Speech.Components;
 using Content.Shared.StatusEffect;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -29,7 +29,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Radio;
 using Content.Server.Radio.Components;
-using Content.Shared.Examine;
 
 namespace Content.Server._DV.CosmicCult;
 
@@ -74,8 +73,8 @@ public override void Initialize()
         SubscribeLocalEvent<CosmicCultLeadComponent, ComponentInit>(OnStartCultLead);
         SubscribeLocalEvent<CosmicCultComponent, GetVisMaskEvent>(OnGetVisMask);
 
-        SubscribeLocalEvent<CosmicEquipmentComponent, GotEquippedEvent>(OnGotCosmicItemEquipped);
-        SubscribeLocalEvent<CosmicEquipmentComponent, GotUnequippedEvent>(OnGotCosmicItemUnequipped);
+        SubscribeLocalEvent<CosmicEquipmentComponent, GotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<CosmicEquipmentComponent, GotUnequippedEvent>(OnGotUnequipped);
         SubscribeLocalEvent<CosmicEquipmentComponent, GotEquippedHandEvent>(OnGotHeld);
         SubscribeLocalEvent<CosmicEquipmentComponent, GotUnequippedHandEvent>(OnGotUnheld);
 
@@ -86,10 +85,9 @@ public override void Initialize()
         SubscribeLocalEvent<CosmicImposingComponent, ComponentRemove>(OnEndImposition);
         SubscribeLocalEvent<CosmicImposingComponent, RefreshMovementSpeedModifiersEvent>(OnImpositionMoveSpeed);
 
-        SubscribeLocalEvent<CosmicCultComponent, EncryptionChannelsChangedEvent>(OnTransmitterChannelsChangedCult, after: new[] { typeof(IntrinsicRadioKeySystem) });
+        SubscribeLocalEvent<CosmicCultExamineComponent, ExaminedEvent>(OnCosmicCultExamined);
 
-        SubscribeLocalEvent<SpeechOverrideComponent, GotEquippedEvent>(OnGotSpeechOverrideEquipped);
-        SubscribeLocalEvent<SpeechOverrideComponent, GotUnequippedEvent>(OnGotSpeechOverrideUnequipped);
+        SubscribeLocalEvent<CosmicCultComponent, EncryptionChannelsChangedEvent>(OnTransmitterChannelsChangedCult, after: new[] { typeof(IntrinsicRadioKeySystem) });
 
         SubscribeFinale(); //Hook up the cosmic cult finale system
     }
@@ -154,16 +152,13 @@ private void OnGetVisMask(Entity<CosmicCultComponent> uid, ref GetVisMaskEvent a
     #endregion
 
     #region Equipment Pickup
-    private void OnGotCosmicItemEquipped(Entity<CosmicEquipmentComponent> ent, ref GotEquippedEvent args)
+    private void OnGotEquipped(Entity<CosmicEquipmentComponent> ent, ref GotEquippedEvent args)
     {
         if (!EntityIsCultist(args.Equipee))
-        {
             _statusEffects.TryAddStatusEffect<CosmicEntropyDebuffComponent>(args.Equipee, EntropicDegen, TimeSpan.FromDays(1), true); // TimeSpan.MaxValue causes a crash here, so we use FromDays(1) instead.
-            if (TryComp<CosmicEntropyDebuffComponent>(args.Equipee, out var comp)) comp.Degen = new(){DamageDict = new(){{"Cold", 0.5}, {"Asphyxiation", 1.5}}};
-        }
     }
 
-    private void OnGotCosmicItemUnequipped(Entity<CosmicEquipmentComponent> ent, ref GotUnequippedEvent args)
+    private void OnGotUnequipped(Entity<CosmicEquipmentComponent> ent, ref GotUnequippedEvent args)
     {
         if (!EntityIsCultist(args.Equipee))
             _statusEffects.TryRemoveStatusEffect(args.Equipee, EntropicDegen);
@@ -173,7 +168,6 @@ private void OnGotHeld(Entity<CosmicEquipmentComponent> ent, ref GotEquippedHand
         if (!EntityIsCultist(args.User))
         {
             _statusEffects.TryAddStatusEffect<CosmicEntropyDebuffComponent>(args.User, EntropicDegen, TimeSpan.FromDays(1), true);
-            if (TryComp<CosmicEntropyDebuffComponent>(args.User, out var comp)) comp.Degen = new(){DamageDict = new(){{"Cold", 0.5}, {"Asphyxiation", 1.5}}};
             _popup.PopupEntity(Loc.GetString("cosmiccult-gear-pickup", ("ITEM", args.Equipped)), args.User, args.User, PopupType.MediumCaution);
         }
     }
@@ -183,24 +177,6 @@ private void OnGotUnheld(Entity<CosmicEquipmentComponent> ent, ref GotUnequipped
         if (!EntityIsCultist(args.User))
             _statusEffects.TryRemoveStatusEffect(args.User, EntropicDegen);
     }
-
-    private void OnGotSpeechOverrideEquipped(Entity<SpeechOverrideComponent> ent, ref GotEquippedEvent args)
-    {
-        if (ent.Comp.OverrideIDs is not { } overrides || !TryComp<VocalComponent>(args.Equipee, out var vocalComp)) return;
-        ent.Comp.StoredIDs = vocalComp.Sounds;
-        vocalComp.Sounds = overrides;
-        var ev = new SoundsChangedEvent();
-        RaiseLocalEvent(args.Equipee, ref ev);
-    }
-
-    private void OnGotSpeechOverrideUnequipped(Entity<SpeechOverrideComponent> ent, ref GotUnequippedEvent args)
-    {
-        if (ent.Comp.StoredIDs is not { } stored || !TryComp<VocalComponent>(args.Equipee, out var vocalComp)) return;
-        ent.Comp.StoredIDs = null;
-        vocalComp.Sounds = stored;
-        var ev = new SoundsChangedEvent();
-        RaiseLocalEvent(args.Equipee, ref ev);
-    }
     #endregion
 
     #region Movespeed
@@ -215,10 +191,12 @@ private void OnEndInfluenceStride(Entity<InfluenceStrideComponent> uid, ref Comp
     private void OnStartImposition(Entity<CosmicImposingComponent> uid, ref ComponentInit args) // these functions just make sure
     {
         _movementSpeed.RefreshMovementSpeedModifiers(uid);
+        EnsureComp<CosmicCultExamineComponent>(uid).CultistText = "cosmic-examine-text-malignecho";
     }
     private void OnEndImposition(Entity<CosmicImposingComponent> uid, ref ComponentRemove args) // as various cosmic cult effects get added and removed
     {
         _movementSpeed.RefreshMovementSpeedModifiers(uid);
+        RemComp<CosmicCultExamineComponent>(uid);
     }
 
     private void OnRefreshMoveSpeed(EntityUid uid, InfluenceStrideComponent comp, RefreshMovementSpeedModifiersEvent args)
diff --git a/Content.Server/_DV/CosmicCult/CosmicGlyphSystem.cs b/Content.Server/_DV/CosmicCult/CosmicGlyphSystem.cs
index b505c7f3359..4905fa2a9ae 100644
--- a/Content.Server/_DV/CosmicCult/CosmicGlyphSystem.cs
+++ b/Content.Server/_DV/CosmicCult/CosmicGlyphSystem.cs
@@ -10,11 +10,10 @@
 using Robust.Server.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
-using Robust.Shared.Timing;
 
 namespace Content.Server._DV.CosmicCult;
 
-public sealed class CosmicGlyphSystem : SharedCosmicGlyphSystem
+public sealed class CosmicGlyphSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
@@ -23,47 +22,27 @@ public sealed class CosmicGlyphSystem : SharedCosmicGlyphSystem
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedCosmicCultSystem _cosmicCult = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
 
     private readonly HashSet<Entity<CosmicCultComponent>> _cultists = [];
     private readonly HashSet<Entity<HumanoidAppearanceComponent>> _humanoids = [];
 
     public override void Initialize()
     {
+        SubscribeLocalEvent<CosmicGlyphComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<CosmicGlyphComponent, ActivateInWorldEvent>(OnUseGlyph);
-        SubscribeLocalEvent<CosmicGlyphComponent, ComponentStartup>(OnGlyphCreated);
     }
 
     #region Base trigger
 
-    private void OnGlyphCreated(Entity<CosmicGlyphComponent> ent, ref ComponentStartup args)
+    private void OnExamine(Entity<CosmicGlyphComponent> uid, ref ExaminedEvent args)
     {
-        ent.Comp.Timer = _timing.CurTime + ent.Comp.SpawnTime;
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var glyphQuery = EntityQueryEnumerator<CosmicGlyphComponent>();
-        while (glyphQuery.MoveNext(out var uid, out var comp))
+        if (_cosmicCult.EntityIsCultist(args.Examiner))
+        {
+            args.PushMarkup(Loc.GetString("cosmic-examine-glyph-cultcount", ("COUNT", uid.Comp.RequiredCultists)));
+        }
+        else
         {
-            if (_timing.CurTime < comp.Timer) continue;
-            if (comp.State == GlyphStatus.Spawning || comp.State == GlyphStatus.Cooldown)
-            {
-                _appearance.SetData(uid, GlyphVisuals.Status, GlyphStatus.Ready);
-                comp.State = GlyphStatus.Ready;
-                return;
-            }
-            if (comp.State == GlyphStatus.Active)
-            {
-                ActivateGlyph(new Entity<CosmicGlyphComponent>(uid, comp));
-            }
-            if (comp.State == GlyphStatus.Despawning)
-            {
-                QueueDel(uid);
-            }
+            args.PushMarkup(Loc.GetString("cosmic-examine-text-glyphs"));
         }
     }
 
@@ -71,7 +50,7 @@ private void OnUseGlyph(Entity<CosmicGlyphComponent> uid, ref ActivateInWorldEve
     {
         var tgtpos = Transform(uid).Coordinates;
         var userCoords = Transform(args.User).Coordinates;
-        if (args.Handled || !userCoords.TryDistance(EntityManager, tgtpos, out var distance) || distance > uid.Comp.ActivationRange || !_cosmicCult.EntityIsCultist(args.User) || uid.Comp.State != GlyphStatus.Ready)
+        if (args.Handled || !userCoords.TryDistance(EntityManager, tgtpos, out var distance) || distance > uid.Comp.ActivationRange || !_cosmicCult.EntityIsCultist(args.User))
             return;
         var cultists = GatherCultists(uid, uid.Comp.ActivationRange);
         if (cultists.Count < uid.Comp.RequiredCultists)
@@ -80,60 +59,21 @@ private void OnUseGlyph(Entity<CosmicGlyphComponent> uid, ref ActivateInWorldEve
             return;
         }
 
-        var ev = new CheckGlyphConditionsEvent(args.User, cultists);
-        RaiseLocalEvent(uid, ref ev);
-        if (ev.Cancelled) return;
-
         args.Handled = true;
-        uid.Comp.User = args.User;
-        if (uid.Comp.ActivationTime > TimeSpan.FromSeconds(0))
-        {
-            _appearance.SetData(uid, GlyphVisuals.Status, GlyphStatus.Active);
-            uid.Comp.State = GlyphStatus.Active;
-            uid.Comp.Timer = _timing.CurTime + uid.Comp.ActivationTime;
-            _audio.PlayPvs(uid.Comp.ChargeSFX, Transform(uid).Coordinates);
-        }
-        else ActivateGlyph(uid);
-    }
-
-    private void ActivateGlyph(Entity<CosmicGlyphComponent> ent)
-    {
-        if (ent.Comp.EraseOnUse)
-        {
-            EraseGlyph(ent);
-        }
-        else if (ent.Comp.CooldownTime > TimeSpan.FromSeconds(0))
-        {
-            _appearance.SetData(ent, GlyphVisuals.Status, GlyphStatus.Cooldown);
-            ent.Comp.State = GlyphStatus.Cooldown;
-            ent.Comp.Timer = _timing.CurTime + ent.Comp.CooldownTime;
-        }
-        else
-        {
-            _appearance.SetData(ent, GlyphVisuals.Status, GlyphStatus.Ready);
-            ent.Comp.State = GlyphStatus.Ready;
-        }
-
-        if (ent.Comp.User is not { } user) return;
-        var cultists = GatherCultists(ent, ent.Comp.ActivationRange);
-        var tryInvokeEv = new TryActivateGlyphEvent(user, cultists);
-        RaiseLocalEvent(ent, ref tryInvokeEv);
-        var tgtpos = Transform(ent).Coordinates;
-        if (tryInvokeEv.Cancelled || cultists.Count < ent.Comp.RequiredCultists)
-        {
-            _audio.PlayPvs(ent.Comp.FailSFX, tgtpos);
+        var tryInvokeEv = new TryActivateGlyphEvent(args.User, cultists);
+        RaiseLocalEvent(uid, tryInvokeEv);
+        if (tryInvokeEv.Cancelled)
             return;
-        }
 
-        var damage = ent.Comp.ActivationDamage / cultists.Count;
+        var damage = uid.Comp.ActivationDamage / cultists.Count;
         foreach (var cultist in cultists)
         {
             _damageable.TryChangeDamage(cultist, damage, true);
         }
 
-        _audio.PlayPvs(ent.Comp.TriggerSFX, tgtpos, AudioParams.Default.WithVolume(+1f));
-        Spawn(ent.Comp.GlyphVFX, tgtpos);
-        ent.Comp.User = null;
+        _audio.PlayPvs(uid.Comp.GylphSFX, tgtpos, AudioParams.Default.WithVolume(+1f));
+        Spawn(uid.Comp.GylphVFX, tgtpos);
+        QueueDel(uid);
     }
     #endregion
 
diff --git a/Content.Server/_DV/CosmicCult/EntitySystems/CosmicChantrySystem.cs b/Content.Server/_DV/CosmicCult/EntitySystems/CosmicChantrySystem.cs
index e0ed23c8b00..d308a08aac1 100644
--- a/Content.Server/_DV/CosmicCult/EntitySystems/CosmicChantrySystem.cs
+++ b/Content.Server/_DV/CosmicCult/EntitySystems/CosmicChantrySystem.cs
@@ -6,7 +6,6 @@
 using Content.Shared._DV.CosmicCult.Components;
 using Content.Shared.Mind;
 using Content.Shared.Roles;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -31,7 +30,6 @@ public sealed class CosmicChantrySystem : EntitySystem
     /// Mind role to add to colossi.
     /// </summary>
     public static readonly EntProtoId MindRole = "MindRoleCosmicColossus";
-    private readonly SoundSpecifier _briefingSound = new SoundPathSpecifier("/Audio/_DV/CosmicCult/antag_cosmic_AI_briefing.ogg");
     public override void Initialize()
     {
         base.Initialize();
@@ -63,7 +61,7 @@ public override void Update(float frameTime)
                 _mind.TransferTo(mindEnt, colossus);
                 _mind.TryAddObjective(mindEnt, mind, "CosmicFinalityObjective");
                 _role.MindAddRole(mindEnt, MindRole, mind, true);
-                _antag.SendBriefing(colossus, Loc.GetString("cosmiccult-silicon-colossus-briefing"), Color.FromHex("#4cabb3"), _briefingSound);
+                _antag.SendBriefing(colossus, Loc.GetString("cosmiccult-silicon-colossus-briefing"), Color.FromHex("#4cabb3"), null);
                 Spawn(comp.SpawnVFX, tgtpos);
                 QueueDel(comp.InternalVictim);
                 QueueDel(uid);
diff --git a/Content.Server/_DV/CosmicCult/EntitySystems/CosmicEntropyDegenSystem.cs b/Content.Server/_DV/CosmicCult/EntitySystems/CosmicEntropyDegenSystem.cs
index 0d8456e034b..c2e525745d0 100644
--- a/Content.Server/_DV/CosmicCult/EntitySystems/CosmicEntropyDegenSystem.cs
+++ b/Content.Server/_DV/CosmicCult/EntitySystems/CosmicEntropyDegenSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared._DV.CosmicCult.Components;
 using Robust.Shared.Timing;
 using Content.Shared.Damage;
+using Content.Shared.Popups;
 using Robust.Shared.Random;
 
 namespace Content.Server._DV.CosmicCult.EntitySystems;
@@ -14,6 +15,7 @@ public sealed partial class CosmicEntropyDegenSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/_DV/CosmicCult/EntitySystems/CosmicRiftSystem.cs b/Content.Server/_DV/CosmicCult/EntitySystems/CosmicRiftSystem.cs
index 4d08ddf31cc..b3cccf4f208 100644
--- a/Content.Server/_DV/CosmicCult/EntitySystems/CosmicRiftSystem.cs
+++ b/Content.Server/_DV/CosmicCult/EntitySystems/CosmicRiftSystem.cs
@@ -6,14 +6,10 @@
 using Content.Shared._DV.CosmicCult;
 using Content.Shared._DV.CosmicCult.Components;
 using Content.Shared.DoAfter;
-using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.StatusEffect;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server._DV.CosmicCult.EntitySystems;
 
@@ -23,15 +19,6 @@ public sealed class CosmicRiftSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
-
-    private readonly HashSet<Entity<HumanoidAppearanceComponent>> _humanoids = [];
-
-    private EntityQuery<CosmicCultComponent> _cultistsQuery;
-    private EntityQuery<BibleUserComponent> _chaplainsQuery;
 
     public override void Initialize()
     {
@@ -40,41 +27,6 @@ public override void Initialize()
         SubscribeLocalEvent<CosmicMalignRiftComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<CosmicCultComponent, EventAbsorbRiftDoAfter>(OnAbsorbDoAfter);
         SubscribeLocalEvent<CosmicMalignRiftComponent, EventPurgeRiftDoAfter>(OnPurgeDoAfter);
-        SubscribeLocalEvent<CosmicMalignRiftComponent, ComponentInit>(OnRiftStarted);
-
-        _cultistsQuery = GetEntityQuery<CosmicCultComponent>();
-        _chaplainsQuery = GetEntityQuery<BibleUserComponent>();
-    }
-
-    private void OnRiftStarted(Entity<CosmicMalignRiftComponent> ent, ref ComponentInit args)
-    {
-        ent.Comp.NextPulseTime = _timing.CurTime + _random.Next(ent.Comp.MinPulseTime, ent.Comp.MaxPulseTime);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<CosmicMalignRiftComponent>();
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (_timing.CurTime < comp.NextPulseTime) continue;
-            comp.NextPulseTime = _timing.CurTime + _random.Next(comp.MinPulseTime, comp.MaxPulseTime);
-
-            var pos = Transform(uid).Coordinates;
-            Spawn(comp.PulseVFX, pos);
-            _lookup.GetEntitiesInRange<HumanoidAppearanceComponent>(pos, comp.PulseRange, _humanoids);
-            _humanoids.RemoveWhere(target => _chaplainsQuery.HasComp(target) || _cultistsQuery.HasComp(target));
-            foreach(var humanoid in _humanoids)
-            {
-                if (!pos.TryDistance(EntityManager, Transform(humanoid).Coordinates, out var distance)) continue;
-                if (!_random.Prob(comp.PulseProb)) continue;
-                var damageMultiplier = Math.Clamp(comp.PulseRange / distance, 1, 10); //0.2 damage per second at max distance, up to 2 per second if closer
-                var effectDuration = _random.Next(10, 40); //2-8 damage at max distance, 20-80 damage at min distance
-                _statusEffects.TryAddStatusEffect<CosmicEntropyDebuffComponent>(humanoid, "EntropicDegen", TimeSpan.FromSeconds(effectDuration), true);
-                if (TryComp<CosmicEntropyDebuffComponent>(humanoid, out var debuff)) debuff.Degen = new(){DamageDict = new(){{"Cold", 0.05 * damageMultiplier}, {"Asphyxiation", 0.15 * damageMultiplier}}};
-            }
-        }
     }
 
     private void OnInteract(Entity<CosmicMalignRiftComponent> uid, ref InteractHandEvent args)
diff --git a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
index 8bf1fd15867..b3c43a26acf 100644
--- a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
+++ b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
@@ -16,7 +16,6 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics.Components;
 using Content.Shared.Damage.Prototypes;
-using Content.Shared.Traits.Assorted;
 // End DeltaV Additions
 using Content.Shared._Shitmed.Medical.Surgery;
 using Content.Shared._Shitmed.Medical.Surgery.Conditions;
@@ -264,8 +263,6 @@ private void OnStepScreamComplete(Entity<SurgeryStepEmoteEffectComponent> ent, r
     {
         if (HasComp<AnesthesiaComponent>(args.Body)) // DeltaV
             return;
-        if (HasComp<PainNumbnessComponent>(args.Body)) // DeltaV
-            return;
 
         _chat.TryEmoteWithChat(args.Body, ent.Comp.Emote);
     }
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index e1f59d3b975..f58f9f1d07d 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -19,18 +19,6 @@ namespace Content.Shared.Anomaly.Components;
 [Access(typeof(SharedAnomalySystem), typeof(SharedInnerBodyAnomalySystem))]
 public sealed partial class AnomalyComponent : Component
 {
-    /// <summary>
-    /// Imp. If true, skips doing supercritical logic for this anomaly. Used for Anomalites.
-    /// </summary>
-    [DataField]
-    public bool CannotSupercrit;
-
-    /// <summary>
-    /// imp. if true, skips random pulsing and health change over time.
-    /// </summary>
-    [DataField]
-    public bool CannotRandomPulse;
-
     /// <summary>
     /// How likely an anomaly is to grow more dangerous. Moves both up and down.
     /// Ranges from 0 to 1.
diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
index 1e48abf35be..a7e07ae2b50 100644
--- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
@@ -69,12 +69,6 @@ public sealed partial class InnerBodyAnomalyComponent : Component
     /// </summary>
     [DataField]
     public string LayerMap = "inner_anomaly_layer";
-
-    /// <summary>
-    /// imp. added for anomalites to prevent stunning
-    /// </summary>
-    [DataField]
-    public bool SkipStun;
 }
 
 /// <summary>
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 40ac362f1c6..3d00d43f413 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -124,9 +124,6 @@ public void RefreshPulseTimer(EntityUid uid, AnomalyComponent? component = null)
     /// <param name="ent">Entity to go supercritical</param>
     public void StartSupercriticalEvent(Entity<AnomalyComponent?> ent)
     {
-        if (!TryComp<AnomalyComponent>(ent, out var anomComp) || anomComp.CannotSupercrit) // imp
-            return;
-
         // don't restart it if it's already begun
         if (HasComp<AnomalySupercriticalComponent>(ent))
             return;
@@ -336,9 +333,6 @@ public override void Update(float frameTime)
         var anomalyQuery = EntityQueryEnumerator<AnomalyComponent>();
         while (anomalyQuery.MoveNext(out var ent, out var anomaly))
         {
-            if (anomaly.CannotRandomPulse) // imp
-                continue;
-
             // if the stability is under the death threshold,
             // update it every second to start killing it slowly.
             if (anomaly.Stability < anomaly.DecayThreshold)
@@ -365,9 +359,6 @@ public override void Update(float frameTime)
         var supercriticalQuery = EntityQueryEnumerator<AnomalySupercriticalComponent, AnomalyComponent>();
         while (supercriticalQuery.MoveNext(out var ent, out var super, out var anom))
         {
-            if (anom.CannotSupercrit) // imp
-                continue;
-
             if (Timing.CurTime <= super.EndTime)
                 continue;
             DoAnomalySupercriticalEvent(ent, anom);
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs
deleted file mode 100644
index 6e2d3e38ce2..00000000000
--- a/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Content.Shared.Administration.Logs;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-
-namespace Content.Shared.Atmos.EntitySystems;
-
-/// <summary>
-/// Handles all shared interactions with the gas pressure regulator.
-/// </summary>
-public abstract class SharedGasPressureRegulatorSystem : EntitySystem
-{
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GasPressureRegulatorComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<GasPressureRegulatorComponent, GasPressureRegulatorChangeThresholdMessage>(
-            OnThresholdChangeMessage);
-    }
-
-    /// <summary>
-    /// Presents predicted examine information to the person examining the valve.
-    /// </summary>
-    /// <param name="ent"> <see cref="Entity{T}"/> of the valve</param>
-    /// <param name="args">Event arguments for examination</param>
-    private void OnExamined(Entity<GasPressureRegulatorComponent> ent, ref ExaminedEvent args)
-    {
-        if (!Transform(ent).Anchored || !args.IsInDetailsRange)
-            return;
-
-        using (args.PushGroup(nameof(GasPressureRegulatorComponent)))
-        {
-            args.PushMarkup(Loc.GetString("gas-pressure-regulator-system-examined",
-                ("statusColor", ent.Comp.Enabled ? "green" : "red"),
-                ("open", ent.Comp.Enabled)));
-
-            args.PushMarkup(Loc.GetString("gas-pressure-regulator-examined-threshold-pressure",
-                ("threshold", $"{ent.Comp.Threshold:0.#}")));
-
-            args.PushMarkup(Loc.GetString("gas-pressure-regulator-examined-flow-rate",
-                ("flowRate", $"{ent.Comp.FlowRate:0.#}")));
-        }
-    }
-
-    /// <summary>
-    /// Validates, logs, and updates the pressure threshold of the valve.
-    /// </summary>
-    /// <param name="ent">The <see cref="Entity{T}"/> of the valve.</param>
-    /// <param name="args">The received pressure from the <see cref="GasPressurePumpChangeOutputPressureMessage"/>message.</param>
-    private void OnThresholdChangeMessage(Entity<GasPressureRegulatorComponent> ent,
-        ref GasPressureRegulatorChangeThresholdMessage args)
-    {
-        ent.Comp.Threshold = Math.Max(0f, args.ThresholdPressure);
-        _adminLogger.Add(LogType.AtmosVolumeChanged,
-            LogImpact.Medium,
-            $"{ToPrettyString(args.Actor):player} set the pressure threshold on {ToPrettyString(ent):device} to {ent.Comp.Threshold}");
-        // Dirty the entire entity to ensure we get all of that Fresh:tm: UI info from the server.
-        Dirty(ent);
-        UpdateUi(ent);
-    }
-
-    protected virtual void UpdateUi(Entity<GasPressureRegulatorComponent> ent)
-    {
-    }
-}
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs
deleted file mode 100644
index 2e893d28fc1..00000000000
--- a/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using Content.Shared.Guidebook;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared.Atmos.Piping.Binary.Components;
-
-/// <summary>
-/// Defines a gas pressure regulator,
-/// which releases gas depending on a set pressure threshold between two pipe nodes.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState(true, true), AutoGenerateComponentPause]
-public sealed partial class GasPressureRegulatorComponent : Component
-{
-    /// <summary>
-    /// Determines whether the valve is open or closed.
-    /// Used for showing the valve animation, the UI,
-    /// and on examine.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled;
-
-    /// <summary>
-    /// Specifies the pipe node name to be treated as the inlet.
-    /// </summary>
-    [DataField]
-    public string InletName = "inlet";
-
-    /// <summary>
-    /// Specifies the pipe node name to be treated as the outlet.
-    /// </summary>
-    [DataField]
-    public string OutletName = "outlet";
-
-    /// <summary>
-    /// The max transfer rate of the pressure regulator.
-    /// </summary>
-    [GuidebookData]
-    [DataField]
-    public float MaxTransferRate = Atmospherics.MaxTransferRate;
-
-    /// <summary>
-    /// The server time at which the next UI update will be sent.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan NextUiUpdate = TimeSpan.Zero;
-
-    /// <summary>
-    /// Sets the opening threshold of the pressure regulator.
-    /// </summary>
-    /// <example> If set to 500 kPa, the regulator will only
-    /// open if the pressure in the inlet side is above
-    /// 500 kPa. </example>
-    [DataField, AutoNetworkedField]
-    public float Threshold;
-
-    /// <summary>
-    /// How often the UI update is sent.
-    /// </summary>
-    [DataField]
-    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
-
-    #region UI/Examine Info
-
-    /// <summary>
-    /// The current flow rate of the pressure regulator.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    [DataField, AutoNetworkedField]
-    public float FlowRate;
-
-    /// <summary>
-    /// Current inlet pressure the pressure regulator.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    [DataField, AutoNetworkedField]
-    public float InletPressure;
-
-    /// <summary>
-    /// Current outlet pressure of the pressure regulator.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    [DataField, AutoNetworkedField]
-    public float OutletPressure;
-
-    #endregion
-}
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs
deleted file mode 100644
index 74ca041d106..00000000000
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Atmos.Piping.Binary.Components;
-
-/// <summary>
-/// Represents the unique key for the UI.
-/// </summary>
-[Serializable, NetSerializable]
-public enum GasPressureRegulatorUiKey : byte
-{
-    Key,
-}
-
-/// <summary>
-/// Message sent to change the pressure threshold of the gas pressure regulator.
-/// </summary>
-/// <param name="pressure">The new pressure threshold value.</param>
-[Serializable, NetSerializable]
-public sealed class GasPressureRegulatorChangeThresholdMessage(float pressure) : BoundUserInterfaceMessage
-{
-    /// <summary>
-    /// Gets the new threshold pressure value.
-    /// </summary>
-    public float ThresholdPressure { get; } = pressure;
-}
diff --git a/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs b/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
index 5193afcdd9a..dfc7b7a386c 100644
--- a/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
+++ b/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
@@ -31,10 +31,4 @@ public enum FilterVisuals : byte
     {
         Enabled,
     }
-
-    [Serializable, NetSerializable]
-    public enum PressureRegulatorVisuals : byte
-    {
-        State,
-    }
 }
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
index 608c9bc8f5c..56758654ed8 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared._DV.Clothing.Events; // DeltaV - Introduce ClothingSlowResistance to Species
 using Content.Shared.Examine;
 using Content.Shared.Inventory;
 using Content.Shared.Item.ItemToggle;
@@ -55,22 +54,8 @@ private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent compone
 
     private void OnRefreshMoveSpeed(EntityUid uid, ClothingSpeedModifierComponent component, InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
     {
-        // DeltaV Start - Introduce ClothingSlowResistance to Species
-        if (!_toggle.IsActivated(uid))
-            return;
-
-        if (_container.TryGetContainingContainer((uid, null), out var container))
-        {
-            var ev = new ModifyClothingSlowdownEvent(component.WalkModifier, component.SprintModifier);
-            RaiseLocalEvent(container.Owner, ref ev);
-
-            args.Args.ModifySpeed(ev.WalkModifier, ev.RunModifier);
-        }
-        else
-        {
+        if (_toggle.IsActivated(uid))
             args.Args.ModifySpeed(component.WalkModifier, component.SprintModifier);
-        }
-        // DeltaV End - Introduce ClothingSlowResistance to Species
     }
 
     private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent component, GetVerbsEvent<ExamineVerb> args)
@@ -78,13 +63,8 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent
         if (!args.CanInteract || !args.CanAccess)
             return;
 
-        // DeltaV Start - Introduce ClothingSlowResistance to Species
-        var ev = new ModifyClothingSlowdownEvent(component.WalkModifier, component.SprintModifier);
-        RaiseLocalEvent(args.User, ref ev);
-
-        var walkModifierPercentage = MathF.Round((1.0f - ev.WalkModifier) * 100f, 1);
-        var sprintModifierPercentage = MathF.Round((1.0f - ev.RunModifier) * 100f, 1);
-        // DeltaV End - Introduce ClothingSlowResistance to Species
+        var walkModifierPercentage = MathF.Round((1.0f - component.WalkModifier) * 100f, 1);
+        var sprintModifierPercentage = MathF.Round((1.0f - component.SprintModifier) * 100f, 1);
 
         if (walkModifierPercentage == 0.0f && sprintModifierPercentage == 0.0f)
             return;
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index 0c70f9ed705..4033fbb44fd 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -181,7 +181,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
         public DamageSpecifier? TryChangeDamage(EntityUid? uid, DamageSpecifier damage, bool ignoreResistances = false,
             bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null,
             // Shitmed Change
-            bool? canSever = true, bool? canEvade = false, float? partMultiplier = 1.00f, TargetBodyPart? targetPart = null, bool doPartDamage = true, bool onlyDamageParts = false) // DeltaV - Fix EvenHealing on Limbs.
+            bool? canSever = true, bool? canEvade = false, float? partMultiplier = 1.00f, TargetBodyPart? targetPart = null)
         {
             if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false))
             {
@@ -194,24 +194,20 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 return damage;
             }
 
-            damage = ApplyUniversalAllModifiers(damage); // DeltaV - Fix EvenHealing with Limbs.
-
             var before = new BeforeDamageChangedEvent(damage, origin, targetPart); // Shitmed Change
             RaiseLocalEvent(uid.Value, ref before);
 
             if (before.Cancelled)
                 return null;
 
-            if (doPartDamage) // DeltaV - Fix EvenHealing with Limbs.
-            {
-                // ShitMed Start
-                var partDamage = new TryChangePartDamageEvent(damage, origin, targetPart, ignoreResistances, canSever ?? true, canEvade ?? false, partMultiplier ?? 1.00f);
-                RaiseLocalEvent(uid.Value, ref partDamage);
+            // Shitmed Change Start
+            var partDamage = new TryChangePartDamageEvent(damage, origin, targetPart, ignoreResistances, canSever ?? true, canEvade ?? false, partMultiplier ?? 1.00f);
+            RaiseLocalEvent(uid.Value, ref partDamage);
 
-                if (partDamage.Evaded || partDamage.Cancelled)
-                    return null;
-                //ShitMed End
-            }
+            if (partDamage.Evaded || partDamage.Cancelled)
+                return null;
+
+            // Shitmed Change End
 
             // Apply resistances
             if (!ignoreResistances)
@@ -235,8 +231,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 }
             }
 
-            if (onlyDamageParts) // DeltaV - Fix EvenHealing with Limbs.
-                return null;
+            damage = ApplyUniversalAllModifiers(damage);
 
             // TODO DAMAGE PERFORMANCE
             // Consider using a local private field instead of creating a new dictionary here.
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
index 7cbc48ba980..968d559939f 100644
--- a/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
+++ b/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
@@ -1,8 +1,3 @@
-// DeltaV Start - Fix EvenHealing with Limbs.
-using System.Linq;
-using Content.Shared._Shitmed.Targeting;
-using Content.Shared.Body.Systems;
-// DeltaV End - Fix EvenHealing with Limbs.
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.EntityEffects;
@@ -96,47 +91,10 @@ public override void Effect(EntityEffectBaseArgs args)
         }
 
         var damagableSystem = args.EntityManager.System<DamageableSystem>();
-        var dspec = GetDamageSpec(protoMan, damageable); // DeltaV - Fix EvenHealing with Limbs.
-
-        damagableSystem.TryChangeDamage(
-            args.TargetEntity,
-            dspec * scale,
-            IgnoreResistances,
-            interruptsDoAfters: false,
-            doPartDamage: false); // DeltaV - Fix EvenHealing with Limbs.
-
-        // DeltaV Start - Fix EvenHealing with Limbs.
-        var bodySystem = args.EntityManager.System<SharedBodySystem>();
-        var bodyParts = SharedTargetingSystem.GetValidParts();
-        foreach (var bodyPart in bodyParts)
-        {
-            var (targetType, targetSymmetry) =  bodySystem.ConvertTargetBodyPart(bodyPart);
-            if (bodySystem.GetBodyChildrenOfType(args.TargetEntity, targetType, symmetry: targetSymmetry) is { } part)
-            {
-                if (!args.EntityManager.TryGetComponent<DamageableComponent>(part.FirstOrDefault().Id, out var damageablePart))
-                    continue;
-                dspec = GetDamageSpec(protoMan, damageablePart);
-
-                if (dspec.GetTotal() == 0)
-                    continue;
-
-                damagableSystem.TryChangeDamage(
-                    args.TargetEntity,
-                    dspec * scale,
-                    IgnoreResistances,
-                    interruptsDoAfters: false,
-                    targetPart: bodyPart,
-                    onlyDamageParts: true,
-                    partMultiplier: 0.5f,
-                    canSever: false);
-            }
-        }
-        // DeltaV End - Fix EvenHealing with Limbs.
-    }
+        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
+        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
 
-    private DamageSpecifier GetDamageSpec(IPrototypeManager protoMan, DamageableComponent damageable) // DeltaV - Fix EvenHealing with Limbs.
-    {
-        var damageSpecifier = new DamageSpecifier(); // DeltaV - Fix EvenHealing with Limbs.
+        var dspec = new DamageSpecifier();
 
         foreach (var (group, amount) in Damage)
         {
@@ -152,10 +110,30 @@ private DamageSpecifier GetDamageSpec(IPrototypeManager protoMan, DamageableComp
             var sum = groupDamage.Values.Sum();
             foreach (var (damageId, damageAmount) in groupDamage)
             {
-                var existing = damageSpecifier.DamageDict.GetOrNew(damageId); // DeltaV - Fix EvenHealing with Limbs.
-                damageSpecifier.DamageDict[damageId] = existing + damageAmount / sum * amount; // DeltaV - Fix EvenHealing with Limbs.
+                var existing = dspec.DamageDict.GetOrNew(damageId);
+                dspec.DamageDict[damageId] = existing + damageAmount / sum * amount;
+            }
+        }
+
+        if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
+        {
+            foreach (var (type, val) in dspec.DamageDict)
+            {
+                if (val < 0f)
+                {
+                    dspec.DamageDict[type] = val * universalReagentHealModifier;
+                }
+                if (val > 0f)
+                {
+                    dspec.DamageDict[type] = val * universalReagentDamageModifier;
+                }
             }
         }
-        return damageSpecifier; // DeltaV - Fix EvenHealing with Limbs.
+
+        damagableSystem.TryChangeDamage(
+            args.TargetEntity,
+            dspec * scale,
+            IgnoreResistances,
+            interruptsDoAfters: false);
     }
 }
diff --git a/Content.Shared/Gravity/FloatingVisualsComponent.cs b/Content.Shared/Gravity/FloatingVisualsComponent.cs
index cef92bcce00..67650baecda 100644
--- a/Content.Shared/Gravity/FloatingVisualsComponent.cs
+++ b/Content.Shared/Gravity/FloatingVisualsComponent.cs
@@ -25,6 +25,5 @@ public sealed partial class FloatingVisualsComponent : Component
     [AutoNetworkedField]
     public bool CanFloat = false;
 
-    [DataField] // imp. made this a read/write datafield instead of readonly to fix a bug with anomalites.
-    public string AnimationKey = "gravity";
+    public readonly string AnimationKey = "gravity";
 }
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
index 56e4a4e5d63..561b2202f98 100644
--- a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
@@ -15,15 +15,7 @@ public sealed class GlimmerSystem : EntitySystem
         public int Glimmer
         {
             get { return _glimmer; }
-            set
-            {
-                var newGlimmer = _enabled ? Math.Clamp(value, 0, 1000) : 0;
-                if (_glimmer == newGlimmer)
-                    return;
-
-                _glimmer = newGlimmer;
-                RaiseNetworkEvent(new GlimmerChangedEvent(_glimmer));
-            }
+            set { _glimmer = _enabled ? Math.Clamp(value, 0, 1000) : 0; }
         }
         private bool _enabled;
         public override void Initialize()
@@ -70,15 +62,4 @@ public enum GlimmerTier : byte
         Dangerous,
         Critical,
     }
-
-    [Serializable, NetSerializable]
-    public sealed class GlimmerChangedEvent : EntityEventArgs
-    {
-        public int Glimmer { get; }
-
-        public GlimmerChangedEvent(int glimmer)
-        {
-            Glimmer = glimmer;
-        }
-    }
 }
diff --git a/Content.Shared/PDA/PdaComponent.cs b/Content.Shared/PDA/PdaComponent.cs
index fc010d32e34..cdfeffa2c1c 100644
--- a/Content.Shared/PDA/PdaComponent.cs
+++ b/Content.Shared/PDA/PdaComponent.cs
@@ -38,7 +38,5 @@ public sealed partial class PdaComponent : Component
         [ViewVariables] public string? StationName;
         [ViewVariables] public string? StationAlertLevel;
         [ViewVariables] public Color StationAlertColor = Color.White;
-        [DataField] public DateTime CurrentDate; // DeltaV - PDA date
-        [DataField] public DateTime? DateOverride; // DeltaV - PDA date
     }
 }
diff --git a/Content.Shared/PDA/PdaUpdateState.cs b/Content.Shared/PDA/PdaUpdateState.cs
index 784ca35d437..cf217ed9b25 100644
--- a/Content.Shared/PDA/PdaUpdateState.cs
+++ b/Content.Shared/PDA/PdaUpdateState.cs
@@ -49,6 +49,5 @@ public struct PdaIdInfoText
         public string? JobTitle;
         public string? StationAlertLevel;
         public Color StationAlertColor;
-        public DateTime? CurrentDate; // DeltaV - PDA date
     }
 }
diff --git a/Content.Shared/Pinpointer/PinpointerComponent.cs b/Content.Shared/Pinpointer/PinpointerComponent.cs
index ff7321d50c9..e83a2e38d60 100644
--- a/Content.Shared/Pinpointer/PinpointerComponent.cs
+++ b/Content.Shared/Pinpointer/PinpointerComponent.cs
@@ -62,12 +62,6 @@ public sealed partial class PinpointerComponent : Component
 
     [ViewVariables]
     public bool HasTarget => DistanceToTarget != Distance.Unknown;
-
-    /// <summary>
-    /// #IMP Force pinpointer to activate immediately.
-    /// </summary>
-    [DataField("activateImmediately"), ViewVariables]
-    public bool ActivateImmediately = false;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Speech/Components/VocalComponent.cs b/Content.Shared/Speech/Components/VocalComponent.cs
index 8ade5e1152c..a520da4354a 100644
--- a/Content.Shared/Speech/Components/VocalComponent.cs
+++ b/Content.Shared/Speech/Components/VocalComponent.cs
@@ -51,9 +51,3 @@ public sealed partial class VocalComponent : Component
     [AutoNetworkedField]
     public EmoteSoundsPrototype? EmoteSounds = null;
 }
-
-/// <summary>
-///     DeltaV: raised when the component's Sounds field changes.
-/// </summary>
-[ByRefEvent]
-public record struct SoundsChangedEvent();
diff --git a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
index b9a7057347d..5485870766d 100644
--- a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
+++ b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
@@ -2,7 +2,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared.SprayPainter.Components;
 
@@ -110,7 +109,6 @@ public sealed partial class SprayPainterComponent : Component
 /// <summary>
 /// A set of operating modes for decal painting.
 /// </summary>
-[Serializable, NetSerializable]
 public enum DecalPaintMode : byte
 {
     /// <summary>
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 6ea5ad3ca07..1468d2e5ada 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -115,12 +115,6 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public bool SwingLeft;
 
-    /// <summary>
-    /// DeltaV: if true, weapon will swing in different direction each strike. Purely cosmetic.
-    /// </summary>
-    [DataField]
-    public bool ChangeSwingDirection;
-
 
     // Sounds
 
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 15b04f9c141..88e41f6e0e0 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -542,7 +542,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
             // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
             if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
             {
-                _stamina.TakeStaminaDamage(target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid, ignoreResist: true); // DeltaV - No Stamina Resistance Doubledipping
+                _stamina.TakeStaminaDamage(target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid);
             }
 
             if (meleeUid == user)
@@ -697,7 +697,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
                 // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
                 if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
                 {
-                    _stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid, ignoreResist: true); // DeltaV - No Stamina Resistance Doubledipping
+                    _stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid);
                 }
 
                 appliedDamage += damageResult;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index c9cbe5e6ac9..083cb2bf540 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -58,7 +58,6 @@ private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderCompon
         Audio.PlayPredicted(component.SoundInsert, uid, args.User);
         args.Handled = true;
         UpdateBallisticAppearance(uid, component);
-        UpdateAmmoCount(args.Target);
         DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities));
     }
 
@@ -154,9 +153,7 @@ void SimulateInsertAmmo(EntityUid ammo, EntityUid ammoProvider, EntityCoordinate
                 Del(ent.Value);
         }
 
-        UpdateBallisticAppearance(args.Target.Value, component);
-        UpdateAmmoCount(args.Target.Value);
-        // repeat if there is more space in the target and more ammo to fill
+        // repeat if there is more space in the target and more ammo to fill it
         var moreSpace = target.Entities.Count + target.UnspawnedCount < target.Capacity;
         var moreAmmo = component.Entities.Count + component.UnspawnedCount > 0;
         args.Repeat = moreSpace && moreAmmo;
diff --git a/Content.Shared/_DV/Augments/AugmentSystem.cs b/Content.Shared/_DV/Augments/AugmentSystem.cs
index 0447cbc21d6..afdf4f65815 100644
--- a/Content.Shared/_DV/Augments/AugmentSystem.cs
+++ b/Content.Shared/_DV/Augments/AugmentSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
-using Content.Shared.Examine;
 using Content.Shared.Interaction;
 
 namespace Content.Shared._DV.Augments;
@@ -14,20 +13,6 @@ public override void Initialize()
         SubscribeLocalEvent<AugmentComponent, OrganAddedToBodyEvent>(OnOrganOrganAddedToBody);
         SubscribeLocalEvent<AugmentComponent, OrganRemovedFromBodyEvent>(OnOrganOrganRemovedFromBody);
         SubscribeLocalEvent<InstalledAugmentsComponent, AccessibleOverrideEvent>(OnAccessibleOverride);
-
-        SubscribeLocalEvent<InstalledAugmentsComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(Entity<InstalledAugmentsComponent> ent, ref ExaminedEvent args)
-    {
-        if (ent.Comp.InstalledAugments.Count == 1)
-        {
-            args.PushMarkup(Loc.GetString("augment-tool-panel-examine"));
-        }
-        else
-        {
-            args.PushMarkup(Loc.GetString("augment-tool-panel-examine-multiple"));
-        }
     }
 
     private void OnOrganOrganAddedToBody(Entity<AugmentComponent> augment, ref OrganAddedToBodyEvent args)
diff --git a/Content.Shared/_DV/CCVars/DCCVars.cs b/Content.Shared/_DV/CCVars/DCCVars.cs
index 5383674b5f8..7fbd360958d 100644
--- a/Content.Shared/_DV/CCVars/DCCVars.cs
+++ b/Content.Shared/_DV/CCVars/DCCVars.cs
@@ -94,24 +94,12 @@ public sealed partial class DCCVars
     public static readonly CVarDef<bool> NoVisionFilters =
         CVarDef.Create("accessibility.no_vision_filters", true, CVar.CLIENTONLY | CVar.ARCHIVE);
 
-    /// <summary>
-    /// Disables the fullscreen shader at 700+ glimmer.
-    /// </summary>
-    public static readonly CVarDef<bool> DisableGlimmerShader =
-        CVarDef.Create("accessibility.disable_glimmer_shader", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-
     /// <summary>
     /// Whether the Shipyard is enabled.
     /// </summary>
     public static readonly CVarDef<bool> Shipyard =
         CVarDef.Create("shuttle.shipyard", true, CVar.SERVERONLY);
 
-    /// <summary>
-    /// What year it is in the game. Actual value shown in game is server date + this value.
-    /// </summary>
-    public static readonly CVarDef<int> YearOffset =
-        CVarDef.Create("game.current_year_offset", 3813, CVar.SERVERONLY);
-
     /*
      * Feedback webhook
      */
diff --git a/Content.Shared/_DV/Clothing/Components/ClothingSlowResistanceComponent.cs b/Content.Shared/_DV/Clothing/Components/ClothingSlowResistanceComponent.cs
deleted file mode 100644
index f3fefdbd520..00000000000
--- a/Content.Shared/_DV/Clothing/Components/ClothingSlowResistanceComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._DV.Clothing.Components;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ClothingSlowResistanceComponent : Component
-{
-    /// <summary>
-    /// Modifier for both walk and sprint slowdown.
-    /// </summary>
-    [DataField(required: true)]
-    public float Modifier = 0.25f;
-}
diff --git a/Content.Shared/_DV/Clothing/Events/ModifyClothingSlowdownEvent.cs b/Content.Shared/_DV/Clothing/Events/ModifyClothingSlowdownEvent.cs
deleted file mode 100644
index 20d93af27ea..00000000000
--- a/Content.Shared/_DV/Clothing/Events/ModifyClothingSlowdownEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Shared._DV.Clothing.Events;
-
-/// <summary>
-/// Raised on an entity when clothing would slow them down or when they examine clothing.
-/// </summary>
-/// <param name="WalkModifier">The walking speed modifier of the clothing.</param>
-/// <param name="RunModifier">The running speed modifier of the clothing.</param>
-[ByRefEvent]
-public record struct ModifyClothingSlowdownEvent(float WalkModifier, float RunModifier);
diff --git a/Content.Shared/_DV/Clothing/Systems/ClothingSlowResistanceSystem.cs b/Content.Shared/_DV/Clothing/Systems/ClothingSlowResistanceSystem.cs
deleted file mode 100644
index feb5a9a1e2c..00000000000
--- a/Content.Shared/_DV/Clothing/Systems/ClothingSlowResistanceSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared._DV.Clothing.Components;
-using Content.Shared._DV.Clothing.Events;
-using Content.Shared.Movement.Systems;
-
-namespace Content.Shared._DV.Clothing.Systems;
-
-public sealed class ClothingSlowResistanceSystem : EntitySystem
-{
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ClothingSlowResistanceComponent, ModifyClothingSlowdownEvent>(OnModifyClothingSlowdown);
-    }
-
-    public void SetModifier(Entity<ClothingSlowResistanceComponent?> ent, float modifier)
-    {
-        ent.Comp ??= EnsureComp<ClothingSlowResistanceComponent>(ent);
-        ent.Comp.Modifier = modifier;
-        Dirty(ent, ent.Comp);
-
-        _movementSpeed.RefreshMovementSpeedModifiers(ent);
-    }
-
-    private void OnModifyClothingSlowdown(Entity<ClothingSlowResistanceComponent> ent, ref ModifyClothingSlowdownEvent args)
-    {
-        var modifier = ent.Comp.Modifier;
-
-        if (args.WalkModifier < 1)
-            args.WalkModifier += (1 - args.WalkModifier) * modifier;
-        if (args.RunModifier < 1)
-            args.RunModifier += (1 - args.RunModifier) * modifier;
-    }
-}
diff --git a/Content.Shared/_DV/CosmicCult/Components/CosmicEntropyDebuffComponent.cs b/Content.Shared/_DV/CosmicCult/Components/CosmicEntropyDebuffComponent.cs
index 621f74f8b01..90b90ab0500 100644
--- a/Content.Shared/_DV/CosmicCult/Components/CosmicEntropyDebuffComponent.cs
+++ b/Content.Shared/_DV/CosmicCult/Components/CosmicEntropyDebuffComponent.cs
@@ -26,7 +26,8 @@ public sealed partial class CosmicEntropyDebuffComponent : Component
     {
         DamageDict = new()
         {
-            { "Cold", 0.1},
+            { "Cold", 0.25},
+            { "Asphyxiation", 1.25},
         }
     };
 }
diff --git a/Content.Shared/_DV/CosmicCult/Components/CosmicGlyphComponent.cs b/Content.Shared/_DV/CosmicCult/Components/CosmicGlyphComponent.cs
index 833d0c35bb3..69f441af55a 100644
--- a/Content.Shared/_DV/CosmicCult/Components/CosmicGlyphComponent.cs
+++ b/Content.Shared/_DV/CosmicCult/Components/CosmicGlyphComponent.cs
@@ -1,14 +1,10 @@
 using Content.Shared.Damage;
-using Robust.Shared.GameStates;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared._DV.CosmicCult.Components;
 
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
+[RegisterComponent]
 public sealed partial class CosmicGlyphComponent : Component
 {
     [DataField] public int RequiredCultists = 1;
@@ -19,51 +15,12 @@ public sealed partial class CosmicGlyphComponent : Component
     /// </summary>
     [DataField] public DamageSpecifier ActivationDamage = new();
     [DataField] public bool CanBeErased = true;
-    [DataField] public bool EraseOnUse = false;
-    [DataField] public EntProtoId GlyphVFX = "CosmicGenericVFX";
-    [DataField] public SoundSpecifier TriggerSFX = new SoundPathSpecifier("/Audio/_DV/CosmicCult/glyph_trigger.ogg");
-    [DataField] public SoundSpecifier ChargeSFX = new SoundPathSpecifier("/Audio/_DV/CosmicCult/glyph_charge.ogg");
-    [DataField] public SoundSpecifier FailSFX = new SoundPathSpecifier("/Audio/_DV/CosmicCult/glyph_fail.ogg");
-    [DataField] public GlyphStatus State = GlyphStatus.Spawning;
-    [DataField] public EntityUid? User = null;
-    [DataField] public TimeSpan SpawnTime = TimeSpan.FromSeconds(1.2);
-    [DataField] public TimeSpan DespawnTime = TimeSpan.FromSeconds(0.6);
-    [DataField] public TimeSpan ActivationTime = TimeSpan.FromSeconds(0);
-    [DataField] public TimeSpan CooldownTime = TimeSpan.FromSeconds(3.0);
-    [AutoPausedField, DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    public TimeSpan Timer = default!;
+    [DataField] public EntProtoId GylphVFX = "CosmicGenericVFX";
+    [DataField] public SoundSpecifier GylphSFX = new SoundPathSpecifier("/Audio/_DV/CosmicCult/glyph_trigger.ogg");
 }
 
-[ByRefEvent]
-public record struct TryActivateGlyphEvent(EntityUid User, HashSet<Entity<CosmicCultComponent>> Cultists, bool Cancelled = false)
+public sealed class TryActivateGlyphEvent(EntityUid user, HashSet<Entity<CosmicCultComponent>> cultists) : CancellableEntityEventArgs
 {
-    public void Cancel()
-    {
-        Cancelled = true;
-    }
-}
-
-[ByRefEvent]
-public record struct CheckGlyphConditionsEvent(EntityUid User, HashSet<Entity<CosmicCultComponent>> Cultists, bool Cancelled = false)
-{
-    public void Cancel()
-    {
-        Cancelled = true;
-    }
-}
-
-[Serializable, NetSerializable]
-public enum GlyphVisuals : byte
-{
-    Status,
-}
-
-[Serializable, NetSerializable]
-public enum GlyphStatus : byte
-{
-    Spawning,
-    Despawning,
-    Ready,
-    Active,
-    Cooldown
+    public EntityUid User = user;
+    public HashSet<Entity<CosmicCultComponent>> Cultists = cultists;
 }
diff --git a/Content.Shared/_DV/CosmicCult/Components/SpeechOverrideComponent.cs b/Content.Shared/_DV/CosmicCult/Components/SpeechOverrideComponent.cs
deleted file mode 100644
index 0e16d87b8e8..00000000000
--- a/Content.Shared/_DV/CosmicCult/Components/SpeechOverrideComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Content.Shared.Humanoid;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
-
-namespace Content.Shared._DV.CosmicCult.Components;
-
-/// <summary>
-/// Component for overriding an entity's vocal sounds through equipment.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SpeechOverrideComponent : Component
-{
-    /// <summary>
-    /// Sounds to assign to the entity equipping this item.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<Sex, EmoteSoundsPrototype>))]
-    [AutoNetworkedField]
-    public Dictionary<Sex, string>? OverrideIDs = null;
-
-    /// <summary>
-    /// Entity's original sounds to use when the item is unequipped.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<Sex, EmoteSoundsPrototype>))]
-    [AutoNetworkedField]
-    public Dictionary<Sex, string>? StoredIDs = null;
-}
diff --git a/Content.Shared/_DV/CosmicCult/SharedCosmicCultSystem.cs b/Content.Shared/_DV/CosmicCult/SharedCosmicCultSystem.cs
index e7a493a03d6..9640fd97eff 100644
--- a/Content.Shared/_DV/CosmicCult/SharedCosmicCultSystem.cs
+++ b/Content.Shared/_DV/CosmicCult/SharedCosmicCultSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Antag;
 using Content.Shared.Examine;
 using Content.Shared.Ghost;
-using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Mind;
 using Content.Shared.Roles;
 using Content.Shared.Verbs;
@@ -29,12 +28,10 @@ public override void Initialize()
         SubscribeLocalEvent<CosmicCultLeadComponent, ComponentGetStateAttemptEvent>(OnCosmicCultCompGetStateAttempt);
         SubscribeLocalEvent<CosmicCultComponent, ComponentStartup>(DirtyCosmicCultComps);
         SubscribeLocalEvent<CosmicCultLeadComponent, ComponentStartup>(DirtyCosmicCultComps);
-
-        SubscribeLocalEvent<CosmicTransmutableComponent, GetVerbsEvent<ExamineVerb>>(OnTransmutableExamined);
-        SubscribeLocalEvent<CosmicCultExamineComponent, ExaminedEvent>(OnCosmicCultExamined);
+        SubscribeLocalEvent<CosmicTransmutableComponent, GetVerbsEvent<ExamineVerb>>(OnDetailedExamine);
     }
 
-    private void OnTransmutableExamined(Entity<CosmicTransmutableComponent> ent, ref GetVerbsEvent<ExamineVerb> args)
+    private void OnDetailedExamine(Entity<CosmicTransmutableComponent> ent, ref GetVerbsEvent<ExamineVerb> args)
     {
         if (ent.Comp.TransmutesTo == "" || ent.Comp.RequiredGlyphType == "") return;
         if (!EntityIsCultist(args.User)) //non-cultists don't need to know this anyway
@@ -51,11 +48,6 @@ private void OnTransmutableExamined(Entity<CosmicTransmutableComponent> ent, ref
             "/Textures/_DV/CosmicCult/Interface/transmute_inspect.png");
     }
 
-    private void OnCosmicCultExamined(Entity<CosmicCultExamineComponent> ent, ref ExaminedEvent args)
-    {
-        args.PushMarkup(Loc.GetString(EntitySeesCult(args.Examiner) ? ent.Comp.CultistText : ent.Comp.OthersText));
-    }
-
     public bool EntityIsCultist(EntityUid user)
     {
         if (!_mind.TryGetMind(user, out var mind, out _))
diff --git a/Content.Shared/_DV/CosmicCult/SharedCosmicGlyphSystem.cs b/Content.Shared/_DV/CosmicCult/SharedCosmicGlyphSystem.cs
deleted file mode 100644
index 2378f968e93..00000000000
--- a/Content.Shared/_DV/CosmicCult/SharedCosmicGlyphSystem.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared._DV.CosmicCult.Components;
-using Content.Shared.Examine;
-using Robust.Shared.Timing;
-
-namespace Content.Shared._DV.CosmicCult;
-
-public abstract class SharedCosmicGlyphSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedCosmicCultSystem _cosmicCult = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<CosmicGlyphComponent, ExaminedEvent>(OnExamine);
-    }
-
-    private void OnExamine(Entity<CosmicGlyphComponent> uid, ref ExaminedEvent args)
-    {
-        if (_cosmicCult.EntityIsCultist(args.Examiner))
-        {
-            args.PushMarkup(Loc.GetString("cosmic-examine-glyph-cultcount", ("COUNT", uid.Comp.RequiredCultists)));
-        }
-    }
-
-    public void EraseGlyph(EntityUid ent)
-    {
-        if (!TryComp<CosmicGlyphComponent>(ent, out var comp)) return;
-        _appearance.SetData(ent, GlyphVisuals.Status, GlyphStatus.Despawning);
-        comp.State = GlyphStatus.Despawning;
-        comp.Timer = _timing.CurTime + comp.DespawnTime;
-    }
-}
diff --git a/Content.Shared/_DV/CosmicCult/SharedMonumentSystem.cs b/Content.Shared/_DV/CosmicCult/SharedMonumentSystem.cs
index 0f7231ba0be..63ea0606fe2 100644
--- a/Content.Shared/_DV/CosmicCult/SharedMonumentSystem.cs
+++ b/Content.Shared/_DV/CosmicCult/SharedMonumentSystem.cs
@@ -21,7 +21,6 @@ public abstract class SharedMonumentSystem : EntitySystem
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedCosmicCultSystem _cosmicCult = default!;
-    [Dependency] private readonly SharedCosmicGlyphSystem _glyph = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
 
@@ -95,7 +94,8 @@ private void OnGlyphSelected(Entity<MonumentComponent> ent, ref GlyphSelectedMes
         var localTile = _map.GetTileRef(xform.GridUid.Value, grid, xform.Coordinates);
         var targetIndices = localTile.GridIndices + new Vector2i(0, -1);
 
-        if (ent.Comp.CurrentGlyph is { } curGlyph) _glyph.EraseGlyph(curGlyph);
+        if (ent.Comp.CurrentGlyph is not null)
+            QueueDel(ent.Comp.CurrentGlyph);
 
         var glyphEnt = Spawn(proto.Entity, _map.ToCenterCoordinates(xform.GridUid.Value, targetIndices, grid));
         ent.Comp.CurrentGlyph = glyphEnt;
@@ -107,7 +107,8 @@ private void OnGlyphSelected(Entity<MonumentComponent> ent, ref GlyphSelectedMes
 
     private void OnGlyphRemove(Entity<MonumentComponent> ent, ref GlyphRemovedMessage args)
     {
-        if (ent.Comp.CurrentGlyph is { } curGlyph) _glyph.EraseGlyph(curGlyph);
+        if (ent.Comp.CurrentGlyph is not null)
+            QueueDel(ent.Comp.CurrentGlyph);
 
         _ui.SetUiState(ent.Owner, MonumentKey.Key, new MonumentBuiState(ent.Comp));
     }
diff --git a/Content.Shared/_DV/DeviceLinking/Components/PowerTogglePortComponent.cs b/Content.Shared/_DV/DeviceLinking/Components/PowerTogglePortComponent.cs
deleted file mode 100644
index ecdc97fad49..00000000000
--- a/Content.Shared/_DV/DeviceLinking/Components/PowerTogglePortComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.DeviceLinking;
-using Robust.Shared.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-using Content.Shared._DV.DeviceLinking.Systems;
-
-namespace Content.Shared._DV.DeviceLinking.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(PowerTogglePortSystem))]
-public sealed partial class PowerTogglePortComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public ProtoId<SinkPortPrototype> PowerTogglePort = "PowerToggle";
-}
diff --git a/Content.Shared/_DV/DeviceLinking/Systems/PowerTogglePortSystem.cs b/Content.Shared/_DV/DeviceLinking/Systems/PowerTogglePortSystem.cs
deleted file mode 100644
index 1b1cf6e7eb6..00000000000
--- a/Content.Shared/_DV/DeviceLinking/Systems/PowerTogglePortSystem.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.DeviceLinking.Events;
-using Content.Shared.Power.EntitySystems;
-using Content.Shared.Power.Components;
-using Content.Shared.DeviceLinking;
-using Content.Shared._DV.DeviceLinking.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._DV.DeviceLinking.Systems;
-
-public sealed class PowerTogglePortSystem : EntitySystem
-{
-    [Dependency] private readonly SharedDeviceLinkSystem _device = default!;
-
-    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PowerTogglePortComponent, SignalReceivedEvent>(OnSignalReceived);
-    }
-
-    private void OnSignalReceived(Entity<PowerTogglePortComponent> entity, ref SignalReceivedEvent args)
-    {
-        if (args.Port == entity.Comp.PowerTogglePort)
-            _power.TogglePower(entity);
-    }
-
-}
diff --git a/Content.Shared/_DV/Medical/CrewMonitoring/LongRangeCrewMonitorSystem.cs b/Content.Shared/_DV/Medical/CrewMonitoring/LongRangeCrewMonitorSystem.cs
index 01ac6916fc2..32a0e854362 100644
--- a/Content.Shared/_DV/Medical/CrewMonitoring/LongRangeCrewMonitorSystem.cs
+++ b/Content.Shared/_DV/Medical/CrewMonitoring/LongRangeCrewMonitorSystem.cs
@@ -7,20 +7,19 @@ namespace Content.Shared._DV.Medical.CrewMonitoring;
 public sealed class LongRangeCrewMonitorSystem : EntitySystem
 {
     /// <summary>
-    /// Finds the largest (presumably the main station) grid on the same map as the argument.
+    /// Finds an arbitrary station grid on the same map as the argument.
+    /// Returns null if no grid was found.
     /// </summary>
-    /// <param name="map"></param>
-    /// <returns>Returns null if not found</returns>
-    public EntityUid? FindLargestStationGridInMap(MapId map)
+    public EntityUid? FindStationGridInMap(MapId map)
     {
         // also requiring MapGrid incase StationMember gets used for non-grids in the future
-        (EntityUid?, int) biggest_grid = (null, 0);
         var query = EntityQueryEnumerator<StationMemberComponent, MapGridComponent>();
-        while (query.MoveNext(out var grid, out _, out var mapgrid))
+        while (query.MoveNext(out var grid, out _, out _))
         {
-            if (Transform(grid).MapID == map && mapgrid.ChunkCount > biggest_grid.Item2)
-                biggest_grid = (grid, mapgrid.ChunkCount);
+            if (Transform(grid).MapID == map)
+                return grid;
         }
-        return biggest_grid.Item1;
+
+        return null;
     }
 }
diff --git a/Content.Shared/_DV/Overlays/GlimmerOverlayComponent.cs b/Content.Shared/_DV/Overlays/GlimmerOverlayComponent.cs
deleted file mode 100644
index 1338c8ef9d7..00000000000
--- a/Content.Shared/_DV/Overlays/GlimmerOverlayComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._DV.Overlays;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class GlimmerOverlayComponent : Component;
diff --git a/Content.Shared/_DV/TapeRecorder/Components/TapeRecorderComponent.cs b/Content.Shared/_DV/TapeRecorder/Components/TapeRecorderComponent.cs
index 6a73a1fb8c9..e5ed28121c1 100644
--- a/Content.Shared/_DV/TapeRecorder/Components/TapeRecorderComponent.cs
+++ b/Content.Shared/_DV/TapeRecorder/Components/TapeRecorderComponent.cs
@@ -1,6 +1,4 @@
 using Content.Shared._DV.TapeRecorder.Systems;
-using Content.Shared._DV.DeviceLinking.Systems;
-using Content.Shared.DeviceLinking;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -82,20 +80,4 @@ public sealed partial class TapeRecorderComponent : Component
     {
         Params = AudioParams.Default.WithVolume(-2f).WithMaxDistance(3f)
     };
-
-    /// <summary>
-    /// Ports for signal control
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public ProtoId<SinkPortPrototype> PausePort = "Pause";
-
-    [DataField, AutoNetworkedField]
-    public ProtoId<SinkPortPrototype> RecordPort = "Record";
-
-    [DataField, AutoNetworkedField]
-    public ProtoId<SinkPortPrototype> PlaybackPort = "Playback";
-
-    [DataField, AutoNetworkedField]
-    public ProtoId<SinkPortPrototype> RewindPort = "Rewind";
-
 }
diff --git a/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs b/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs
index b81c4b7059f..68ec7c3dba6 100644
--- a/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs
+++ b/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs
@@ -10,8 +10,6 @@
 using Content.Shared.Toggleable;
 using Content.Shared.UserInterface;
 using Content.Shared.Whitelist;
-using Content.Shared.DeviceLinking;
-using Content.Shared.DeviceLinking.Events;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
@@ -45,7 +43,6 @@ public override void Initialize()
         SubscribeLocalEvent<TapeRecorderComponent, ExaminedEvent>(OnRecorderExamined);
         SubscribeLocalEvent<TapeRecorderComponent, ChangeModeTapeRecorderMessage>(OnChangeModeMessage);
         SubscribeLocalEvent<TapeRecorderComponent, AfterActivatableUIOpenEvent>(OnUIOpened);
-        SubscribeLocalEvent<TapeRecorderComponent, SignalReceivedEvent>(OnSignalReceived);
 
         SubscribeLocalEvent<TapeCassetteComponent, ExaminedEvent>(OnTapeExamined);
         SubscribeLocalEvent<TapeCassetteComponent, DamageChangedEvent>(OnDamagedChanged);
@@ -414,26 +411,6 @@ private void UpdateUI(Entity<TapeRecorderComponent> ent)
 
         _ui.SetUiState(uid, TapeRecorderUIKey.Key, state);
     }
-
-    private void OnSignalReceived(Entity<TapeRecorderComponent> ent, ref SignalReceivedEvent args)
-    {
-        if (args.Port == ent.Comp.PausePort)
-        {
-            SetMode(ent, TapeRecorderMode.Stopped);
-        }
-        else if (args.Port == ent.Comp.RecordPort)
-        {
-            SetMode(ent, TapeRecorderMode.Recording);
-        }
-        else if (args.Port == ent.Comp.PlaybackPort)
-        {
-            SetMode(ent, TapeRecorderMode.Playing);
-        }
-        else if (args.Port == ent.Comp.RewindPort)
-        {
-            SetMode(ent, TapeRecorderMode.Rewinding);
-        }
-    }
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/_Goobstation/Clothing/Components/ClothingGrantComponentComponent.cs b/Content.Shared/_Goobstation/Clothing/Components/ClothingGrantComponentComponent.cs
deleted file mode 100644
index b23565e0656..00000000000
--- a/Content.Shared/_Goobstation/Clothing/Components/ClothingGrantComponentComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Goobstation.Clothing.Components
-{
-    [RegisterComponent]
-    public sealed partial class ClothingGrantComponentComponent : Component
-    {
-        [DataField("component", required: true)]
-        [AlwaysPushInheritance]
-        public ComponentRegistry Components { get; private set; } = new();
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public Dictionary<string, bool> Active = new(); // Goobstation
-    }
-}
diff --git a/Content.Shared/_Goobstation/Clothing/Components/ClothingGrantTagComponent.cs b/Content.Shared/_Goobstation/Clothing/Components/ClothingGrantTagComponent.cs
index ff8bae5064f..4e7e9ca25a4 100644
--- a/Content.Shared/_Goobstation/Clothing/Components/ClothingGrantTagComponent.cs
+++ b/Content.Shared/_Goobstation/Clothing/Components/ClothingGrantTagComponent.cs
@@ -7,17 +7,15 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-using Content.Shared.Tag; // harmony
-using Robust.Shared.Prototypes; // harmony
-
-namespace Content.Shared._Goobstation.Clothing.Components;
-
-[RegisterComponent]
-public sealed partial class ClothingGrantTagComponent : Component
+namespace Content.Shared._Goobstation.Clothing.Components // Goobstation
 {
-    [DataField("tag", required: true), ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<TagPrototype> Tag = ""; // Harmony - change to protoid
+    [RegisterComponent]
+    public sealed partial class ClothingGrantTagComponent : Component
+    {
+        [DataField("tag", required: true), ViewVariables(VVAccess.ReadWrite)]
+        public string Tag = "";
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool IsActive = false;
-}
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool IsActive = false;
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/_Goobstation/Clothing/Systems/ClothingGrantingSystem.cs b/Content.Shared/_Goobstation/Clothing/Systems/ClothingGrantingSystem.cs
index 3d237b5540a..6497ef5079e 100644
--- a/Content.Shared/_Goobstation/Clothing/Systems/ClothingGrantingSystem.cs
+++ b/Content.Shared/_Goobstation/Clothing/Systems/ClothingGrantingSystem.cs
@@ -110,4 +110,4 @@ private void OnTagUnequip(EntityUid uid, ClothingGrantTagComponent component, Go
         component.IsActive = false;
     }
     }
-}
+}
\ No newline at end of file
diff --git a/Resources/Audio/MidiCustom/GeneralUser-GS.sf2 b/Resources/Audio/MidiCustom/GeneralUser-GS.sf2
deleted file mode 100644
index 2fdd31c69ee..00000000000
Binary files a/Resources/Audio/MidiCustom/GeneralUser-GS.sf2 and /dev/null differ
diff --git a/Resources/Audio/MidiCustom/LICENSE b/Resources/Audio/MidiCustom/LICENSE
deleted file mode 100644
index 273d5cc6bf6..00000000000
--- a/Resources/Audio/MidiCustom/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-*** GeneralUser GS v2.0.1 ***
-***      License v2.0     ***
-
-** License of the complete work **
-You may use GeneralUser GS without restriction for your own music creation,
-private or commercial. This SoundFont bank is provided to the community free of
-charge. Please feel free to use it in your software projects, and to modify the
-SoundFont bank or its packaging to suit your needs.
-
-** License of contained samples **
-GeneralUser GS inherits the usage rights of the samples contained within, all of
-which allow full use in music production, including the ability to make profit
-from musical recordings created with GeneralUser GS.
-
-Many of the samples are original, but some were taken from other banks freely
-(and legally) available on the Internet from various SoundFont websites. Because
-GeneralUser GS originated as a personal project with no intention for
-publication, I cannot be 100% sure where all of the samples originated, although
-I do know that none of them came from commercially published SoundFont packages
-or sample CDs. Regardless, many "free" SoundFonts available on the web may
-indeed contain samples of questionable origin. My understanding of the
-copyrights of all samples is only as good as the information provided by the
-original sources. If you become aware of any restricted samples being used in
-GeneralUser GS, please let me know so I can replace them.
-
-This uncertainty may concern you if you intend to use GeneralUser GS in a
-commercial software product. That being said, I have never received any
-complaint regarding sample ownership since I published the original GeneralUser
-GS back in 2000, and as far as I am aware, neither have any of the companies
-creating commercial software products using GeneralUser GS.
-
-** More info **
-If you plan to feature GeneralUser GS on your own website, please do not link
-directly to my download files. Either link to my website, or provide your own
-local copy instead.
-
-I hope you enjoy GeneralUser GS! This SoundFont bank is the product of many
-years of hard work.
-
-You can find updates to GeneralUser GS and more of my virtual instruments at:
-http://www.schristiancollins.com
-
-I can be reached via the contact page on my website here:
-https://www.schristiancollins.com/contact
-
-Thank you!
--~Chris
diff --git a/Resources/Audio/MidiCustom/space-station-14.sf2 b/Resources/Audio/MidiCustom/space-station-14.sf2
index 54c6eb61963..8dcfce94729 100644
Binary files a/Resources/Audio/MidiCustom/space-station-14.sf2 and b/Resources/Audio/MidiCustom/space-station-14.sf2 differ
diff --git a/Resources/Audio/_DV/CosmicCult/Emotes/attributions.yml b/Resources/Audio/_DV/CosmicCult/Emotes/attributions.yml
deleted file mode 100644
index bb3730c9aa7..00000000000
--- a/Resources/Audio/_DV/CosmicCult/Emotes/attributions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- files:
-  - cosmic_laugh.ogg
-  - cosmic_scream.ogg
-  - cosmic_crying.ogg
-  - colossus_laugh.ogg
-  license: "CC-BY-SA-3.0"
-  copyright: "By NoElkaTheGod(GitHub) for Cosmic Cult. Made using a combination of (Creative Commons 0) samples from freesound.org."
-  source: "https://freesound.org/"
diff --git a/Resources/Audio/_DV/CosmicCult/Emotes/colossus_laugh.ogg b/Resources/Audio/_DV/CosmicCult/Emotes/colossus_laugh.ogg
deleted file mode 100644
index e870813a384..00000000000
Binary files a/Resources/Audio/_DV/CosmicCult/Emotes/colossus_laugh.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_crying.ogg b/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_crying.ogg
deleted file mode 100644
index f4928235bc9..00000000000
Binary files a/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_crying.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_laugh.ogg b/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_laugh.ogg
deleted file mode 100644
index b4f80783e93..00000000000
Binary files a/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_laugh.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_scream.ogg b/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_scream.ogg
deleted file mode 100644
index 0cd9ce0ce5b..00000000000
Binary files a/Resources/Audio/_DV/CosmicCult/Emotes/cosmic_scream.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/CosmicCult/attributions.yml b/Resources/Audio/_DV/CosmicCult/attributions.yml
index ffb5e423fd8..ddc167fc0d3 100644
--- a/Resources/Audio/_DV/CosmicCult/attributions.yml
+++ b/Resources/Audio/_DV/CosmicCult/attributions.yml
@@ -78,10 +78,3 @@
   license: "CC-BY-SA-3.0"
   copyright: "By widgetbeck for Cosmic Cult. Made using a combination of (Creative Commons 0) samples from freesound.org."
   source: "https://freesound.org/"
-
-- files:
-  - glyph_charge.ogg
-  - glyph_fail.ogg
-  license: "CC-BY-SA-3.0"
-  copyright: "By NoElkaTheGod(GitHub) for Cosmic Cult. Made using a combination of (Creative Commons 0) samples from freesound.org."
-  source: "https://freesound.org/"
diff --git a/Resources/Audio/_DV/CosmicCult/glyph_charge.ogg b/Resources/Audio/_DV/CosmicCult/glyph_charge.ogg
deleted file mode 100644
index 91c7e4952a5..00000000000
Binary files a/Resources/Audio/_DV/CosmicCult/glyph_charge.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/CosmicCult/glyph_fail.ogg b/Resources/Audio/_DV/CosmicCult/glyph_fail.ogg
deleted file mode 100644
index 4bd53d63cbf..00000000000
Binary files a/Resources/Audio/_DV/CosmicCult/glyph_fail.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/Weapons/attributions.yml b/Resources/Audio/_DV/Weapons/attributions.yml
index 5f400dbb8b6..6490b0508df 100644
--- a/Resources/Audio/_DV/Weapons/attributions.yml
+++ b/Resources/Audio/_DV/Weapons/attributions.yml
@@ -2,18 +2,3 @@
   license: "CC0-1.0"
   copyright: "electricguitarhit.ogg is modified by Colin-Tel from a file made by guitarguy1985."
   source: "https://freesound.org/people/guitarguy1985/sounds/52391/"
-
-- files: [shatter.ogg]
-  license: "CC0-1.0"
-  copyright: "Shatter.ogg by https://freesound.org/people/LukaCafuka/"
-  source: "https://freesound.org/people/LukaCafuka/sounds/753899/?"
-
-- files: [ shadowreload.ogg ]
-  license: "CC0-1.0"
-  copyright: "shadowreload.ogg by https://freesound.org/people/Camouflaged_Noob/"
-  source: "https://freesound.org/people/Camouflaged_Noob/sounds/483694/"
-
-- files: [ scytheshot.ogg ]
-  license: "CC-BY-NC-4.0"
-  copyright: "scytheshot.ogg by https://freesound.org/people/Timbre/ modified by AeraAulin(Github)"
-  source: "https://freesound.org/people/Timbre/sounds/115811/"
diff --git a/Resources/Audio/_DV/Weapons/scytheshot.ogg b/Resources/Audio/_DV/Weapons/scytheshot.ogg
deleted file mode 100644
index a3a21241c13..00000000000
Binary files a/Resources/Audio/_DV/Weapons/scytheshot.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/Weapons/shadowreload.ogg b/Resources/Audio/_DV/Weapons/shadowreload.ogg
deleted file mode 100644
index 2290410888f..00000000000
Binary files a/Resources/Audio/_DV/Weapons/shadowreload.ogg and /dev/null differ
diff --git a/Resources/Audio/_DV/Weapons/shatter.ogg b/Resources/Audio/_DV/Weapons/shatter.ogg
deleted file mode 100644
index 40fbd491ba5..00000000000
Binary files a/Resources/Audio/_DV/Weapons/shatter.ogg and /dev/null differ
diff --git a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite.ogg b/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite.ogg
deleted file mode 100644
index 095a418d170..00000000000
Binary files a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite.ogg and /dev/null differ
diff --git a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_ask.ogg b/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_ask.ogg
deleted file mode 100644
index 43062221e6b..00000000000
Binary files a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_ask.ogg and /dev/null differ
diff --git a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_exclaim.ogg b/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_exclaim.ogg
deleted file mode 100644
index be9e516d15f..00000000000
Binary files a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_exclaim.ogg and /dev/null differ
diff --git a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_scream.ogg b/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_scream.ogg
deleted file mode 100644
index b26f4afc6c8..00000000000
Binary files a/Resources/Audio/_Impstation/Voice/Talk/Anomalite/anomalite_scream.ogg and /dev/null differ
diff --git a/Resources/Locale/en-US/_DV/armor/armor-examine.ftl b/Resources/Locale/en-US/_DV/armor/armor-examine.ftl
index f8a4ff31ae5..9d1d309aa90 100644
--- a/Resources/Locale/en-US/_DV/armor/armor-examine.ftl
+++ b/Resources/Locale/en-US/_DV/armor/armor-examine.ftl
@@ -1,3 +1,2 @@
 armor-stamina-projectile-coefficient-value = - [color=yellow]Stamina projectile[/color] damage reduced by [color=lightblue]{$value}%[/color].
 armor-stamina-melee-coefficient-value = - [color=yellow]Stamina melee[/color] damage reduced by [color=lightblue]{$value}%[/color].
-armor-damage-type-shadow = Shadow
diff --git a/Resources/Locale/en-US/_DV/augments/augments.ftl b/Resources/Locale/en-US/_DV/augments/augments.ftl
index f1ca89bcc7f..c7888db4934 100644
--- a/Resources/Locale/en-US/_DV/augments/augments.ftl
+++ b/Resources/Locale/en-US/_DV/augments/augments.ftl
@@ -1,5 +1,3 @@
 augments-no-power-cell-slot = You don't have a power cell slot installed
 augment-tool-panel-hand-full = There's something in your hand
 augment-tool-panel-cannot-pick-up = Your hand isn't capable of holding that
-augment-tool-panel-examine = Their arm seems augmented.
-augment-tool-panel-examine-multiple = Their arms seem augmented.
diff --git a/Resources/Locale/en-US/_DV/cosmiccult/glyphs.ftl b/Resources/Locale/en-US/_DV/cosmiccult/glyphs.ftl
index 819ac431e4a..871e736c4f5 100644
--- a/Resources/Locale/en-US/_DV/cosmiccult/glyphs.ftl
+++ b/Resources/Locale/en-US/_DV/cosmiccult/glyphs.ftl
@@ -4,7 +4,6 @@ cult-glyph-conditions-not-met = No suitable targets within range of glyph!
 cult-glyph-too-many-targets = Too many targets present on glyph!
 cult-glyph-target-mindshield = Mental shielding prevents the glyph's influence from taking hold!
 cult-glyph-target-chaplain = A spark of divine power prevents the glyph's influence from taking hold!
-cult-glyph-target-mindless = The glyph fails to activate, as the target is currently mindless.
 
 cult-glyph-name-knowledge = Pact of Knowledge
 cult-glyph-description-knowledge = Knowledge. Instills the spark of indelible knowledge. Able to convert most to join our ranks.
diff --git a/Resources/Locale/en-US/_DV/damage/damage-types.ftl b/Resources/Locale/en-US/_DV/damage/damage-types.ftl
deleted file mode 100644
index dfd74d82a34..00000000000
--- a/Resources/Locale/en-US/_DV/damage/damage-types.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-damage-type-ion = Ion
-damage-type-shadow = Metaphysical
diff --git a/Resources/Locale/en-US/_DV/escape-menu/options-menu.ftl b/Resources/Locale/en-US/_DV/escape-menu/options-menu.ftl
index 71e4d1c8a34..68bb35fa5f5 100644
--- a/Resources/Locale/en-US/_DV/escape-menu/options-menu.ftl
+++ b/Resources/Locale/en-US/_DV/escape-menu/options-menu.ftl
@@ -2,7 +2,6 @@ ui-options-tab-deltav = DeltaV
 ui-options-general-forknotice = Note: These settings are fork-specific and might not apply on other servers.
 
 ui-options-no-filters = Disable species vision filters
-ui-options-disable-glimmer-effect = Disable high glimmer shader effect
 
 ## DeltaV NanoChat keybinds
 ui-options-header-nano-chat = NanoChat
diff --git a/Resources/Locale/en-US/_DV/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/_DV/guidebook/chemistry/statuseffects.ftl
index 44b6154892a..bbca0642819 100644
--- a/Resources/Locale/en-US/_DV/guidebook/chemistry/statuseffects.ftl
+++ b/Resources/Locale/en-US/_DV/guidebook/chemistry/statuseffects.ftl
@@ -1,6 +1,5 @@
 reagent-effect-status-effect-PsionicallyInsulated = psionic insulation
 reagent-effect-status-effect-PsionicsDisabled = inability to use psionic powers
 reagent-effect-status-effect-Anesthesia = surgical anesthesia
-reagent-effect-status-effect-ScrambledSpeech = scrambled speech
+reagent-effect-status-effect-SlurredSpeech = slurred speech
 reagent-effect-status-effect-PainNumbness = inability to sense pain
-reagent-effect-status-effect-RepeatingTelepath = to involuntarily repeat telepathic messages
diff --git a/Resources/Locale/en-US/_DV/linkports/link-ports.ftl b/Resources/Locale/en-US/_DV/linkports/link-ports.ftl
deleted file mode 100644
index 8ce3af9a713..00000000000
--- a/Resources/Locale/en-US/_DV/linkports/link-ports.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-signal-port-name-power-toggle = Toggle Power
-signal-port-description-power-toggle = A signal port, that toggles power state when it recieves a signal.
-
-signal-port-description-playback = Start audio playback.
-signal-port-description-record = Start recording audio.
-signal-port-description-rewind = Rewind audio.
-signal-port-description-pause = Stop playing, recording, or rewinding.
diff --git a/Resources/Locale/en-US/_DV/paper/book-salvage.ftl b/Resources/Locale/en-US/_DV/paper/book-salvage.ftl
index f4221cf3bd1..9736f6ccdaf 100644
--- a/Resources/Locale/en-US/_DV/paper/book-salvage.ftl
+++ b/Resources/Locale/en-US/_DV/paper/book-salvage.ftl
@@ -56,5 +56,3 @@ book-text-gorlexgirlfriend = It's the 197th version of the infamous Gorlex Girlf
     Most of the magazine is either Syndicate propaganda or advertisements for Syndicate-branded items like soda or merch from the show. At least there are some coupons on the back for them.
 
     On the last page is an ad for the Gorlex Girlfriends dating app... and the Gorlex Girlfriends Hotline.
-
-book-text-ancientbookcommon-1 = the text seems to shift and move, rendering it completely unreadable... but you feel as though these stories will become legible in time, and feel determined to keep uncovering the past.
diff --git a/Resources/Locale/en-US/_DV/pda/pda-component.ftl b/Resources/Locale/en-US/_DV/pda/pda-component.ftl
deleted file mode 100644
index 45701eebf46..00000000000
--- a/Resources/Locale/en-US/_DV/pda/pda-component.ftl
+++ /dev/null
@@ -1 +0,0 @@
-comp-pda-ui-current-date = Current date: [color=white]{ $date }[/color]
diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl
index 17067a539bf..0f7295a3b2a 100644
--- a/Resources/Locale/en-US/_DV/recipes/tags.ftl
+++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl
@@ -34,9 +34,3 @@ construction-graph-tag-carp-plushie = carp plushie
 
 # Moth plushie
 construction-graph-tag-mothroach-hide = mothroach hide
-
-# Hoodies
-construction-graph-tag-hoodie = hoodie
-
-# Ancient books
-construction-graph-tag-ancientbook = Damaged Ancient Book
diff --git a/Resources/Locale/en-US/_DV/research/technologies.ftl b/Resources/Locale/en-US/_DV/research/technologies.ftl
index fdf78f1cbcc..d915fcf1697 100644
--- a/Resources/Locale/en-US/_DV/research/technologies.ftl
+++ b/Resources/Locale/en-US/_DV/research/technologies.ftl
@@ -8,7 +8,6 @@ research-technology-engineering-eva = EVA PPE Suits
 
 # Experimental
 research-technology-cloning = Cloning
-research-technology-artifact-display = Artifact Display Technology
 
 # Civilian
 research-technology-civilian-mechs = Civilian Mechs
diff --git a/Resources/Locale/en-US/_DV/spray-painter/spray-painter.ftl b/Resources/Locale/en-US/_DV/spray-painter/spray-painter.ftl
deleted file mode 100644
index 71f1353033f..00000000000
--- a/Resources/Locale/en-US/_DV/spray-painter/spray-painter.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-spray-painter-style-airlockstandard-robotics = Robotics
-spray-painter-style-airlockglass-robotics = Robotics
-spray-painter-style-locker-cj = Chief Justice
-
-spray-painter-style-wallcloset-tools = Tools
-spray-painter-style-wallcloset-radiation = Radiation suit
-spray-painter-style-wallcloset-biohazard = Biohazard
-spray-painter-style-wallcloset-biohazardjanitor = Janitor biohazard
-spray-painter-style-wallcloset-biohazardsecurity = Security biohazard
-spray-painter-style-wallcloset-biohazardvirology = Virology biohazard
-
-spray-painter-style-walllocker-atmos = Atmospherics
-spray-painter-style-walllocker-engi = Engineering
-spray-painter-style-walllocker-electrical = Electrical
-spray-painter-style-walllocker-welding = Welding
-spray-painter-style-walllocker-botany = Hydroponics
-spray-painter-style-walllocker-salvage = Salvage
-spray-painter-style-walllocker-logistics = Logistics
-spray-painter-style-walllocker-janitor = Janitor
-spray-painter-style-walllocker-epistemics = Epistemics
-spray-painter-style-walllocker-security = Security
-spray-painter-style-walllocker-kitchen = Kitchen
-spray-painter-style-walllocker-justice = Justice
diff --git a/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl b/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl
index de6aeb9b146..b9412062426 100644
--- a/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl
+++ b/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl
@@ -8,9 +8,3 @@ uplink-foam-sabre-desc = A blade disguised as a toy foam sabre. Perfect for assa
 
 uplink-rigged-laser-tag-gun-name = Rigged Laser Tag Gun
 uplink-rigged-laser-tag-gun-desc = This laser tag gun has been tampered with to fire a much more harmful laser and can switch modes to be more covert and look like a regular laser tag gun.
-
-uplink-desword-name = Double-Bladed Energy Sword
-uplink-desword-desc = Now with twice as much energy per sword! Not the most practical design, but at least you can swing it faster now, albeit at a cost of lower damage per hit. Good luck blocking any bullets with it.
-
-uplink-harbinger-name = Harbinger Bundle
-uplink-harbinger-desc = A bundle with a full set of Harbinger armor and an Accursed scythe. Strike fear into the hearts of your enemies with this ancient design.
diff --git a/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl b/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl
index fce1eb5141f..68a5d34d31a 100644
--- a/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl
+++ b/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl
@@ -6,6 +6,3 @@ tool-quality-fine-screwing-tool-name = Thin-Tipped Screwdriver
 
 tool-quality-censer-name = Censer
 tool-quality-censer-tool-name = Censer
-
-tool-quality-restoration-name = Restoring
-tool-quality-restoration-tool-name = Restoration Kit
diff --git a/Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl
deleted file mode 100644
index d2805b498b4..00000000000
--- a/Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-uplink-hardsuit-cybersun-stealth-name = Cybersun Stealth Hardsuit
-uplink-hardsuit-cybersun-stealth-desc = Reversed engineered from Spider Clan technology, this hardsuit has stealth plating in it for those special ops. Faster, but less armored than the default hardsuits.
-## Harmony - Fixed typo
-## DeltaV - no slowdown
diff --git a/Resources/Locale/en-US/_Impstation/chat/chat-manager.ftl b/Resources/Locale/en-US/_Impstation/chat/chat-manager.ftl
deleted file mode 100644
index 2c7a512bfb1..00000000000
--- a/Resources/Locale/en-US/_Impstation/chat/chat-manager.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-chat-speech-verb-name-anomalite = Anomalite
-chat-speech-verb-anomalite-1 = twinkles
-chat-speech-verb-anomalite-2 = sparkles
-chat-speech-verb-anomalite-3 = glitters
diff --git a/Resources/Locale/en-US/_Impstation/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_Impstation/ghost/roles/ghost-role-component.ftl
deleted file mode 100644
index 0c3df4df4de..00000000000
--- a/Resources/Locale/en-US/_Impstation/ghost/roles/ghost-role-component.ftl
+++ /dev/null
@@ -1,17 +0,0 @@
-ghost-role-information-anomalite-description = A small sprite, born from the latent energies of an anomaly core. Loyal to its core, or whoever possesses it.
-ghost-role-information-familiar-anomalite-rules = You are a [color=#6495ed][bold]Familiar[/bold][/color], loyal to the Anomaly Core you came from (or whoever happens to have it right now.) Serve the interests of your master, whatever those may be.
-
-                                                  You don't remember any of your previous life, and you don't remember anything you learned as a ghost.
-
-# Anomalite Names
-ghost-role-information-fireanomalite-name = Pyroclastic Anomalite
-ghost-role-information-gravanomalite-name = Gravity Anomalite
-ghost-role-information-iceanomalite-name = Ice Anomalite
-ghost-role-information-fleshanomalite-name = Flesh Anomalite
-ghost-role-information-rockanomalite-name = Rock Anomalite
-ghost-role-information-reagentanomalite-name = Liquid Anomalite
-ghost-role-information-bluespaceanomalite-name = Bluespace Anomalite
-ghost-role-information-electricanomalite-name = Electricity Anomalite
-ghost-role-information-floralanomalite-name = Floral Anomalite
-ghost-role-information-shadowanomalite-name = Shadow Anomalite
-ghost-role-information-techanomalite-name = Tech Anomalite
diff --git a/Resources/Locale/en-US/_Impstation/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/_Impstation/interaction/interaction-popup-component.ftl
deleted file mode 100644
index 06ac48c9e74..00000000000
--- a/Resources/Locale/en-US/_Impstation/interaction/interaction-popup-component.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-## Anomalites
-
-petting-success-anomalite = You pet {THE($target)} on their anomalous little head.
-petting-failure-anomalite = You try to pet {THE($target)}, but your fingers are zapped by its energy field!
diff --git a/Resources/Locale/en-US/atmos/gas-pressure-regulator-system.ftl b/Resources/Locale/en-US/atmos/gas-pressure-regulator-system.ftl
deleted file mode 100644
index 0f30f3d75d1..00000000000
--- a/Resources/Locale/en-US/atmos/gas-pressure-regulator-system.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Examine Text
-gas-pressure-regulator-system-examined = The valve is [color={$statusColor}]{$open ->
-[true] open
-*[false] closed
-}[/color].
-gas-pressure-regulator-examined-threshold-pressure = The threshold pressure is set at [color=lightblue]{$threshold} kPa[/color].
-gas-pressure-regulator-examined-flow-rate = The flow rate meter indicates [color=lightblue]{$flowRate} L/s[/color].
diff --git a/Resources/Locale/en-US/components/gas-pressure-regulator-component.ftl b/Resources/Locale/en-US/components/gas-pressure-regulator-component.ftl
deleted file mode 100644
index 2434e2df632..00000000000
--- a/Resources/Locale/en-US/components/gas-pressure-regulator-component.ftl
+++ /dev/null
@@ -1,19 +0,0 @@
-# UI Labels
-gas-pressure-regulator-ui-set-threshold = Set
-gas-pressure-regulator-ui-zero-threshold = Zero
-gas-pressure-regulator-ui-set-to-current-pressure = Set to Inlet Pressure
-gas-pressure-regulator-ui-add-10 = +10
-gas-pressure-regulator-ui-add-100 = +100
-gas-pressure-regulator-ui-add-1000 = +1000
-gas-pressure-regulator-ui-subtract-10 = -10
-gas-pressure-regulator-ui-subtract-100 = -100
-gas-pressure-regulator-ui-subtract-1000 = -1000
-gas-pressure-regulator-ui-title = Inlet Pressure Regulator
-gas-pressure-regulator-ui-target = Setpoint
-gas-pressure-regulator-ui-flow = Flow
-gas-pressure-regulator-ui-outlet = Outlet
-gas-pressure-regulator-ui-inlet = Inlet
-
-# Units
-gas-pressure-regulator-ui-flow-rate-unit = L/s
-gas-pressure-regulator-ui-pressure-unit = kPa
diff --git a/Resources/Locale/en-US/damage/damage-types.ftl b/Resources/Locale/en-US/damage/damage-types.ftl
index 0d9a610ba14..3b6256864f2 100644
--- a/Resources/Locale/en-US/damage/damage-types.ftl
+++ b/Resources/Locale/en-US/damage/damage-types.ftl
@@ -11,4 +11,4 @@ damage-type-radiation = Radiation
 damage-type-shock = Shock
 damage-type-slash = Slash
 damage-type-structural = Structural
-damage-type-holy = Soul
+damage-type-holy = Holy
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index c86a601c901..bc6ef0d3494 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -20,7 +20,6 @@ guide-entry-manualvalve = Manual Valve
 guide-entry-signalvalve = Signal Valve
 guide-entry-pneumaticvalve = Pneumatic Valve
 guide-entry-passivegate = Passive Gate
-guide-entry-ressureregulator = Pressure Regulator
 guide-entry-mixingandfiltering = Mixing and Filtering
 guide-entry-gascanisters = Gas Canisters
 guide-entry-thermomachines = Thermomachines
diff --git a/Resources/Locale/en-US/spray-painter/spray-painter.ftl b/Resources/Locale/en-US/spray-painter/spray-painter.ftl
index 329fb228e80..b41c7302c18 100644
--- a/Resources/Locale/en-US/spray-painter/spray-painter.ftl
+++ b/Resources/Locale/en-US/spray-painter/spray-painter.ftl
@@ -112,10 +112,8 @@ spray-painter-style-locker-hos = HOS
 spray-painter-style-locker-medicine = Medicine
 spray-painter-style-locker-mime = Mime
 spray-painter-style-locker-paramedic = Paramedic
-# DeltaV: Logistics
-spray-painter-style-locker-quartermaster = Logistics Officer
-# DeltaV: Epistemics
-spray-painter-style-locker-rd = Mystagogue
+spray-painter-style-locker-quartermaster = Quartermaster
+spray-painter-style-locker-rd = RD
 spray-painter-style-locker-representative = Representative
 spray-painter-style-locker-salvage = Salvage
 spray-painter-style-locker-scientist = Scientist
@@ -162,8 +160,7 @@ spray-painter-style-cratesteel-basic = Basic
 spray-painter-style-cratesteel-electrical = Electrical
 spray-painter-style-cratesteel-engineering = Engineering
 spray-painter-style-cratesteel-radiation = Radiation
-# DeltaV: Epistemics
-spray-painter-style-cratesteel-science = Epistemics
+spray-painter-style-cratesteel-science = Science
 spray-painter-style-cratesteel-surgery = Surgery
 
 spray-painter-style-crateplastic-basic = Basic
@@ -181,15 +178,13 @@ spray-painter-style-cratesecure-hydroponics = Hydroponics
 spray-painter-style-cratesecure-medical = Medical
 spray-painter-style-cratesecure-plasma = Plasma
 spray-painter-style-cratesecure-private = Private
-# DeltaV: Epistemics
-spray-painter-style-cratesecure-science = Epistemics
+spray-painter-style-cratesecure-science = Science
 spray-painter-style-cratesecure-secgear = Secgear
 spray-painter-style-cratesecure-weapon = Weapon
 
 # Canisters
 spray-painter-style-canisters-air = Air
-# DeltaV: Miasma
-spray-painter-style-canisters-ammonia = Miasma
+spray-painter-style-canisters-ammonia = Ammonia
 spray-painter-style-canisters-carbon-dioxide = Carbon dioxide
 spray-painter-style-canisters-frezon = Frezon
 spray-painter-style-canisters-nitrogen = Nitrogen
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index c53f567cc79..eab5942ebbe 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -221,7 +221,7 @@
     event: !type:ToggleClothingEvent
 
 - type: entity
-  parent: BaseMentalAction
+  parent: BaseAction
   id: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode
diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index ab4752ee7e6..a0b6b57ec17 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -127,14 +127,3 @@
       - id: BookInspiration
         prob: 0.1
         orGroup: BookAuthor
-      # Begin DeltaV Additions
-      - id: AncientBookDamagedCommon
-        prob: 0.07
-        orGroup: BookPool
-      - id: AncientBookDamagedUncommon
-        prob: 0.05
-        orGroup: BookPool
-      - id: AncientBookDamagedRare
-        prob: 0.03
-        orGroup: BookPool
-      # End DeltaV Additions
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
index 60efd89f048..bfca2a4edac 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -15,7 +15,7 @@
     ClothingUniformBrownSuit: 2 #imp
     ClothingUniformBrownSuitSkirt: 2 #imp
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetLibrarian: 2
+    ClothingHeadsetService: 2
   contrabandInventory:
     ToyFigurineLibrarian: 1
 
diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml
index 0153fc9c180..962ef1339ef 100644
--- a/Resources/Prototypes/Damage/containers.yml
+++ b/Resources/Prototypes/Damage/containers.yml
@@ -6,8 +6,6 @@
     - Toxin
     - Airloss
     - Genetic
-  supportedTypes: # DeltaV - add shadow damage
-    - Shadow
 
 - type: damageContainer
   id: Inorganic
diff --git a/Resources/Prototypes/Damage/groups.yml b/Resources/Prototypes/Damage/groups.yml
index 4e1f9f3addb..3beeed7e6b2 100644
--- a/Resources/Prototypes/Damage/groups.yml
+++ b/Resources/Prototypes/Damage/groups.yml
@@ -48,4 +48,3 @@
   name: damage-group-metaphysical
   damageTypes:
   - Holy
-  - Shadow # DeltaV
diff --git a/Resources/Prototypes/Decals/lettering.yml b/Resources/Prototypes/Decals/lettering.yml
deleted file mode 100644
index 81b893db5fb..00000000000
--- a/Resources/Prototypes/Decals/lettering.yml
+++ /dev/null
@@ -1,321 +0,0 @@
-- type: decal
-  id: StencilNumber0
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil0
-
-- type: decal
-  id: StencilNumber1
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil1
-
-- type: decal
-  id: StencilNumber2
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil2
-
-- type: decal
-  id: StencilNumber3
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil3
-
-- type: decal
-  id: StencilNumber4
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil4
-
-- type: decal
-  id: StencilNumber5
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil5
-
-- type: decal
-  id: StencilNumber6
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil6
-
-- type: decal
-  id: StencilNumber7
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil7
-
-- type: decal
-  id: StencilNumber8
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil8
-
-- type: decal
-  id: StencilNumber9
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil9
-
-- type: decal
-  id: StencilLetterA
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilA
-
-- type: decal
-  id: StencilLetterB
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilB
-
-- type: decal
-  id: StencilLetterC
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilC
-
-- type: decal
-  id: StencilLetterD
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilD
-
-- type: decal
-  id: StencilLetterE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilE
-
-- type: decal
-  id: StencilLetterF
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilF
-
-- type: decal
-  id: StencilLetterG
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilG
-
-- type: decal
-  id: StencilLetterH
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilH
-
-- type: decal
-  id: StencilLetterI
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilI
-
-- type: decal
-  id: StencilLetterJ
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilJ
-
-- type: decal
-  id: StencilLetterK
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilK
-
-- type: decal
-  id: StencilLetterL
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilL
-
-- type: decal
-  id: StencilLetterM
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilM
-
-- type: decal
-  id: StencilLetterN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilN
-
-- type: decal
-  id: StencilLetterO
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilO
-
-- type: decal
-  id: StencilLetterP
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilP
-
-- type: decal
-  id: StencilLetterQ
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilQ
-
-- type: decal
-  id: StencilLetterR
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilR
-
-- type: decal
-  id: StencilLetterS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilS
-
-- type: decal
-  id: StencilLetterT
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilT
-
-- type: decal
-  id: StencilLetterU
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilU
-
-- type: decal
-  id: StencilLetterV
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilV
-
-- type: decal
-  id: StencilLetterW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilW
-
-- type: decal
-  id: StencilLetterX
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilX
-
-- type: decal
-  id: StencilLetterY
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilY
-
-- type: decal
-  id: StencilLetterZ
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencilZ
-
-- type: decal
-  id: StencilSymbolAmpersand
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Ampersand
-
-- type: decal
-  id: StencilSymbolAsterix
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Asterix
-
-- type: decal
-  id: StencilSymbolDash
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Dash
-
-- type: decal
-  id: StencilSymbolEquals
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Equals
-
-- type: decal
-  id: StencilSymbolExclaim
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Exclaim
-
-- type: decal
-  id: StencilSymbolHash
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Hash
-
-- type: decal
-  id: StencilSymbolSpeso
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Speso
-
-- type: decal
-  id: StencilSymbolMultiocular
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Multiocular
-
-- type: decal
-  id: StencilSymbolPlus
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Plus
-
-- type: decal
-  id: StencilSymbolQuestion
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/stencil.rsi
-    state: stencil_Question
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 17b3dc2067d..ffb0f746cc7 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -278,10 +278,7 @@
         - DiscreteHealthAnalyzer
         - SurgeryTool
         - Dropper
-        # Begin DeltaV additions
-        - Vial
-        - Syringe
-        # End DeltaV Additions
+        - Vial # DeltaV - vial gaming
       components:
         - Defibrillator # DeltaV - Add PortaFib to EMT belt
         - Hypospray
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 34d17590a77..45be59bcbd9 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -471,8 +471,6 @@
         Heat: 0.3
         Radiation: 0.1
         Caustic: 0.2
-        Holy: 0.7 # DeltaV
-        Shadow: 0.7 # DeltaV
   - type: DamageOnShootProtection # imp
     slots: OUTERCLOTHING
     damageProtection:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 7b9b1692d19..65f8f66106c 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -105,7 +105,6 @@
         range: 1, 2
     - !type:NestedSelector
       tableId: RandomInstrumentTable
-    - id: AncientBookDamagedCommon # DeltaV
 
 - type: entityTable
   id: SalvageTreasureUncommon
@@ -131,7 +130,6 @@
     - id: WristwatchGold
     - !type:NestedSelector
       tableId: RingTableCommon
-    - id: AncientBookDamagedUncommon # DeltaV
 
 - type: entityTable
   id: SalvageTreasureRare
@@ -165,7 +163,6 @@
           weight: 1
     - !type:NestedSelector
       tableId: RingTableRare
-    - id: AncientBookDamagedRare # DeltaV
 
 - type: entityTable
   id: SalvageTreasureLegendary
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 6abae46440e..33de7cffed7 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -253,7 +253,6 @@
     - FootstepSound
     - CanPilot
     - SiliconEmotes
-    - SiliconOrIPCEmotes # DeltaV
     - Unimplantable
   - type: Emoting
   - type: GuideHelp
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 75db27f2221..1c35fc6649d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1627,11 +1627,11 @@
       path: /Audio/Animals/lizard_happy.ogg
     interactFailureSound:
       path: /Audio/Items/wirecutter.ogg
-  #- type: MobThresholds # DeltaV - buff kobolds
-  #  thresholds:
-  #    0: Alive
-  #    60: Critical
-  #    125: Dead
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      60: Critical
+      125: Dead
   - type: MovementSpeedModifier
     baseWalkSpeed: 3.5
     baseSprintSpeed: 5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 3cdb7b2eb0c..eac9f58f97c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -28,7 +28,6 @@
     tags:
     - DoorBumpOpener
     - SiliconEmotes
-    - SiliconOrIPCEmotes # DeltaV
     - Unimplantable
   - type: MobState
     allowedStates:
@@ -108,7 +107,6 @@
     tags:
     - DoorBumpOpener
     - SiliconEmotes
-    - SiliconOrIPCEmotes # DeltaV
     - Bot
     - Unimplantable
   - type: Body
@@ -478,7 +476,6 @@
     - DoorBumpOpener
     - FootstepSound
     - SiliconEmotes
-    - SiliconOrIPCEmotes # DeltaV
     - Bot
     - Unimplantable
   - type: ActiveRadio
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
index bc2cf92ece9..fce8ab48fd2 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -63,7 +63,7 @@
     damage:
       types:
         Piercing: 8
-        Shadow: 7 # DeltaV - add shadow damage to relevant mobs
+        Slash: 7
   - type: InputMover
   - type: MobMover
   - type: HTN
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index b53c3f6bf62..9ccff4b6ea6 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -144,16 +144,12 @@
     - Adrenaline
     - PsionicsDisabled #Nyano - Summary: PCs can have psionics disabled.
     - PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers.
-    # Begin DeltaV additions
-    - Addicted # Psych med addictions system
-    - SuppressAddiction # Psych med addictions system
-    - InPain # Pain system
-    - SuppressPain # Pain system
-    - Anesthesia # Anesthesia
-    - PainNumbness # Pain numbness status effect
-    - ScrambledSpeech
-    - RepeatingTelepath
-    # End DeltaV additions
+    - Addicted # DeltaV - Psych med addictions system
+    - SuppressAddiction # DeltaV - Psych med addictions system
+    - InPain # DeltaV - Pain system
+    - SuppressPain # DeltaV - Pain system
+    - Anesthesia # DeltaV - Anesthesia
+    - PainNumbness # DeltaV - Pain numbness status effect
   - type: Body
     prototype: Human
     requiredLegs: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 42873da5082..7e4034e48ed 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -83,16 +83,6 @@
             Quantity: 10
           - ReagentId: Omnizine
             Quantity: 30
-    # Begin DeltaV additions
-      omnizinecigarette:
-        reagents:
-          - ReagentId: Nicotine
-            Quantity: 10
-          - ReagentId: Omnizine
-            Quantity: 3
-  - type: Extractable
-    grindableSolutionName: omnizinecigarette
-    # End DeltaV additions
 
 - type: entity
   id: CigaretteOmnizine
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
index e3f299217e8..39baa36b8b7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
@@ -33,8 +33,6 @@
   - type: Tag
     tags:
     - Trash
-  - type: Extractable # Funkychem
-    grindableSolutionName: smokable
   - type: SolutionContainerManager
     solutions:
       smokable:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
index 86518b8a3cb..02eaf3cc7d1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
@@ -29,25 +29,15 @@
   name: super synthesizer
   description: Blasting the ghetto with Touhou MIDIs since 2020.
   components:
-  - type: ActivatableUI #Delta-V - Allows Super Synths to be played while being worn on the neck.
-    inHandsOnly: false
-    requireActiveHand: false
   - type: Instrument
     allowPercussion: true
     allowProgramChange: true
-    respectMidiLimits: true #Delta-V - Enables limits to prevent people from crashing the server with black midis.
+    respectMidiLimits: false
   - type: Sprite
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
     state: supersynth
-  - type: Clothing #Delta-V - The straps on the super synth have a use now. Makes the super synth wearable on the neck slot.
-    quickEquip: false
-    slots:
-    - neck
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
   - type: Item
     heldPrefix: super
-    size: Normal #Delta-V - Ensures that the sprite properly renders, had to add this because it wouldn't render properly on the ground and in UI/bag UI otherwise.
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
 
 - type: entity
   parent: BaseKeyedInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index eacdf6730fa..6bc68233bc5 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -54,7 +54,7 @@
     instrumentList:
       "Aah": {52: 0}
       "Ooh": {53: 0}
-      "Kweh": {4: 1} # Delta-V change - The very gods despair at the sight of the re implementation of this accursed instrument style - Solaris
+      # "Kweh": {4: 1} #Delta-V change, this stupid instrument fucks with literally every single midi known to mankind. Uncomment when whoever added this makes this not fuck with every midi. - Solaris
   - type: Sprite
     sprite: Objects/Fun/Instruments/microphone.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 341cf47e71e..30a0d074d4e 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -7,12 +7,11 @@
   components:
     - type: Sprite
       sprite: Objects/Weapons/Melee/shields.rsi
-      state: icon
-      #state: riot-icon #Harmony Change: Replaced with a more suitable state due to being redudant
+      state: riot-icon
     - type: Item
       sprite: Objects/Weapons/Melee/shields.rsi
       size: Ginormous
-      #heldPrefix: riot #Harmony Change: Removed due to being redundant
+      heldPrefix: riot
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -79,19 +78,6 @@
   id: RiotShield
   description: A large tower shield. Good for controlling crowds.
   components:
-# Begin of Harmony Change: Shield Rework -- Suit Storage Slot
-    - type: Sprite
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi
-      state: icon
-    - type: Item
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi
-      size: Ginormous
-    - type: Clothing
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi
-      quickEquip: false
-      slots:
-      - suitStorage
-# End of Harmony Change
     - type: StaticPrice
       price: 90
     - type: Blocking
@@ -113,21 +99,10 @@
   id: RiotLaserShield
   description: A shield built for withstanding lasers, but not much else.
   components:
-# Begin of Harmony Change: Shield Rework -- Suit Storage Slot
     - type: Sprite
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi
-      state: icon
-      #state: riot_laser-icon 
+      state: riot_laser-icon
     - type: Item
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi
-      size: Ginormous
-      #heldPrefix: riot_laser
-    - type: Clothing
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi
-      quickEquip: false
-      slots:
-      - suitStorage
-# End of Harmony Change
+      heldPrefix: riot_laser
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -144,21 +119,10 @@
   id: RiotBulletShield
   description: A shield built for protecting against ballistics, but not much else.
   components:
-# Begin of Harmony Change: Shield Rework -- Suit Storage Slot
     - type: Sprite
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi
-      state: icon
-      #state: riot_bullet-icon 
+      state: riot_bullet-icon
     - type: Item
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi
-      size: Ginormous
-      #heldPrefix: riot_bullet
-    - type: Clothing
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi
-      quickEquip: false
-      slots:
-      - suitStorage 
-# End of Harmony Change
+      heldPrefix: riot_bullet
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -177,21 +141,10 @@
   id: WoodenBuckler
   description: A small round wooden makeshift shield.
   components:
-# Begin of Harmony Change: Shield Rework -- Suit Storage Slot
     - type: Sprite
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/buckler.rsi
-      state: icon
-      #state: buckler-icon
+      state: buckler-icon
     - type: Item
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/buckler.rsi
-      size: Ginormous
-      #heldPrefix: buckler
-    - type: Clothing
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/buckler.rsi
-      quickEquip: false
-      slots:
-      - suitStorage
-# End of Harmony Change
+      heldPrefix: buckler
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -243,21 +196,10 @@
   id: MakeshiftShield
   description: A rundown looking shield, not good for much.
   components:
-# Begin of Harmony Change: Shield Rework -- Suit Storage Slot
     - type: Sprite
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi 
-      state: icon
-      #state: makeshift-icon
+      state: makeshift-icon
     - type: Item
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi
-      size: Ginormous
-      #heldPrefix: metal
-    - type: Clothing
-      sprite: _Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi
-      quickEquip: false
-      slots:
-      - suitStorage 
-  # End of Harmony Change
+      heldPrefix: metal
     - type: Blocking
       passiveBlockModifier:
         coefficients:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
index d038c091684..036b876a97a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
@@ -54,10 +54,6 @@
       enum.IntercomUiKey.Key:
         type: IntercomBoundUserInterface
   - type: Appearance
-  - type: Tag # DeltaV - allows for artifacts to be used in the crafting system
-    tags:
-      - Artifact
-  # gameplay interactions
   - type: Item
     size: Normal
     sprite: Objects/Specific/Xenoarchaeology/item_artifacts.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
deleted file mode 100644
index 58bd2234608..00000000000
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-- type: entity
-  parent: [BaseStructureDynamic, BaseXenoArtifact]
-  id: BaseXenoArtifactStructure
-  name: artifact
-  abstract: true
-  noSpawn: true
-  components:
-  # Visual
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
-    noRot: true
-    layers:
-    - state: ano30
-      map: [ "enum.ArtifactsVisualLayers.Base" ]
-    - state: ano30_on
-      map: [ "enum.ArtifactsVisualLayers.UnlockingEffect" ]
-      visible: false
-    - state: artifact-activation
-      map: [ "enum.ArtifactsVisualLayers.ActivationEffect" ]
-      visible: false
-  - type: RandomArtifactSprite
-    maxSprite: 36
-  - type: RandomSprite
-    available:
-    - enum.ArtifactsVisualLayers.UnlockingEffect:
-        ano01_on: Rainbow
-  # Begin DeltaV Additions
-  - type: Item
-    size: Ginormous
-  - type: MultiHandedItem
-  - type: ClothingSpeedModifier
-    walkModifier: 0.5
-    sprintModifier: 0.5
-  - type: Tag # DeltaV - allows for artifacts to be used in the crafting system
-    tags:
-      - Artifact
-  # End DeltaV Additions
-  - type: Transform
-    noRot: true
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.45
-        density: 75
-        layer: # doesn't collide with artifact storage
-        - Opaque
-        mask:
-        - MachineMask
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 15b94d17cdb..6128b53da9c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -332,7 +332,6 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 1.5
-    changeSwingDirection: true # DeltaV
     angle: 100
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 32ba8298509..0421ded6b35 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -139,8 +139,6 @@
     sprite: Structures/Doors/Airlocks/Standard/mining.rsi
   - type: Wires
     layoutId: AirlockCargo
-  - type: Paintable
-    group: null
 
 - type: entity
   parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel
@@ -157,8 +155,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
-  - type: Paintable
-    group: null
 
 - type: entity
   parent: Airlock
@@ -167,8 +163,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
-  - type: Paintable
-    group: null
 
 # Glass
 - type: entity
@@ -220,7 +214,7 @@
 - type: entity
   parent: AirlockGlass
   id: AirlockHydroponicsGlass
-  suffix: Hydroponics
+  suffix: Hydroponics 
   components:
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Glass/hydroponics.rsi # DeltaV - Resprite Doors
@@ -301,8 +295,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/mining.rsi
-  - type: Paintable
-    group: null
 
 - type: entity
   parent: AirlockCommandGlass # see standard
@@ -311,33 +303,3 @@
   components:
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Glass/centcomm.rsi # DeltaV - Resprite Doors
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockStandardGlass
-  suffix: Service
-  components:
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/basic.rsi
-
-# Begin DeltaV removal: we don't have these things yet
-#- type: entity
-#  parent: Airlock
-#  id: AirlockXeno
-#  suffix: Xeno
-#  components:
-#  - type: Sprite
-#    sprite: Structures/Doors/Airlocks/Standard/xeno.rsi
-#  - type: Paintable
-#    group: null
-#
-#- type: entity
-#  parent: AirlockGlass
-#  id: AirlockGlassXeno
-#  suffix: Xeno
-#  components:
-#  - type: Sprite
-#    sprite: Structures/Doors/Airlocks/Glass/xeno.rsi
-#  - type: Paintable
-#    group: null
-# End DeltaV removal
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index e3dbc48a6bd..0e7eebbcb21 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: Airlock
   parent: BaseStructure
   name: airlock
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index d638e6852f0..bde8f129ad6 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -16,10 +16,10 @@
       path: /Audio/Machines/airlock_deny.ogg
   - type: Sprite
     sprite: _DV/Structures/Doors/Airlocks/Standard/external.rsi #Delta V - Resprite Doors
-  - type: Wires
-    layoutId: AirlockExternal
   - type: Paintable
     group: null
+  - type: Wires
+    layoutId: AirlockExternal
 
 - type: entity
   parent: AirlockExternal
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index 7e5ccb282d3..db4afd3420e 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -15,10 +15,6 @@
     state: icon
   - type: TimedDespawn
     lifetime: 90
-  - type: PointLight # DeltaV - lit holograms
-    enabled: true
-    radius: 3
-    color: yellow
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -52,10 +48,6 @@
   - type: Airtight
     noAirWhenFullyAirBlocked: false
   - type: Holofan # DeltaV - for whitelisting
-  - type: PointLight # DeltaV - lit holograms
-    enabled: true
-    radius: 3
-    color: yellow
 
 - type: entity
   id: HolosignSecurity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index ff32861cbbc..7ddde137838 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -335,15 +335,14 @@
     - RoboticsStatic
     - BorgModulesStatic
     - BorgLimbsStatic
-    - PowerAugments # DeltaV - augments
-    - ToolAugments # DeltaV - augments
     dynamicPacks:
     - Robotics
     - BorgModules
     - MechParts
     - MechEquipment
-    - Surgery # DeltaV - Share Surgery Parts between Epi and Med.
-    - CyberneticsRobotics # DeltaV - Share Surgery Parts between Epi and Med.
+    - Cybernetics # Shitmed change
+    - PowerAugments # DeltaV - augments
+    - ToolAugments # DeltaV - augments
   - type: EmagLatheRecipes # DeltaV
     emagStaticPacks:
     - RoboticsEmagStatic
@@ -535,9 +534,6 @@
     - ReportingStatic
     - EVASuit
     - PowerCellsStatic
-    - IPCLimbsStatic
-    - PowerAugments
-    - ToolAugments
     # End DeltaV Additions
     dynamicPacks:
     - Chemistry
@@ -546,7 +542,6 @@
     # Being DeltaV Additions
     - MedicalDeltaV
     - ParamedicHardsuit
-    - Cybernetics
     # End DeltaV Additions
   - type: Machine
     board: MedicalTechFabCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml
index 62d90657a96..1f4ab085f1d 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml
@@ -131,427 +131,3 @@
     sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
   - type: Construction
     node: fourwayAlt2
-
-# GasPressurePump
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPressurePump]
-  id: GasPressurePumpAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPressure
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: pressurepumpAlt1
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPressurePump]
-  id: GasPressurePumpAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPressure
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: pressurepumpAlt2
-
-# GasVolumePump
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasVolumePump]
-  id: GasVolumePumpAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpVolume
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: volumepumpAlt1
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasVolumePump]
-  id: GasVolumePumpAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpVolume
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: volumepumpAlt2
-
-# GasPassiveGate
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPassiveGate]
-  id: GasPassiveGateAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPassiveGate
-      map: [ "enum.SubfloorLayers.FirstLayer" ]
-  - type: Construction
-    node: passivegateAlt1
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPassiveGate]
-  id: GasPassiveGateAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPassiveGate
-      map: [ "enum.SubfloorLayers.FirstLayer" ]
-  - type: Construction
-    node: passivegateAlt2
-
-# GasValve
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasValve]
-  id: GasValveAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpManualValve
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: valveAlt1
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasValve]
-  id: GasValveAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpManualValve
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: valveAlt2
-
-# SignalControlledValve
-
-- type: entity
-  parent: [GasPipeLayerAlt1, SignalControlledValve]
-  id: SignalControlledValveAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpSignalValve
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: signalvalveAlt1
-
-- type: entity
-  parent: [GasPipeLayerAlt2, SignalControlledValve]
-  id: SignalControlledValveAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpSignalValve
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: signalvalveAlt2
-
-# GasPipeSensor
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPipeSensor]
-  id: GasPipeSensorAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-  - type: Construction
-    node: sensorAlt1
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPipeSensor]
-  id: GasPipeSensorAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-  - type: Construction
-    node: sensorAlt2
-
-# GasPipeSensorDistribution
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPipeSensorDistribution]
-  id: GasPipeSensorDistributionAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPipeSensorDistribution]
-  id: GasPipeSensorDistributionAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-# GasPipeSensorWaste
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPipeSensorWaste]
-  id: GasPipeSensorWasteAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPipeSensorWaste]
-  id: GasPipeSensorWasteAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-# GasPipeSensorMixedAir
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPipeSensorMixedAir]
-  id: GasPipeSensorMixedAirAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPipeSensorMixedAir]
-  id: GasPipeSensorMixedAirAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-# GasPipeSensorTEGHot
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPipeSensorTEGHot]
-  id: GasPipeSensorTEGHotAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPipeSensorTEGHot]
-  id: GasPipeSensorTEGHotAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-# GasPipeTEGCold
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPipeSensorTEGCold]
-  id: GasPipeSensorTEGColdAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPipeSensorTEGCold]
-  id: GasPipeSensorTEGColdAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-      state: pipeStraight
-    - map: ["base"]
-      state: base
-    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
-      state: lights
-      shader: unshaded
-
-# GasPressureRegulator
-
-- type: entity
-  parent: [GasPipeLayerAlt1, GasPressureRegulator]
-  id: GasPressureRegulatorAlt1
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPressureRegulator
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: pressureregulatorAlt1
-
-- type: entity
-  parent: [GasPipeLayerAlt2, GasPressureRegulator]
-  id: GasPressureRegulatorAlt2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPressureRegulator
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: Construction
-    node: pressureregulatorAlt2
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index 500631540e5..9d4b229df47 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -34,7 +34,7 @@
   name: gas pump
   description: A pump that moves gas by pressure.
   placement:
-    mode: AlignAtmosPipeLayers
+    mode: SnapgridCenter
   components:
   - type: ExtensionCableReceiver
   - type: LightningTarget
@@ -55,11 +55,6 @@
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: pumpPressure
       map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPressurePump
-      Secondary: GasPressurePumpAlt1
-      Tertiary: GasPressurePumpAlt2
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -98,7 +93,7 @@
   name: volumetric gas pump
   description: A pump that moves gas by volume.
   placement:
-    mode: AlignAtmosPipeLayers
+    mode: SnapgridCenter
   components:
     - type: ExtensionCableReceiver
     - type: LightningTarget
@@ -119,11 +114,6 @@
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: pumpVolume
           map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-    - type: AtmosPipeLayers
-      alternativePrototypes:
-        Primary: GasVolumePump
-        Secondary: GasVolumePumpAlt1
-        Tertiary: GasVolumePumpAlt2
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -165,67 +155,6 @@
       guides:
       - Pumps
 
-- type: entity
-  parent: GasBinaryBase
-  id: GasPressureRegulator
-  name: inlet pressure regulator
-  description: A valve that releases gas when the inlet pressure exceeds a certain threshold.
-  placement:
-    mode: AlignAtmosPipeLayers
-  components:
-  - type: Rotatable
-  - type: Transform
-    noRot: false
-  - type: SubFloorHide
-    visibleLayers:
-    - enum.SubfloorLayers.FirstLayer
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPressureRegulator
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPressureRegulator
-      Secondary: GasPressureRegulatorAlt1
-      Tertiary: GasPressureRegulatorAlt2
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.PressureRegulatorVisuals.State:
-        enabled:
-          True: { state: pumpPressureRegulatorOn }
-          False: { state: pumpPressureRegulator }
-  - type: PipeColorVisuals
-  - type: GasPressureRegulator
-    enabled: false
-    threshold: 4500
-  - type: Construction
-    graph: GasBinary
-    node: pressureregulator
-  - type: ActivatableUI
-    key: enum.GasPressureRegulatorUiKey.Key
-    blockSpectators: true
-  - type: ActivatableUIRequiresAnchor
-  - type: UserInterface
-    interfaces:
-      enum.GasPressureRegulatorUiKey.Key:
-        type: GasPressureRegulatorBoundUserInterface
-  - type: AmbientSound
-    enabled: false
-    volume: -9
-    range: 5
-    sound:
-      path: /Audio/Ambience/Objects/gas_hiss.ogg
-  - type: AtmosMonitoringConsoleDevice
-    navMapBlip: GasFlowRegulator
-  - type: GuideHelp
-    guides:
-    - PressureRegulator
-
 - type: entity
   parent: GasBinaryBase
   id: GasPassiveGate
@@ -245,11 +174,6 @@
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: pumpPassiveGate
           map: [ "enum.SubfloorLayers.FirstLayer" ]
-    - type: AtmosPipeLayers
-      alternativePrototypes:
-        Primary: GasPassiveGate
-        Secondary: GasPassiveGateAlt1
-        Tertiary: GasPassiveGateAlt2
     - type: Appearance
     - type: PipeColorVisuals
     - type: GasPassiveGate
@@ -274,7 +198,7 @@
   name: manual valve
   description: A pipe with a valve that can be used to disable the flow of gas through it.
   placement:
-    mode: AlignAtmosPipeLayers
+    mode: SnapgridCenter
   components:
     # TODO ATMOS: Give unique sprite.
     - type: SubFloorHide
@@ -288,11 +212,6 @@
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: pumpManualValve
           map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-    - type: AtmosPipeLayers
-      alternativePrototypes:
-        Primary: GasValve
-        Secondary: GasValveAlt1
-        Tertiary: GasValveAlt2
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -335,7 +254,7 @@
   name: signal valve
   description: A pipe with a valve that can be controlled with signals.
   placement:
-    mode: AlignAtmosPipeLayers
+    mode: SnapgridCenter
   components:
   - type: StationAiWhitelist
   - type: SubFloorHide
@@ -349,11 +268,6 @@
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: pumpSignalValve
       map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: SignalControlledValve
-      Secondary: SignalControlledValveAlt1
-      Tertiary: SignalControlledValveAlt2
   - type: Appearance
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml.orig b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml.orig
deleted file mode 100644
index 5a8664e4e66..00000000000
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml.orig
+++ /dev/null
@@ -1,661 +0,0 @@
-- type: entity
-  parent: GasPipeBase
-  abstract: true
-  id: GasBinaryBase
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: AtmosDevice
-  - type: Tag
-    tags:
-      - Unstackable
-  - type: SubFloorHide
-    blockInteractions: false
-    blockAmbience: false
-  - type: NodeContainer
-    nodes:
-      inlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: North
-      outlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: South
-  - type: AtmosPipeLayers
-    spriteRsiPaths:
-      Primary: Structures/Piping/Atmospherics/pump.rsi
-      Secondary: Structures/Piping/Atmospherics/pump_alt1.rsi
-      Tertiary: Structures/Piping/Atmospherics/pump_alt2.rsi
-
-- type: entity
-  parent: GasBinaryBase
-  id: GasPressurePump
-  name: gas pump
-  description: A pump that moves gas by pressure.
-  placement:
-    mode: AlignAtmosPipeLayers
-  components:
-  - type: ExtensionCableReceiver
-  - type: LightningTarget
-    priority: 1
-  - type: ApcPowerReceiver
-    powerLoad: 200
-  - type: Rotatable
-  - type: Transform
-    noRot: false
-  - type: SubFloorHide
-    visibleLayers:
-    - enum.SubfloorLayers.FirstLayer
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPressure
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPressurePump
-      Secondary: GasPressurePumpAlt1
-      Tertiary: GasPressurePumpAlt2
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.PumpVisuals.Enabled:
-        enabled:
-          True: { state: pumpPressureOn }
-          False: { state: pumpPressure }
-  - type: PipeColorVisuals
-  - type: GasPressurePump
-    enabled: false
-  - type: ActivatableUI
-    key: enum.GasPressurePumpUiKey.Key
-  - type: ActivatableUIRequiresAnchor
-  - type: UserInterface
-    interfaces:
-      enum.GasPressurePumpUiKey.Key:
-        type: GasPressurePumpBoundUserInterface
-  - type: Construction
-    graph: GasBinary
-    node: pressurepump
-  - type: AmbientSound
-    enabled: false
-    volume: -9
-    range: 5
-    sound:
-      path: /Audio/Ambience/Objects/gas_pump.ogg
-  - type: AtmosMonitoringConsoleDevice
-    navMapBlip: GasFlowRegulator
-  - type: GuideHelp
-    guides:
-    - Pumps
-
-- type: entity
-  parent: GasBinaryBase
-  id: GasVolumePump
-  name: volumetric gas pump
-  description: A pump that moves gas by volume.
-  placement:
-    mode: AlignAtmosPipeLayers
-  components:
-    - type: ExtensionCableReceiver
-    - type: LightningTarget
-      priority: 1
-    - type: ApcPowerReceiver
-      powerLoad: 200
-    - type: Rotatable
-    - type: Transform
-      noRot: false
-    - type: SubFloorHide
-      visibleLayers:
-      - enum.SubfloorLayers.FirstLayer
-    - type: Sprite
-      sprite: Structures/Piping/Atmospherics/pump.rsi
-      layers:
-        - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-          map: [ "enum.PipeVisualLayers.Pipe" ]
-        - state: pumpVolume
-          map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-    - type: AtmosPipeLayers
-      alternativePrototypes:
-        Primary: GasVolumePump
-        Secondary: GasVolumePumpAlt1
-        Tertiary: GasVolumePumpAlt2
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.GasVolumePumpVisuals.State:
-          enabled:
-            On: { state: pumpVolumeOn }
-            Off: { state: pumpVolume }
-            Blocked: { state: pumpVolumeBlocked }
-    - type: PipeColorVisuals
-    - type: GasVolumePump
-      enabled: false
-    - type: ActivatableUI
-      key: enum.GasVolumePumpUiKey.Key
-    - type: ActivatableUIRequiresAnchor
-    - type: UserInterface
-      interfaces:
-        enum.GasVolumePumpUiKey.Key:
-          type: GasVolumePumpBoundUserInterface
-    - type: Construction
-      graph: GasBinary
-      node: volumepump
-    - type: AmbientSound
-      enabled: false
-      volume: -9
-      range: 5
-      sound:
-        path: /Audio/Ambience/Objects/gas_pump.ogg
-    - type: DeviceNetwork
-      deviceNetId: AtmosDevices
-      receiveFrequencyId: AtmosMonitor
-      transmitFrequencyId: AtmosMonitor
-      sendBroadcastAttemptEvent: true
-      examinableAddress: true
-      prefix: device-address-prefix-volume-pump
-    - type: WiredNetworkConnection
-    - type: AtmosMonitoringConsoleDevice
-      navMapBlip: GasFlowRegulator
-    - type: GuideHelp
-      guides:
-      - Pumps
-
-- type: entity
-  parent: GasBinaryBase
-  id: GasPressureRegulator
-  name: inlet pressure regulator
-  description: A valve that releases gas when the inlet pressure exceeds a certain threshold.
-  placement:
-<<<<<<< HEAD
-    mode: AlignAtmosPipeLayers
-=======
-    mode: SnapgridCenter
->>>>>>> f874459092 (Pressure Relief Valve (#36708))
-  components:
-  - type: Rotatable
-  - type: Transform
-    noRot: false
-  - type: SubFloorHide
-    visibleLayers:
-    - enum.SubfloorLayers.FirstLayer
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpPressureRegulator
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-<<<<<<< HEAD
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPressureRegulator
-      Secondary: GasPressureRegulatorAlt1
-      Tertiary: GasPressureRegulatorAlt2
-=======
->>>>>>> f874459092 (Pressure Relief Valve (#36708))
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.PressureRegulatorVisuals.State:
-        enabled:
-          True: { state: pumpPressureRegulatorOn }
-          False: { state: pumpPressureRegulator }
-  - type: PipeColorVisuals
-  - type: GasPressureRegulator
-    enabled: false
-    threshold: 4500
-  - type: Construction
-    graph: GasBinary
-    node: pressureregulator
-  - type: ActivatableUI
-    key: enum.GasPressureRegulatorUiKey.Key
-    blockSpectators: true
-  - type: ActivatableUIRequiresAnchor
-  - type: UserInterface
-    interfaces:
-      enum.GasPressureRegulatorUiKey.Key:
-        type: GasPressureRegulatorBoundUserInterface
-  - type: AmbientSound
-    enabled: false
-    volume: -9
-    range: 5
-    sound:
-      path: /Audio/Ambience/Objects/gas_hiss.ogg
-  - type: AtmosMonitoringConsoleDevice
-    navMapBlip: GasFlowRegulator
-  - type: GuideHelp
-    guides:
-    - PressureRegulator
-
-- type: entity
-  parent: GasBinaryBase
-  id: GasPassiveGate
-  name: passive gate
-  description: A one-way air valve that does not require power.
-  placement:
-    mode: AlignAtmosPipeLayers
-  components:
-    - type: SubFloorHide
-      visibleLayers:
-      - enum.SubfloorLayers.FirstLayer
-    - type: Sprite
-      sprite: Structures/Piping/Atmospherics/pump.rsi
-      layers:
-        - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-          map: [ "enum.PipeVisualLayers.Pipe" ]
-        - state: pumpPassiveGate
-          map: [ "enum.SubfloorLayers.FirstLayer" ]
-    - type: AtmosPipeLayers
-      alternativePrototypes:
-        Primary: GasPassiveGate
-        Secondary: GasPassiveGateAlt1
-        Tertiary: GasPassiveGateAlt2
-    - type: Appearance
-    - type: PipeColorVisuals
-    - type: GasPassiveGate
-    - type: Construction
-      graph: GasBinary
-      node: passivegate
-    - type: AmbientSound
-      enabled: true
-      volume: -9
-      range: 5
-      sound:
-        path: /Audio/Ambience/Objects/gas_hiss.ogg
-    - type: AtmosMonitoringConsoleDevice
-      navMapBlip: GasValve
-    - type: GuideHelp
-      guides:
-      - PassiveGate
-
-- type: entity
-  parent: GasBinaryBase
-  id: GasValve
-  name: manual valve
-  description: A pipe with a valve that can be used to disable the flow of gas through it.
-  placement:
-    mode: AlignAtmosPipeLayers
-  components:
-    # TODO ATMOS: Give unique sprite.
-    - type: SubFloorHide
-      visibleLayers:
-      - enum.SubfloorLayers.FirstLayer
-    - type: Sprite
-      sprite: Structures/Piping/Atmospherics/pump.rsi
-      layers:
-        - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-          map: [ "enum.PipeVisualLayers.Pipe" ]
-        - state: pumpManualValve
-          map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-    - type: AtmosPipeLayers
-      alternativePrototypes:
-        Primary: GasValve
-        Secondary: GasValveAlt1
-        Tertiary: GasValveAlt2
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.FilterVisuals.Enabled:
-          enabled:
-            True: { state: pumpManualValveOn }
-            False: { state: pumpManualValve }
-    - type: PipeColorVisuals
-    - type: GasValve
-    - type: NodeContainer
-      nodes:
-        inlet:
-          !type:PipeNode
-          nodeGroupID: Pipe
-          pipeDirection: North
-          volume: 100
-        outlet:
-          !type:PipeNode
-          nodeGroupID: Pipe
-          pipeDirection: South
-          volume: 100
-    - type: Construction
-      graph: GasBinary
-      node: valve
-    - type: AmbientSound
-      enabled: true
-      volume: -9
-      range: 5
-      sound:
-        path: /Audio/Ambience/Objects/gas_hiss.ogg
-    - type: AtmosMonitoringConsoleDevice
-      navMapBlip: GasValve
-    - type: GuideHelp
-      guides:
-      - ManualValve
-
-- type: entity
-  parent: GasBinaryBase
-  id: SignalControlledValve
-  name: signal valve
-  description: A pipe with a valve that can be controlled with signals.
-  placement:
-    mode: AlignAtmosPipeLayers
-  components:
-  - type: StationAiWhitelist
-  - type: SubFloorHide
-    visibleLayers:
-    - enum.SubfloorLayers.FirstLayer
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/pump.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: pumpSignalValve
-      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: SignalControlledValve
-      Secondary: SignalControlledValveAlt1
-      Tertiary: SignalControlledValveAlt2
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.FilterVisuals.Enabled:
-        enabled:
-          True: { state: pumpSignalValveOn }
-          False: { state: pumpSignalValve }
-  - type: PipeColorVisuals
-  - type: GasValve
-  - type: SignalControlledValve
-  - type: DeviceNetwork
-    deviceNetId: Wireless
-    receiveFrequencyId: BasicDevice
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: DeviceLinkSink
-    ports:
-      - Open
-      - Close
-      - Toggle
-  - type: NodeContainer
-    nodes:
-      inlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: North
-        volume: 100
-      outlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: South
-        volume: 100
-  - type: Construction
-    graph: GasBinary
-    node: signalvalve
-  - type: AmbientSound
-    enabled: true
-    volume: -9
-    range: 5
-    sound:
-      path: /Audio/Ambience/Objects/gas_hiss.ogg
-  - type: AtmosMonitoringConsoleDevice
-    navMapBlip: GasValve
-  - type: GuideHelp
-    guides:
-    - SignalValve
-
-- type: entity
-  parent: GasBinaryBase
-  id: GasPort
-  name: connector port
-  description: For connecting portable devices related to atmospherics control.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: SubFloorHide
-      visibleLayers:
-      - enum.SubfloorLayers.FirstLayer
-    - type: Sprite
-      sprite: Structures/Piping/Atmospherics/gascanisterport.rsi
-      layers:
-        - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeUnaryConnectors
-          map: [ "enum.PipeVisualLayers.Pipe" ]
-        - state: gasCanisterPort
-          map: [ "enum.SubfloorLayers.FirstLayer" ]
-    - type: AtmosPipeLayers
-      spriteRsiPaths: {}
-    - type: Appearance
-    - type: PipeColorVisuals
-    - type: GasPort
-    - type: NodeContainer
-      nodes:
-        connected:
-          !type:PortPipeNode
-          nodeGroupID: Pipe
-          pipeDirection: South
-    - type: Construction
-      graph: GasBinary
-      node: port
-    - type: AtmosMonitoringConsoleDevice
-      navMapBlip: GasVentOpening
-    - type: GuideHelp
-      guides:
-      - GasCanisters
-
-- type: entity
-  parent: GasVentPump
-  id: GasDualPortVentPump
-  name: dual-port air vent
-  description: Has a valve and a pump attached to it. There are two ports, one is an input for releasing air, the other is an output when siphoning.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: SubFloorHide
-      visibleLayers:
-      - enum.SubfloorLayers.FirstLayer
-    - type: Sprite
-      drawdepth: FloorObjects
-      sprite: Structures/Piping/Atmospherics/vent.rsi
-      layers:
-        - sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeBinaryConnectors
-          map: [ "enum.PipeVisualLayers.Pipe" ]
-        - state: vent_off
-          map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ]
-    - type: AtmosPipeLayers
-      spriteRsiPaths: {}
-    - type: GenericVisualizer
-      visuals:
-        enum.VentPumpVisuals.State:
-          enabled:
-            Off: { state: vent_off }
-            In: { state: vent_in }
-            Out: { state: vent_out }
-            Welded: { state: vent_welded }
-            Lockout: { state: vent_lockout }
-    - type: PipeColorVisuals
-    - type: GasVentPump
-      inlet: inlet
-      outlet: outlet
-      canLink: true
-    - type: DeviceNetwork
-      deviceNetId: Wireless
-      receiveFrequencyId: BasicDevice
-    - type: WirelessNetworkConnection
-      range: 200
-    - type: DeviceLinkSink
-      ports:
-        - Pressurize
-        - Depressurize
-    - type: Construction
-      graph: GasBinary
-      node: dualportventpump
-    - type: NodeContainer
-      nodes:
-        inlet:
-          !type:PipeNode
-          nodeGroupID: Pipe
-          pipeDirection: North
-        outlet:
-          !type:PipeNode
-          nodeGroupID: Pipe
-          pipeDirection: South
-    - type: AmbientSound
-      enabled: true
-    - type: AtmosMonitoringConsoleDevice
-      navMapBlip: GasVentOpening
-    - type: GuideHelp
-      guides:
-      - AirVent
-
-- type: entity
-  parent: [ BaseMachine, ConstructibleMachine ]
-  id: GasRecycler
-  name: gas recycler
-  description: Recycles carbon dioxide and nitrous oxide. Heater and compressor not included.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Sprite
-    sprite: Structures/Machines/gasrecycler.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeBinaryConnectors
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: running
-    - state: unlit
-      shader: unshaded
-  - type: AtmosPipeLayers
-    spriteLayersRsiPaths:
-      enum.PipeVisualLayers.Pipe:
-        Primary: Structures/Piping/Atmospherics/pipe.rsi
-        Secondary: Structures/Piping/Atmospherics/pipe_alt1.rsi
-        Tertiary: Structures/Piping/Atmospherics/pipe_alt2.rsi
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.PumpVisuals.Enabled:
-        enabled:
-          True: { state: running }
-          False: { state: unlit }
-  - type: PipeColorVisuals
-  - type: Rotatable
-  - type: GasRecycler
-  - type: PipeRestrictOverlap
-  - type: NodeContainer
-    nodes:
-      inlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: North
-      outlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: South
-  - type: AtmosDevice
-  - type: AtmosPipeColor
-  - type: AmbientSound
-    enabled: true
-    volume: -9
-    range: 5
-    sound:
-      path: /Audio/Ambience/Objects/gas_pump.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalGlassBreak
-      - !type:ChangeConstructionNodeBehavior
-        node: machineFrame
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Machine
-    board: GasRecyclerMachineCircuitboard
-  - type: AtmosMonitoringConsoleDevice
-    navMapBlip: GasValve
-
-- type: entity
-  parent: GasBinaryBase
-  id: HeatExchanger
-  name: radiator
-  description: Transfers heat between the pipe and its surroundings.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Rotatable
-  - type: Transform
-    noRot: false
-  - type: Sprite
-    sprite: Structures/Piping/Atmospherics/heatexchanger.rsi
-    layers:
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeStraight
-      map: [ "enum.PipeVisualLayers.Pipe" ]
-    - state: heStraight
-      map: [ "enum.SubfloorLayers.FirstLayer" ]
-  - type: AtmosPipeLayers
-    spriteRsiPaths: {}
-    numberOfPipeLayers: 1
-  - type: SubFloorHide
-    visibleLayers:
-    - enum.SubfloorLayers.FirstLayer
-  - type: Appearance
-  - type: PipeColorVisuals
-  - type: AtmosDevice
-  - type: HeatExchanger
-  - type: NodeContainer
-    nodes:
-      inlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: North
-      outlet:
-        !type:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: South
-  - type: Construction
-    graph: GasBinary
-    node: radiator
-  - type: AtmosMonitoringConsoleDevice
-    navMapBlip: Thermoregulator
-  - type: GuideHelp
-    guides:
-    - Radiators
-
-- type: entity
-  parent: HeatExchanger
-  id: HeatExchangerBend
-  suffix: Bend
-  components:
-    - type: SubFloorHide
-      visibleLayers:
-      - enum.SubfloorLayers.FirstLayer
-    - type: Sprite
-      layers:
-      - sprite: Structures/Piping/Atmospherics/pipe.rsi
-        state: pipeBend
-        map: [ "enum.PipeVisualLayers.Pipe" ]
-      - state: heBend
-        map: [ "enum.SubfloorLayers.FirstLayer" ]
-    - type: NodeContainer
-      nodes:
-        inlet:
-          !type:PipeNode
-          nodeGroupID: Pipe
-          pipeDirection: South
-        outlet:
-          !type:PipeNode
-          nodeGroupID: Pipe
-          pipeDirection: West
-    - type: Construction
-      graph: GasBinary
-      node: bendradiator
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
index 92466f32314..c70b33639e5 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
@@ -4,7 +4,7 @@
   name: gas pipe sensor
   description: Reports on the status of the gas in the attached pipe network.
   placement:
-    mode: AlignAtmosPipeLayers
+    mode: SnapgridCenter
   components:
   - type: Sprite
     sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
@@ -23,10 +23,6 @@
       Primary: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
       Secondary: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
       Tertiary: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
-    alternativePrototypes:
-      Primary: GasPipeSensor
-      Secondary: GasPipeSensorAlt1
-      Tertiary: GasPipeSensorAlt2
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -66,11 +62,6 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-distribution-loop
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPipeSensorDistribution
-      Secondary: GasPipeSensorDistributionAlt1
-      Tertiary: GasPipeSensorDistributionAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -79,11 +70,6 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-waste-loop
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPipeSensorWaste
-      Secondary: GasPipeSensorWasteAlt1
-      Tertiary: GasPipeSensorWasteAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -92,11 +78,6 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-mixed-air
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPipeSensorMixedAir
-      Secondary: GasPipeSensorMixedAirAlt1
-      Tertiary: GasPipeSensorMixedAirAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -105,11 +86,6 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-teg-hot-loop
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPipeSensorTEGHot
-      Secondary: GasPipeSensorTEGHotAlt1
-      Tertiary: GasPipeSensorTEGHotAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -118,8 +94,3 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-teg-cold-loop
-  - type: AtmosPipeLayers
-    alternativePrototypes:
-      Primary: GasPipeSensorTEGCold
-      Secondary: GasPipeSensorTEGColdAlt1
-      Tertiary: GasPipeSensorTEGColdAlt2
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
index b95eb300b82..45a5a6d4d6a 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
@@ -49,9 +49,6 @@
   - type: IgnitionSource
     temperature: 400
     ignited: true
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomalitePyroclastic
 
 - type: entity
   parent: BaseAnomalyCore
@@ -65,9 +62,6 @@
     energy: 10
     color: "#1e070e"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteGravity
 
 - type: entity
   parent: BaseAnomalyCore
@@ -81,9 +75,6 @@
     energy: 1.5
     color: "#befaff"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteIce
 
 - type: entity
   parent: BaseAnomalyCore
@@ -98,9 +89,6 @@
     energy: 3.5
     color: "#cb5b7e"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteFlesh
 
 - type: entity
   parent: BaseAnomalyCore
@@ -114,9 +102,6 @@
     energy: 3.5
     color: "#5ca8cb"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteRock
 
 - type: entity
   parent: BaseAnomalyCore
@@ -130,9 +115,6 @@
     energy: 3.5
     color: "#ffffff"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteLiquid
 
 - type: entity
   parent: BaseAnomalyCore
@@ -146,9 +128,6 @@
     energy: 3.5
     color: "#00ccff"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteBluespace
 
 - type: entity
   parent: BaseAnomalyCore
@@ -163,9 +142,6 @@
     color: "#ffffaa"
     castShadows: false
   - type: Electrified
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteElectricity
 
 - type: entity
   parent: BaseAnomalyCore
@@ -181,9 +157,6 @@
     energy: 2.0
     color: "#6270bb"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteFlora
 
 - type: entity
   parent: [ BaseAnomalyCore, BaseShadow ]
@@ -197,9 +170,6 @@
     energy: 2.0
     color: "#793a80"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteShadow
 
 - type: entity
   parent: BaseAnomalyCore
@@ -213,9 +183,6 @@
     energy: 2.0
     color: "#56c1e8"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteTech
 
 - type: entity
   parent: BaseAnomalyCore
@@ -259,9 +226,6 @@
     energy: 1.5
     color: "#fca3c0"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomalitePyroclastic
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -275,9 +239,6 @@
     energy: 10
     color: "#1e070e"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteGravity
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -291,9 +252,6 @@
     energy: 1.5
     color: "#befaff"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteIce
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -308,9 +266,6 @@
     energy: 3.5
     color: "#cb5b7e"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteFlesh
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -324,9 +279,6 @@
     energy: 3.5
     color: "#5ca8cb"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteRock
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -340,9 +292,6 @@
     energy: 3.5
     color: "#ffffff"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteLiquid
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -356,9 +305,6 @@
     energy: 3.5
     color: "#00ccff"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteBluespace
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -372,9 +318,6 @@
     energy: 2.0
     color: "#ffffaa"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteElectricity
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -390,9 +333,6 @@
     energy: 2.0
     color: "#6270bb"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteFlora
 
 - type: entity
   parent: [ BaseAnomalyInertCore, BaseShadow ]
@@ -406,9 +346,6 @@
     energy: 2.0
     color: "#793a80"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteShadow
 
 - type: entity
   parent: BaseAnomalyInertCore
@@ -422,9 +359,6 @@
     energy: 2.0
     color: "#56c1e8"
     castShadows: false
-  - type: Summonable # imp
-    requiresBibleUser: false
-    specialItem: SpawnPointGhostAnomaliteTech
 
 - type: entity
   parent: BaseAnomalyInertCore
diff --git a/Resources/Prototypes/Guidebook/engineering.yml b/Resources/Prototypes/Guidebook/engineering.yml
index 6b5d8e2eae2..861153c7fee 100644
--- a/Resources/Prototypes/Guidebook/engineering.yml
+++ b/Resources/Prototypes/Guidebook/engineering.yml
@@ -121,7 +121,6 @@
   - SignalValve
   - PneumaticValve
   - PassiveGate
-  - PressureRegulator
 
 - type: guideEntry
   id: ManualValve
@@ -143,11 +142,6 @@
   name: guide-entry-passivegate
   text: "/ServerInfo/Guidebook/Engineering/PassiveGate.xml"
 
-- type: guideEntry
-  id: PressureRegulator
-  name: guide-entry-ressureregulator
-  text: "/ServerInfo/Guidebook/Engineering/PressureRegulator.xml"
-
 - type: guideEntry
   id: MixingAndFiltering
   name: guide-entry-mixingandfiltering
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index eac9fc9f876..e49c15331b3 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -778,7 +778,6 @@
   - PanFlute
   - Ocarina
   - Bagpipe
-  - SuperSynthesizerInstrument #Delta-V - Ports Super Synth Trinket from Starlight
 
 # Cargo
 - type: loadoutGroup
diff --git a/Resources/Prototypes/Magic/forcewall_spells.yml b/Resources/Prototypes/Magic/forcewall_spells.yml
index e0c586fe069..c0c5a2eec68 100644
--- a/Resources/Prototypes/Magic/forcewall_spells.yml
+++ b/Resources/Prototypes/Magic/forcewall_spells.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: BaseAction
   id: ActionForceWall
-  name: Force Wall # DeltaV
+  name: forcewall
   description: Creates a magical barrier.
   components:
   - type: Action
@@ -18,7 +18,3 @@
       posData: !type:TargetInFront
   - type: SpeakOnAction
     sentence: action-speech-spell-forcewall
-  # Begin DeltaV Additions - Allows this to actually charge when learned from the Book of Mysteries.
-  - type: AutoRecharge
-    rechargeDuration: 90
-  # End DeltaV Additions
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml
index 445d62080fa..7349a439353 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml
@@ -23,8 +23,6 @@
       # - id: ClothingOuterCoatMantis
       - id: ClothingOuterWinterCoatMantis
       # - id: ClothingEyesGlassesSunglasses
-      - id: PillMindbreakerToxin # DeltaV - non-loadout mindbreaker available
-        amount: 2
       # Insulative headgear
       - id: ClothingHeadTinfoil
       - id: ClothingHeadCage
diff --git a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml
index 5ee9013a882..ce313f73b93 100644
--- a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml
@@ -1,3 +1,17 @@
+- type: damageModifierSet
+  id: Oni
+  coefficients:
+    Blunt: 0.85
+    Slash: 0.85
+    Piercing: 0.85
+
+- type: damageModifierSet
+  id: Felinid
+  coefficients:
+    Blunt: 1.15
+    Slash: 1.15
+    Piercing: 1.15
+
 # For airlocks, etc, to prevent cheesing.
 - type: damageModifierSet
   id: MetallicStructure
@@ -10,3 +24,38 @@
     Blunt: 5
     Heat: 5
 #  minimumDamageToDamage: 10
+
+- type: damageModifierSet
+  id: CancerMouse
+  coefficients:
+    Radiation: -0.25
+
+- type: damageModifierSet
+  id: Spirit
+  coefficients:
+    Cold: 0.0
+    Shock: 0.2
+    Heat: 3.0
+    Holy: 5.0
+
+- type: damageModifierSet
+  id: CorporealSpirit
+  coefficients:
+    Cold: 0.0
+    Shock: 0.5
+    Blunt: 0.5
+    Slash: 0.5
+    Piercing: 0.5
+    Heat: 1.5
+    Holy: 3.0
+
+- type: damageModifierSet
+  id: ShockAbsorber
+  coefficients:
+    Blunt: 0.7
+    Slash: 0.5
+    Piercing: 0.7
+    Shock: 0
+  flatReductions:
+    Blunt: 5
+    Heat: 5
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
index c2a8075542d..6db6cfae00e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -77,7 +77,4 @@
       - BookFishops # DeltaV - fishops book
 #      - BookDetective
 #      - BookSalvageEpistemics1 # Nyanotrasen - Epistemic Lore Book
-      - AncientBookDamagedCommon # DeltaV
-      - AncientBookDamagedUncommon # DeltaV
-      - AncientBookDamagedRare # DeltaV
     rareChance: 0.25
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index bf35647bf5a..a3807799823 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -12,7 +12,7 @@
   - type: ScaleVisuals
     scale: 1.2, 1.2
   - type: PlayerToolModifier
-    pryTimeMultiplier: 0.5
+    pryTimeMultiplier: 0.6
   - type: PlayerAccuracyModifier
     spreadMultiplier: 15
     maxSpreadAngle: 180
@@ -25,8 +25,6 @@
         Slash: 1.2
         Piercing: 1.2
         Asphyxiation: 1.35
-  - type: ClothingSlowResistance
-    modifier: 0.25 # Slowdowns incurred by worn clothing are 25% less effective.
   - type: Damageable
     damageModifierSet: Oni
   - type: Body
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Holographic/projections.yml
index daf594993e4..97a1bbf0127 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Holographic/projections.yml
@@ -8,7 +8,3 @@
     state: icon
   - type: TimedDespawn
     lifetime: 180
-  - type: PointLight
-    enabled: true
-    radius: 3
-    color: orange
diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml
index 99b75807581..3e8415fc0ea 100644
--- a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml
+++ b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml
@@ -87,10 +87,10 @@
           reagent: LotophagoiOil
           min: 20
       - !type:GenericStatusEffect
-        key: ScrambledSpeech
+        key: Stutter
         component: ScrambledAccent
       - !type:GenericStatusEffect
-        key: RepeatingTelepath
+        key: SlurredSpeech
         component: TelepathicRepeater
 
 - type: reagent
diff --git a/Resources/Prototypes/Paintables/airlock_groups.yml b/Resources/Prototypes/Paintables/airlock_groups.yml
index 74a208383b2..06188f9b23c 100644
--- a/Resources/Prototypes/Paintables/airlock_groups.yml
+++ b/Resources/Prototypes/Paintables/airlock_groups.yml
@@ -12,16 +12,13 @@
     engineering: AirlockEngineering
     freezer: AirlockFreezer
     hydroponics: AirlockHydroponics
+    justice: AirlockJustice
     maintenance: AirlockMaint
     medical: AirlockMedical
     salvage: AirlockSalvage
     science: AirlockScience
-    # DeltaV: Robotics
-    robotics: AirlockRobotics
     security: AirlockSecurity
     virology: AirlockVirology
-    # DeltaV: Justice
-    justice: AirlockJustice
 
 - type: paintableGroup
   id: AirlockGlass
@@ -36,13 +33,10 @@
     command: AirlockCommandGlass
     engineering: AirlockEngineeringGlass
     hydroponics: AirlockHydroponicsGlass
+    justice: AirlockJusticeGlass
     maintenance: AirlockMaintGlass
     medical: AirlockMedicalGlass
     salvage: AirlockSalvageGlass
     science: AirlockScienceGlass
-    # DeltaV: Robotics
-    robotics: AirlockRoboticsGlass
     security: AirlockSecurityGlass
     virology: AirlockVirologyGlass
-    # DeltaV: Justice
-    justice: AirlockJusticeGlass
diff --git a/Resources/Prototypes/Paintables/locker_groups.yml b/Resources/Prototypes/Paintables/locker_groups.yml
index 33c45785d7a..b9bdf1c89fa 100644
--- a/Resources/Prototypes/Paintables/locker_groups.yml
+++ b/Resources/Prototypes/Paintables/locker_groups.yml
@@ -28,8 +28,6 @@
     scientist: LockerScientist
     security: LockerSecurity
     welding: LockerWeldingSupplies
-    # DeltaV: Justice
-    cj: LockerChiefJustice
 
 - type: paintableGroup
   id: Closet
@@ -72,14 +70,6 @@
     pink: ClosetWallPink
     white: ClosetWallWhite
     yellow: ClosetWallYellow
-    # Begin DeltaV changes
-    tools: WallClosetTools
-    radiation: WallClosetRadiationSuit
-    biohazard: WallClosetL3
-    biohazardjanitor: WallClosetL3Janitor
-    biohazardsecurity: WallClosetL3Security
-    biohazardvirology: WallClosetL3Virology
-    # End DeltaV changes
 
 - type: paintableGroup
   id: WallLocker
@@ -88,17 +78,3 @@
   styles:
     evac: LockerWallEvacRepair
     medical: LockerWallMedical
-    # Begin DeltaV changes
-    atmos: WallLockerAtmos
-    engi: WallLockerEngi
-    electrical: WallLockerElectrical
-    welding: WallLockerWelding
-    botany: WallLockerBotany
-    salvage: WallLockerSalvage
-    logistics: WallLockerLogistics
-    janitor: WallLockerJanitor
-    epistemics: WallLockerEpistemics
-    security: WallLockerSecurity
-    kitchen: WallLockerKitchen
-    justice: WallLockerJustice
-    # End DeltaV changes
diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index e0e320a0f10..b70f2a5c8f4 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -105,15 +105,6 @@
         - proto: WeaponTeslaGun
           prob: 0.1
           cost: 2
-        # Begin DeltaV Additions
-        - proto: AncientBookDamagedCommon
-        - proto: AncientBookDamagedUncommon
-          prob: 0.7
-          cost: 2
-        - proto: AncientBookDamagedRare
-          prob: 0.3
-          cost: 4
-        # End DeltaV Additions
 
 # Mob loot table
 
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index da3e6a9ba24..8d317102c1b 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -214,7 +214,7 @@
           types:
             Poison: 1
       - !type:GenericStatusEffect
-        key: ScrambledSpeech
+        key: Stutter
         component: ScrambledAccent
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 04ed767b846..265abc48a34 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -15,7 +15,7 @@
         component: PsionicInsulation #Nyano - Summary: see above.
         type: Add
       - !type:GenericStatusEffect
-        key: ScrambledSpeech
+        key: Stutter
         component: ScrambledAccent
       - !type:GenericStatusEffect
         key: PsionicsDisabled #Nyano - Summary: disables psinoics from being used by the wearer.
@@ -1132,12 +1132,6 @@
             Heat: -0.2
             Shock: -0.2
             Cold: -0.2
-      - !type:HealthChange # Delta-V
-        damage:
-          types:
-            Shadow: -2
-            Holy: 2
-
 
   reactiveEffects:
     Extinguish:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
index 678495edbcc..aed91671789 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
@@ -10,108 +10,30 @@
         amount: 2
         doAfter: 1
 
-    - to: pressurepumpAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressurepumpAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
     - to: volumepump
       steps:
       - material: Steel
         amount: 2
         doAfter: 1
 
-    - to: volumepumpAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: volumepumpAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
     - to: passivegate
       steps:
       - material: Steel
         amount: 2
         doAfter: 1
 
-    - to: passivegateAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: passivegateAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
     - to: valve
       steps:
       - material: Steel
         amount: 2
         doAfter: 1
 
-    - to: valveAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: valveAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
     - to: signalvalve
       steps:
       - material: Steel
         amount: 2
         doAfter: 1
 
-    - to: signalvalveAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: signalvalveAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressureregulator
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressureregulatorAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressureregulatorAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
     - to: port
       steps:
       - material: Steel
@@ -152,38 +74,6 @@
       - tool: Welding
         doAfter: 1
 
-  - node: pressurepumpAlt1
-    entity: GasPressurePumpAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-          prototype: SheetSteel1
-          amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressurepumpAlt2
-    entity: GasPressurePumpAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
   - node: volumepump
     entity: GasVolumePump
     edges:
@@ -200,38 +90,6 @@
       - tool: Welding
         doAfter: 1
 
-  - node: volumepumpAlt1
-    entity: GasVolumePumpAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: volumepumpAlt2
-    entity: GasVolumePumpAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
   - node: passivegate
     entity: GasPassiveGate
     edges:
@@ -248,38 +106,6 @@
       - tool: Welding
         doAfter: 1
 
-  - node: passivegateAlt1
-    entity: GasPassiveGateAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: passivegateAlt2
-    entity: GasPassiveGateAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
   - node: valve
     entity: GasValve
     edges:
@@ -296,38 +122,6 @@
       - tool: Welding
         doAfter: 1
 
-  - node: valveAlt1
-    entity: GasValveAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: valveAlt2
-    entity: GasValveAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
   - node: signalvalve
     entity: SignalControlledValve
     edges:
@@ -344,86 +138,6 @@
       - tool: Welding
         doAfter: 1
 
-  - node: signalvalveAlt1
-    entity: SignalControlledValveAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: signalvalveAlt2
-    entity: SignalControlledValveAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressureregulator
-    entity: GasPressureRegulator
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressureregulatorAlt1
-    entity: GasPressureRegulatorAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressureregulatorAlt2
-    entity: GasPressureRegulatorAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
   - node: port
     entity: GasPort
     edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml.orig b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml.orig
deleted file mode 100644
index 08c64598288..00000000000
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml.orig
+++ /dev/null
@@ -1,504 +0,0 @@
-- type: constructionGraph
-  id: GasBinary
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: pressurepump
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressurepumpAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressurepumpAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: volumepump
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: volumepumpAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: volumepumpAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: passivegate
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-<<<<<<< HEAD
-    - to: passivegateAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: passivegateAlt2
-=======
-    - to: pressureregulator
->>>>>>> f874459092 (Pressure Relief Valve (#36708))
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: valve
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: valveAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: valveAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: signalvalve
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: signalvalveAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: signalvalveAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressureregulator
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressureregulatorAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: pressureregulatorAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: port
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: dualportventpump
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: radiator
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: bendradiator
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-  - node: pressurepump
-    entity: GasPressurePump
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressurepumpAlt1
-    entity: GasPressurePumpAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-          prototype: SheetSteel1
-          amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressurepumpAlt2
-    entity: GasPressurePumpAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: volumepump
-    entity: GasVolumePump
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: volumepumpAlt1
-    entity: GasVolumePumpAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: volumepumpAlt2
-    entity: GasVolumePumpAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: passivegate
-    entity: GasPassiveGate
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-<<<<<<< HEAD
-  - node: passivegateAlt1
-    entity: GasPassiveGateAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: passivegateAlt2
-    entity: GasPassiveGateAlt2
-=======
-  - node: pressureregulator
-    entity: GasPressureRegulator
->>>>>>> f874459092 (Pressure Relief Valve (#36708))
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: valve
-    entity: GasValve
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: valveAlt1
-    entity: GasValveAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: valveAlt2
-    entity: GasValveAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: signalvalve
-    entity: SignalControlledValve
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: signalvalveAlt1
-    entity: SignalControlledValveAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: signalvalveAlt2
-    entity: SignalControlledValveAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressureregulator
-    entity: GasPressureRegulator
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressureregulatorAlt1
-    entity: GasPressureRegulatorAlt1
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: pressureregulatorAlt2
-    entity: GasPressureRegulatorAlt2
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: port
-    entity: GasPort
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Welding
-        doAfter: 1
-
-  - node: dualportventpump
-    entity: GasDualPortVentPump
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Screwing
-        doAfter: 1
-      - tool: Welding
-        doAfter: 1
-
-  - node: radiator
-    entity: HeatExchanger
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Screwing
-        doAfter: 1
-      - tool: Welding
-        doAfter: 1
-
-  - node: bendradiator
-    entity: HeatExchangerBend
-    edges:
-    - to: start
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetSteel1
-        amount: 2
-      - !type:DeleteEntity
-      steps:
-      - tool: Screwing
-        doAfter: 1
-      - tool: Welding
-        doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
index 95e1d3872e0..bda6d036e9b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
@@ -10,19 +10,7 @@
         amount: 2
         doAfter: 1
 
-    - to: sensorAlt1
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-    - to: sensorAlt2
-      steps:
-      - material: Steel
-        amount: 2
-        doAfter: 1
-
-  - node: sensor
+  - node: sensor   
     entity: GasPipeSensor
     actions:
     - !type:SetAnchor
@@ -38,40 +26,4 @@
         anchored: false
       steps:
       - tool: Welding
-        doAfter: 1
-
-  - node: sensorAlt1
-    entity: GasPipeSensorAlt1
-    actions:
-      - !type:SetAnchor
-    edges:
-      - to: start
-        completed:
-          - !type:SpawnPrototype
-            prototype: SheetSteel1
-            amount: 2
-          - !type:DeleteEntity
-        conditions:
-          - !type:EntityAnchored
-            anchored: false
-        steps:
-          - tool: Welding
-            doAfter: 1
-
-  - node: sensorAlt2
-    entity: GasPipeSensorAlt2
-    actions:
-      - !type:SetAnchor
-    edges:
-      - to: start
-        completed:
-          - !type:SpawnPrototype
-            prototype: SheetSteel1
-            amount: 2
-          - !type:DeleteEntity
-        conditions:
-          - !type:EntityAnchored
-            anchored: false
-        steps:
-          - tool: Welding
-            doAfter: 1
+        doAfter: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 98eb495d18a..85a0f5d3b1b 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -269,44 +269,10 @@
   graph: GasPipeSensor
   startNode: start
   targetNode: sensor
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  objectType: Structure
-  canRotate: true
-  alternativePrototypes:
-  - GasPipeSensor
-  - GasPipeSensorAlt1
-  - GasPipeSensorAlt2
-
-- type: construction
-  id: GasPipeSensorAlt1
-  hide: true
-  graph: GasPipeSensor
-  startNode: start
-  targetNode: sensorAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  objectType: Structure
-  canRotate: true
-  alternativePrototypes:
-  - GasPipeSensor
-  - GasPipeSensorAlt1
-  - GasPipeSensorAlt2
-
-- type: construction
-  id: GasPipeSensorAlt2
-  hide: true
-  graph: GasPipeSensor
-  startNode: start
-  targetNode: sensorAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
+  category: construction-category-structures
+  placementMode: SnapgridCenter
   objectType: Structure
   canRotate: true
-  alternativePrototypes:
-  - GasPipeSensor
-  - GasPipeSensorAlt1
-  - GasPipeSensorAlt2
 
 # ATMOS PIPES
 - type: construction
@@ -578,94 +544,22 @@
   graph: GasBinary
   startNode: start
   targetNode: pressurepump
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressurePump
-  - GasPressurePumpAlt1
-  - GasPressurePumpAlt2
-
-- type: construction
-  id: GasPressurePumpAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressurepumpAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressurePump
-  - GasPressurePumpAlt1
-  - GasPressurePumpAlt2
-
-- type: construction
-  id: GasPressurePumpAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressurepumpAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
+  category: construction-category-utilities
+  placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressurePump
-  - GasPressurePumpAlt1
-  - GasPressurePumpAlt2
+    - !type:NoUnstackableInTile
 
 - type: construction
   id: GasVolumePump
   graph: GasBinary
   startNode: start
   targetNode: volumepump
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasVolumePump
-  - GasVolumePumpAlt1
-  - GasVolumePumpAlt2
-
-- type: construction
-  id: GasVolumePumpAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: volumepumpAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasVolumePump
-  - GasVolumePumpAlt1
-  - GasVolumePumpAlt2
-
-- type: construction
-  id: GasVolumePumpAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: volumepumpAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
+  category: construction-category-utilities
+  placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasVolumePump
-  - GasVolumePumpAlt1
-  - GasVolumePumpAlt2
+    - !type:NoUnstackableInTile
 
 - type: construction
   id: GasPassiveGate
@@ -676,184 +570,29 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPassiveGate
-  - GasPassiveGateAlt1
-  - GasPassiveGateAlt2
-
-- type: construction
-  id: GasPassiveGateAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: passivegateAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPassiveGate
-  - GasPassiveGateAlt1
-  - GasPassiveGateAlt2
-
-- type: construction
-  id: GasPassiveGateAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: passivegateAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPassiveGate
-  - GasPassiveGateAlt1
-  - GasPassiveGateAlt2
-
-- type: construction
-  id: GasPressureRegulator
-  graph: GasBinary
-  startNode: start
-  targetNode: pressureregulator
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressureRegulator
-  - GasPressureRegulatorAlt1
-  - GasPressureRegulatorAlt2
-
-- type: construction
-  id: GasPressureRegulatorAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressureregulatorAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressureRegulator
-  - GasPressureRegulatorAlt1
-  - GasPressureRegulatorAlt2
-
-- type: construction
-  id: GasPressureRegulatorAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressureregulatorAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressureRegulator
-  - GasPressureRegulatorAlt1
-  - GasPressureRegulatorAlt2
+    - !type:NoUnstackableInTile
 
 - type: construction
   id: GasValve
   graph: GasBinary
   startNode: start
   targetNode: valve
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasValve
-  - GasValveAlt1
-  - GasValveAlt2
-
-- type: construction
-  id: GasValveAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: valveAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasValve
-  - GasValveAlt1
-  - GasValveAlt2
-
-- type: construction
-  id: GasValveAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: valveAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
+  category: construction-category-utilities
+  placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
     - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasValve
-  - GasValveAlt1
-  - GasValveAlt2
 
 - type: construction
   id: SignalControlledValve
   graph: GasBinary
   startNode: start
   targetNode: signalvalve
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
+  category: construction-category-utilities
+  placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
   - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - SignalControlledValve
-  - SignalControlledValveAlt1
-  - SignalControlledValveAlt2
-
-- type: construction
-  id: SignalControlledValveAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: signalvalveAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - SignalControlledValve
-  - SignalControlledValveAlt1
-  - SignalControlledValveAlt2
-
-- type: construction
-  id: SignalControlledValveAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: signalvalveAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - SignalControlledValve
-  - SignalControlledValveAlt1
-  - SignalControlledValveAlt2
 
 - type: construction
   id: GasPort
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml.orig b/Resources/Prototypes/Recipes/Construction/utilities.yml.orig
deleted file mode 100644
index 76851d350bf..00000000000
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml.orig
+++ /dev/null
@@ -1,1041 +0,0 @@
-# SURVEILLANCE
-- type: construction
-  id: camera
-  graph: SurveillanceCamera
-  startNode: start
-  targetNode: camera
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-
-- type: construction
-  id: WallmountTelescreen
-  graph: WallmountTelescreen
-  startNode: start
-  targetNode: Telescreen
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-
-- type: construction
-  id: StationMap
-  graph: StationMap
-  startNode: start
-  targetNode: station_map
-  category: construction-category-structures
-  placementMode: SnapgridCenter
-  objectType: Structure
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition {}
-
-# POWER
-- type: construction
-  id: APC
-  graph: APC
-  startNode: start
-  targetNode: apc
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-
-- type: construction
-  id: CableTerminal
-  graph: CableTerminal
-  startNode: start
-  targetNode: cable_terminal
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: WallmountSubstation
-  graph: WallmountSubstation
-  startNode: start
-  targetNode: substation
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-
-- type: construction
-  id: WallmountGenerator
-  graph: WallmountGenerator
-  startNode: start
-  targetNode: generator
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-
-- type: construction
-  id: WallmountGeneratorAPU
-  graph: WallmountGenerator
-  startNode: start
-  targetNode: APU
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-
-# DISPOSALS
-- type: construction
-  id: DisposalUnit
-  graph: DisposalMachine
-  startNode: start
-  targetNode: disposal_unit
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: MailingUnit
-  graph: DisposalMachine
-  startNode: start
-  targetNode: mailing_unit
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: DisposalPipe
-  graph: DisposalPipe
-  startNode: start
-  targetNode: pipe
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: DisposalTagger
-  graph: DisposalPipe
-  startNode: start
-  targetNode: tagger
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: DisposalSignaller
-  graph: DisposalPipe
-  startNode: start
-  targetNode: signaller
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: DisposalTrunk
-  graph: DisposalPipe
-  startNode: start
-  targetNode: trunk
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: DisposalRouter
-  graph: DisposalPipe
-  startNode: start
-  targetNode: router
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: DisposalRouterFlipped
-
-- type: construction
-  hide: true
-  id: DisposalRouterFlipped
-  graph: DisposalPipe
-  startNode: start
-  targetNode: routerflipped
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: DisposalRouter
-
-- type: construction
-  id: DisposalSignalRouter
-  graph: DisposalPipe
-  startNode: start
-  targetNode: signal_router
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: DisposalSignalRouterFlipped
-
-- type: construction
-  hide: true
-  id: DisposalSignalRouterFlipped
-  graph: DisposalPipe
-  startNode: start
-  targetNode: signal_router_flipped
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: DisposalSignalRouter
-
-- type: construction
-  id: DisposalJunction
-  graph: DisposalPipe
-  startNode: start
-  targetNode: junction
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: DisposalJunctionFlipped
-
-- type: construction
-  hide: true
-  id: DisposalJunctionFlipped
-  graph: DisposalPipe
-  startNode: start
-  targetNode: junctionflipped
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: DisposalJunction
-
-- type: construction
-  id: DisposalYJunction
-  graph: DisposalPipe
-  startNode: start
-  targetNode: yJunction
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: DisposalXJunction
-  graph: DisposalPipe
-  startNode: start
-  targetNode: xJunction
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: DisposalBend
-  graph: DisposalPipe
-  startNode: start
-  targetNode: bend
-  category: construction-category-utilities
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-# ATMOS
-- type: construction
-  id: AirAlarmFixture
-  graph: AirAlarm
-  startNode: start
-  targetNode: air_alarm
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  objectType: Structure
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition {}
-
-- type: construction
-  id: FireAlarm
-  graph: FireAlarm
-  startNode: start
-  targetNode: fire_alarm
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  objectType: Structure
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition {}
-
-- type: construction
-  id: AirSensor
-  graph: AirSensor
-  startNode: start
-  targetNode: sensor
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  objectType: Structure
-  canRotate: true
-
-- type: construction
-  id: GasPipeSensor
-  graph: GasPipeSensor
-  startNode: start
-  targetNode: sensor
-<<<<<<< HEAD
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-=======
-  category: construction-category-structures
-  placementMode: AlignAtmosPipeLayers
->>>>>>> fb69a0ae2c (More atmos devices can be placed on layers easier. (#38672))
-  objectType: Structure
-  canRotate: true
-  alternativePrototypes:
-  - GasPipeSensor
-  - GasPipeSensorAlt1
-  - GasPipeSensorAlt2
-
-- type: construction
-  id: GasPipeSensorAlt1
-  hide: true
-  graph: GasPipeSensor
-  startNode: start
-  targetNode: sensorAlt1
-  category: construction-category-structures
-  placementMode: AlignAtmosPipeLayers
-  objectType: Structure
-  canRotate: true
-  alternativePrototypes:
-  - GasPipeSensor
-  - GasPipeSensorAlt1
-  - GasPipeSensorAlt2
-
-- type: construction
-  id: GasPipeSensorAlt2
-  hide: true
-  graph: GasPipeSensor
-  startNode: start
-  targetNode: sensorAlt2
-  category: construction-category-structures
-  placementMode: AlignAtmosPipeLayers
-  objectType: Structure
-  canRotate: true
-  alternativePrototypes:
-  - GasPipeSensor
-  - GasPipeSensorAlt1
-  - GasPipeSensorAlt2
-
-# ATMOS PIPES
-- type: construction
-  id: GasPipeHalf
-  name: construction-recipe-gas-pipe-half
-  graph: GasPipe
-  startNode: start
-  targetNode: half
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeHalf
-  - GasPipeHalfAlt1
-  - GasPipeHalfAlt2
-
-- type: construction
-  id: GasPipeHalfAlt1
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: halfAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeHalf
-  - GasPipeHalfAlt1
-  - GasPipeHalfAlt2
-
-- type: construction
-  id: GasPipeHalfAlt2
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: halfAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeHalf
-  - GasPipeHalfAlt1
-  - GasPipeHalfAlt2
-
-- type: construction
-  id: GasPipeStraight
-  graph: GasPipe
-  startNode: start
-  targetNode: straight
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeStraight
-  - GasPipeStraightAlt1
-  - GasPipeStraightAlt2
-
-- type: construction
-  id: GasPipeStraightAlt1
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: straightAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeStraight
-  - GasPipeStraightAlt1
-  - GasPipeStraightAlt2
-
-- type: construction
-  id: GasPipeStraightAlt2
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: straightAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeStraight
-  - GasPipeStraightAlt1
-  - GasPipeStraightAlt2
-
-- type: construction
-  id: GasPipeBend
-  name: construction-recipe-gas-pipe-bend
-  graph: GasPipe
-  startNode: start
-  targetNode: bend
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeBend
-  - GasPipeBendAlt1
-  - GasPipeBendAlt2
-
-- type: construction
-  id: GasPipeBendAlt1
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: bendAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeBend
-  - GasPipeBendAlt1
-  - GasPipeBendAlt2
-
-- type: construction
-  id: GasPipeBendAlt2
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: bendAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeBend
-  - GasPipeBendAlt1
-  - GasPipeBendAlt2
-
-- type: construction
-  id: GasPipeTJunction
-  name: construction-recipe-gas-pipe-t-junction
-  graph: GasPipe
-  startNode: start
-  targetNode: tjunction
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeTJunction
-  - GasPipeTJunctionAlt1
-  - GasPipeTJunctionAlt2
-
-- type: construction
-  id: GasPipeTJunctionAlt1
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: tjunctionAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeTJunction
-  - GasPipeTJunctionAlt1
-  - GasPipeTJunctionAlt2
-
-- type: construction
-  id: GasPipeTJunctionAlt2
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: tjunctionAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeTJunction
-  - GasPipeTJunctionAlt1
-  - GasPipeTJunctionAlt2
-
-- type: construction
-  id: GasPipeFourway
-  name: construction-recipe-gas-pipe-fourway
-  graph: GasPipe
-  startNode: start
-  targetNode: fourway
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeFourway
-  - GasPipeFourwayAlt1
-  - GasPipeFourwayAlt2
-
-- type: construction
-  id: GasPipeFourwayAlt1
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: fourwayAlt1
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeFourway
-  - GasPipeFourwayAlt1
-  - GasPipeFourwayAlt2
-
-- type: construction
-  id: GasPipeFourwayAlt2
-  hide: true
-  graph: GasPipe
-  startNode: start
-  targetNode: fourwayAlt2
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: true
-  alternativePrototypes:
-  - GasPipeFourway
-  - GasPipeFourwayAlt1
-  - GasPipeFourwayAlt2
-
-- type: construction
-  id: GasPipeManifold
-  graph: GasPipe
-  startNode: start
-  targetNode: manifold
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-
-# ATMOS UNARY
-- type: construction
-  id: GasVentPump
-  graph: GasUnary
-  startNode: start
-  targetNode: ventpump
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-
-- type: construction
-  id: GasPassiveVent
-  graph: GasUnary
-  startNode: start
-  targetNode: passivevent
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-
-- type: construction
-  id: GasVentScrubber
-  graph: GasUnary
-  startNode: start
-  targetNode: ventscrubber
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-
-- type: construction
-  id: GasOutletInjector
-  graph: GasUnary
-  startNode: start
-  targetNode: outletinjector
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-
-# ATMOS BINARY
-- type: construction
-  id: GasPressurePump
-  graph: GasBinary
-  startNode: start
-  targetNode: pressurepump
-<<<<<<< HEAD
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-=======
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
->>>>>>> fb69a0ae2c (More atmos devices can be placed on layers easier. (#38672))
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressurePump
-  - GasPressurePumpAlt1
-  - GasPressurePumpAlt2
-
-- type: construction
-  id: GasPressurePumpAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressurepumpAlt1
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressurePump
-  - GasPressurePumpAlt1
-  - GasPressurePumpAlt2
-
-- type: construction
-  id: GasPressurePumpAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressurepumpAlt2
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressurePump
-  - GasPressurePumpAlt1
-  - GasPressurePumpAlt2
-
-- type: construction
-  id: GasVolumePump
-  graph: GasBinary
-  startNode: start
-  targetNode: volumepump
-<<<<<<< HEAD
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-=======
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
->>>>>>> fb69a0ae2c (More atmos devices can be placed on layers easier. (#38672))
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasVolumePump
-  - GasVolumePumpAlt1
-  - GasVolumePumpAlt2
-
-- type: construction
-  id: GasVolumePumpAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: volumepumpAlt1
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasVolumePump
-  - GasVolumePumpAlt1
-  - GasVolumePumpAlt2
-
-- type: construction
-  id: GasVolumePumpAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: volumepumpAlt2
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasVolumePump
-  - GasVolumePumpAlt1
-  - GasVolumePumpAlt2
-
-- type: construction
-  id: GasPassiveGate
-  graph: GasBinary
-  startNode: start
-  targetNode: passivegate
-<<<<<<< HEAD
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-=======
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
->>>>>>> fb69a0ae2c (More atmos devices can be placed on layers easier. (#38672))
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPassiveGate
-  - GasPassiveGateAlt1
-  - GasPassiveGateAlt2
-
-- type: construction
-  id: GasPassiveGateAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: passivegateAlt1
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPassiveGate
-  - GasPassiveGateAlt1
-  - GasPassiveGateAlt2
-
-- type: construction
-  id: GasPassiveGateAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: passivegateAlt2
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPassiveGate
-  - GasPassiveGateAlt1
-  - GasPassiveGateAlt2
-
-- type: construction
-<<<<<<< HEAD
-=======
-  id: GasPressureRegulator
-  graph: GasBinary
-  startNode: start
-  targetNode: pressureregulator
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressureRegulator
-  - GasPressureRegulatorAlt1
-  - GasPressureRegulatorAlt2
-
-- type: construction
-  id: GasPressureRegulatorAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressureregulatorAlt1
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressureRegulator
-  - GasPressureRegulatorAlt1
-  - GasPressureRegulatorAlt2
-
-- type: construction
-  id: GasPressureRegulatorAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: pressureregulatorAlt2
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasPressureRegulator
-  - GasPressureRegulatorAlt1
-  - GasPressureRegulatorAlt2
-
-- type: construction
->>>>>>> fb69a0ae2c (More atmos devices can be placed on layers easier. (#38672))
-  id: GasValve
-  graph: GasBinary
-  startNode: start
-  targetNode: valve
-<<<<<<< HEAD
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-=======
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
->>>>>>> fb69a0ae2c (More atmos devices can be placed on layers easier. (#38672))
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasValve
-  - GasValveAlt1
-  - GasValveAlt2
-
-- type: construction
-  id: GasValveAlt1
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: valveAlt1
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasValve
-  - GasValveAlt1
-  - GasValveAlt2
-
-- type: construction
-  id: GasValveAlt2
-  hide: true
-  graph: GasBinary
-  startNode: start
-  targetNode: valveAlt2
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - GasValve
-  - GasValveAlt1
-  - GasValveAlt2
-
-- type: construction
-  id: SignalControlledValve
-  graph: GasBinary
-  startNode: start
-  targetNode: signalvalve
-<<<<<<< HEAD
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-=======
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
->>>>>>> fb69a0ae2c (More atmos devices can be placed on layers easier. (#38672))
-  canBuildInImpassable: false
-  conditions:
-  - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - SignalControlledValve
-  - SignalControlledValveAlt1
-  - SignalControlledValveAlt2
-
-- type: construction
-  id: SignalControlledValveAlt1
-  graph: GasBinary
-  startNode: start
-  targetNode: signalvalveAlt1
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - SignalControlledValve
-  - SignalControlledValveAlt1
-  - SignalControlledValveAlt2
-
-- type: construction
-  id: SignalControlledValveAlt2
-  graph: GasBinary
-  startNode: start
-  targetNode: signalvalveAlt2
-  category: construction-category-utilities
-  placementMode: AlignAtmosPipeLayers
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-  alternativePrototypes:
-  - SignalControlledValve
-  - SignalControlledValveAlt1
-  - SignalControlledValveAlt2
-
-- type: construction
-  id: GasPort
-  graph: GasBinary
-  startNode: start
-  targetNode: port
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-
-- type: construction
-  id: GasDualPortVentPump
-  graph: GasBinary
-  startNode: start
-  targetNode: dualportventpump
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: HeatExchanger
-  graph: GasBinary
-  startNode: start
-  targetNode: radiator
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-- type: construction
-  id: HeatExchangerBend
-  name: construction-recipe-heat-exchanger-bend
-  graph: GasBinary
-  startNode: start
-  targetNode: bendradiator
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-
-# ATMOS TRINARY
-- type: construction
-  id: GasFilter
-  graph: GasTrinary
-  startNode: start
-  targetNode: filter
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: GasFilterFlipped
-  conditions:
-    - !type:NoUnstackableInTile
-
-- type: construction
-  id: GasFilterFlipped
-  hide: true
-  graph: GasTrinary
-  startNode: start
-  targetNode: filterflipped
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: GasFilter
-  conditions:
-    - !type:NoUnstackableInTile
-
-- type: construction
-  id: GasMixer
-  graph: GasTrinary
-  startNode: start
-  targetNode: mixer
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: GasMixerFlipped
-  conditions:
-    - !type:NoUnstackableInTile
-
-- type: construction
-  id: GasMixerFlipped
-  hide: true
-  graph: GasTrinary
-  startNode: start
-  targetNode: mixerflipped
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  mirror: GasMixer
-  conditions:
-    - !type:NoUnstackableInTile
-
-- type: construction
-  id: PressureControlledValve
-  graph: GasTrinary
-  startNode: start
-  targetNode: pneumaticvalve
-  category: construction-category-atmospherics # DeltaV - Moving Atmos Recipes to Atmospherics Category
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:NoUnstackableInTile
-
-# INTERCOM
-- type: construction
-  id: IntercomAssembly
-  graph: Intercom
-  startNode: start
-  targetNode: intercom
-  category: construction-category-structures
-  placementMode: SnapgridCenter
-  objectType: Structure
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition {}
-
-# TIMERS
-- type: construction
-  id: SignalTimer
-  graph: Timer
-  startNode: start
-  targetNode: signal
-  category: construction-category-utilities
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition
-
-- type: construction
-  id: ScreenTimer
-  graph: Timer
-  startNode: start
-  targetNode: screen
-  category: construction-category-utilities
-  objectType: Structure
-  canRotate: false
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition
-
-- type: construction
-  id: BrigTimer
-  graph: Timer
-  startNode: start
-  targetNode: brig
-  category: construction-category-utilities
-  objectType: Structure
-  canRotate: false
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index 572153caac4..5efc4b9abac 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -7,6 +7,7 @@
   startingGear: ChaplainGear
   icon: "JobIconChaplain"
   supervisors: job-supervisors-rd # DeltaV - Change supervisor to mystagogue
+  canBeAntag: false # DeltaV - Can't be antag in case of Cultist antag presence. Remove this flag when antagselection is granularized.
   access:
   - Chapel
   - Research # DeltaV - Move Chaplain into Epistemics
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
index 9d232cbe242..9c648c002a7 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -10,20 +10,18 @@
   - Service
   - Maintenance
   - Library # DeltaV - Add Library access
-  - Research # DeltaV - Works with epistemics department
 
 - type: startingGear
   id: LibrarianGear
   equipment:
     shoes: ClothingShoesBootsLaceup
     id: LibrarianPDA
-    ears: ClothingHeadsetLibrarian
+    ears: ClothingHeadsetService
     pocket1: d20Dice
     pocket2: HandLabeler # for making named bestsellers
   storage:
     back:
     - BookRandom
-    - BookRestorationKit # DeltaV - new tool important for their job
 
 - type: chameleonOutfit
   id: LibrarianChameleonOutfit
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 8ef2c90d2c9..f1659e4a015 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -459,12 +459,6 @@
       path: /Audio/Items/bikehorn.ogg
     Ping:
       path: /Audio/Effects/Cargo/ping.ogg
-    Boop: # DeltaV (EE)
-      path: /Audio/_EE/Voice/IPC/beep_500.ogg      
-    Whirr: # DeltaV (EE)
-      collection: IPCWhirrs
-      params:
-        variation: 0
 
 - type: emoteSounds
   id: UnisexSiliconSyndicate
@@ -487,12 +481,6 @@
       path: /Audio/Items/bikehorn.ogg
     Ping:
       path: /Audio/Effects/Cargo/ping.ogg
-    Boop: # DeltaV (EE)
-      path: /Audio/_EE/Voice/IPC/beep_500.ogg      
-    Whirr: # DeltaV (EE)
-      collection: IPCWhirrs
-      params:
-        variation: 0
 
 - type: emoteSounds
   id: UnisexSiliconXenoborg
@@ -513,12 +501,6 @@
       collection: XenoborgBikeHorn
     Ping:
       collection: XenoborgPing
-    Boop: # DeltaV (EE)
-      path: /Audio/_EE/Voice/IPC/beep_500.ogg      
-    Whirr: # DeltaV (EE)
-      collection: IPCWhirrs
-      params:
-        variation: 0
 
 # body emotes
 - type: emoteSounds
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index e7867bd6f15..5910a277354 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -65,7 +65,7 @@
     components:
     - Vocal
     tags:
-    - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it
+    - SiliconEmotes
   chatMessages: ["chat-emote-msg-honk"]
   chatTriggers:
     - honk
@@ -341,7 +341,7 @@
     components:
     - Vocal
     tags:
-    - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it
+    - SiliconEmotes
   chatMessages: ["chat-emote-msg-buzz"]
   chatTriggers:
     - buzzing
@@ -394,7 +394,7 @@
     components:
     - Vocal
     tags:
-    - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it
+    - SiliconEmotes
   chatMessages: ["chat-emote-msg-beep"]
   chatTriggers:
     - beep
@@ -412,7 +412,7 @@
     components:
     - Vocal
     tags:
-    - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it
+    - SiliconEmotes
   chatMessages: ["chat-emote-msg-chime"]
   chatTriggers:
     - chime
@@ -430,7 +430,7 @@
     components:
     - Vocal
     tags:
-    - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it
+    - SiliconEmotes
   chatMessages: ["chat-emote-msg-buzzestwo"]
   chatTriggers:
     - buzztwice
@@ -454,7 +454,7 @@
     components:
     - Vocal
     tags:
-    - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it
+    - SiliconEmotes
   chatMessages: ["chat-emote-msg-ping"]
   chatTriggers:
     - ping
diff --git a/Resources/Prototypes/_DV/Access/epistemics.yml b/Resources/Prototypes/_DV/Access/epistemics.yml
index bb116374f39..ed62a9b3d78 100644
--- a/Resources/Prototypes/_DV/Access/epistemics.yml
+++ b/Resources/Prototypes/_DV/Access/epistemics.yml
@@ -12,4 +12,3 @@
   - Robotics
   - Mantis
   - Chapel
-  - Library # DeltaV - Add Library access
diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml
deleted file mode 100644
index 37b567cb807..00000000000
--- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: DisplayCase
-  icon:
-    sprite: _DV/Structures/Storage/display_cases.rsi
-    state: display_case_icon
-  product: DisplayCase
-  cost: 500
-  category: Science
-  group: market
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_DV/Catalog/Fills/Backpacks/duffelbag.yml
deleted file mode 100644
index 221560192a9..00000000000
--- a/Resources/Prototypes/_DV/Catalog/Fills/Backpacks/duffelbag.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateFilledHarbingerBundle
-  name: harbinger bundle
-  description: A bundle containing an Accursed Scythe and a set of Harbinger's armor.
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHatHarbingerHelmet
-      - id: ClothingUniformHarbingerTunic
-      - id: ClothingOuterCoatHarbingerCoat
-      - id: AccursedScythe
diff --git a/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml b/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml
index c5df6285963..e8542487635 100644
--- a/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml
+++ b/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml
@@ -42,36 +42,3 @@
     Telecrystal: 10
   categories:
   - UplinkWeaponry
-
-- type: listing
-  id: UplinkDesword
-  name: uplink-desword-name
-  description: uplink-desword-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword_double.rsi, state: icon }
-  discountCategory: veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 6
-  productEntity: EnergySwordDouble
-  cost:
-    Telecrystal: 9
-  categories:
-  - UplinkWeaponry
-
-- type: listing
-  id: UplinkHarbinger
-  name: uplink-harbinger-name
-  description: uplink-harbinger-desc
-  icon: { sprite: /Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi, state: icon }
-  discountCategory: veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 10
-  productEntity: ClothingBackpackDuffelSyndicateFilledHarbingerBundle
-  cost:
-    Telecrystal: 12
-  categories:
-  - UplinkJob
-  conditions:
-  - !type:BuyerJobCondition
-    whitelist:
-    - Chaplain
-    - Botanist
diff --git a/Resources/Prototypes/_DV/CosmicCult/Clothing/cosmiccult_armor.yml b/Resources/Prototypes/_DV/CosmicCult/Clothing/cosmiccult_armor.yml
index 61daaca8e34..7c67da6be7e 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Clothing/cosmiccult_armor.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Clothing/cosmiccult_armor.yml
@@ -84,6 +84,8 @@
   - type: BatterySelfRecharger
     autoRecharge: true
     autoRechargeRate: 5
+  - type: TypingIndicatorClothing
+    proto: CosmicTyping
 
 # COSMIC CULT HARDSUIT HELMET
 - type: entity
@@ -109,11 +111,3 @@
         Slash: 0.90
         Piercing: 0.90
         Heat: 0.90
-  - type: EyeProtection
-  - type: TypingIndicatorClothing
-    proto: CosmicTyping
-  - type: SpeechOverride
-    overrideIDs:
-      Male: CosmicEmotesMale
-      Female: CosmicEmotesFemale
-      Unsexed: CosmicEmotesMale # Humans use male soudns for unsexed so here we are.
diff --git a/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml b/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml
index b93dde2423d..a2ad1b7b623 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml
@@ -160,10 +160,6 @@
       reverseWhenFinished: true
   - type: ContentEye
     maxZoom: 1.2, 1.2
-  - type: Eye
-    visMask:
-      - Normal
-      - CosmicCultMonument
   - type: StatusEffects
     allowed:
     - Stutter
diff --git a/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml b/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml
index 4ad11404bf2..6e1ebcd7689 100644
--- a/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml
@@ -91,9 +91,7 @@
   - type: MeleeWeapon
     resistanceBypass: true
     angle: 0
-    wideAnimationRotation: 225
     animation: WeaponArcCosmic
-    wideAnimation: WeaponArcThrust
     attackRate: 0.62
     damage:
       types:
diff --git a/Resources/Prototypes/_DV/CosmicCult/events.yml b/Resources/Prototypes/_DV/CosmicCult/events.yml
index 1219c61b6f6..eebf5f0a6e3 100644
--- a/Resources/Prototypes/_DV/CosmicCult/events.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/events.yml
@@ -29,7 +29,7 @@
       briefing:
         text: ghost-role-colossus-briefing
         color: CadetBlue
-        sound: /Audio/_DV/CosmicCult/antag_cosmic_AI_briefing.ogg
+        sound: /Audio/_DV/CosmicCult/antag_cosmic_briefing.ogg
       components:
       - type: CosmicColossus
         timed: true
diff --git a/Resources/Prototypes/_DV/CosmicCult/glyphs.yml b/Resources/Prototypes/_DV/CosmicCult/glyphs.yml
index b032ac71d14..416d65e977e 100644
--- a/Resources/Prototypes/_DV/CosmicCult/glyphs.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/glyphs.yml
@@ -19,25 +19,15 @@
         - SlipLayer
   - type: Physics
   - type: Clickable
+  - type: CosmicGlyph
   - type: CosmicCultExamine
     othersText: cosmic-examine-text-glyphs
   - type: Sprite
-    sprite: _DV/CosmicCult/Objects/glyph_truth.rsi
+    sprite: _DV/CosmicCult/Objects/glyphs_floor.rsi
     layers:
-      - state: spawning
-        map: ["base"]
+      - state: aid
     drawdepth: Puddles
-  - type: GenericVisualizer
-    visuals:
-      enum.GlyphVisuals.Status:
-        base:
-          Spawning: {state: spawning}
-          Despawning: {state: despawning}
-          Ready: {state: ready}
-          Active: {state: active}
-          Cooldown: {state: cooldown}
   - type: Appearance
-  - type: InteractionOutline
 
 - type: entity
   parent: CosmicGlyphBase
@@ -45,10 +35,10 @@
   name: Glyph of Truth
   components:
   - type: Sprite
-    sprite: _DV/CosmicCult/Objects/glyph_truth.rsi
+    sprite: _DV/CosmicCult/Objects/glyphs_floor.rsi
     layers:
-      - state: spawning
-        map: ["base"]
+      - state: truth
+    drawdepth: Puddles
   - type: CosmicGlyphConversion
     negateProtection: true
   - type: CosmicGlyph
@@ -65,10 +55,10 @@
   name: Glyph of Knowledge
   components:
   - type: Sprite
-    sprite: _DV/CosmicCult/Objects/glyph_knowledge.rsi
+    sprite: _DV/CosmicCult/Objects/glyphs_floor.rsi
     layers:
-      - state: spawning
-        map: ["base"]
+    - state: knowledge
+    drawdepth: Puddles
   - type: CosmicGlyphConversion
   - type: CosmicGlyph
     requiredCultists: 2
@@ -84,10 +74,10 @@
   name: Glyph of Cessation
   components:
   - type: Sprite
-    sprite: _DV/CosmicCult/Objects/glyph_cessation.rsi
     layers:
-      - state: spawning
-        map: ["base"]
+    - sprite: _DV/CosmicCult/Objects/glyphs_floor.rsi
+      state: cessation
+    drawdepth: Puddles
   - type: CosmicGlyphTransmute
   - type: CosmicGlyph
     requiredCultists: 1
@@ -103,10 +93,10 @@
   name: Glyph of Blades
   components:
   - type: Sprite
-    sprite: _DV/CosmicCult/Objects/glyph_blades.rsi
+    sprite: _DV/CosmicCult/Objects/glyphs_floor.rsi
     layers:
-      - state: spawning
-        map: ["base"]
+    - state: blades
+    drawdepth: Puddles
   - type: CosmicGlyphTransmute
   - type: CosmicGlyph
     requiredCultists: 2
@@ -122,10 +112,10 @@
   name: Glyph of Warding
   components:
   - type: Sprite
-    sprite: _DV/CosmicCult/Objects/glyph_warding.rsi
+    sprite: _DV/CosmicCult/Objects/glyphs_floor.rsi
     layers:
-      - state: spawning
-        map: ["base"]
+    - state: warding
+    drawdepth: Puddles
   - type: CosmicGlyphTransmute
   - type: CosmicGlyph
     requiredCultists: 2
@@ -141,10 +131,10 @@
   name: Glyph of Projection
   components:
   - type: Sprite
-    sprite: _DV/CosmicCult/Objects/glyph_projection.rsi
+    sprite: _DV/CosmicCult/Objects/glyphs_floor.rsi
     layers:
-      - state: spawning
-        map: ["base"]
+    - state: projection
+    drawdepth: Puddles
   - type: CosmicGlyphAstralProjection
   - type: CosmicGlyph
     requiredCultists: 1
diff --git a/Resources/Prototypes/_DV/CosmicCult/speech_emote_sounds.yml b/Resources/Prototypes/_DV/CosmicCult/speech_emote_sounds.yml
deleted file mode 100644
index 9493e1f5949..00000000000
--- a/Resources/Prototypes/_DV/CosmicCult/speech_emote_sounds.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-- type: emoteSounds
-  id: CosmicEmotesMale
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      path: /Audio/_DV/CosmicCult/Emotes/cosmic_scream.ogg
-    Laugh:
-      path: /Audio/_DV/CosmicCult/Emotes/cosmic_laugh.ogg
-    Crying:
-      path: /Audio/_DV/CosmicCult/Emotes/cosmic_crying.ogg # The urge to use minecraft ghast sounds
-    Cough:
-      collection: MaleCoughs
-    Yawn:
-      collection: MaleYawn
-    Sigh:
-      collection: MaleSigh
-    Whistle:
-      collection: TrenchWhistle # Kinda creepy, I think it fits well
-    Snore:
-      collection: Snores
-    Weh:
-      collection: Weh
-    Hew:
-      collection: Hew
-    Honk:
-      collection: BikeHorn
-
-- type: emoteSounds
-  id: CosmicEmotesFemale
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      path: /Audio/_DV/CosmicCult/Emotes/cosmic_scream.ogg
-    Laugh:
-      path: /Audio/_DV/CosmicCult/Emotes/cosmic_laugh.ogg
-    Crying:
-      path: /Audio/_DV/CosmicCult/Emotes/cosmic_crying.ogg
-    Cough:
-      collection: FemaleCoughs
-    Yawn:
-      collection: FemaleYawn
-    Sigh:
-      collection: FemaleSigh
-    Whistle:
-      collection: TrenchWhistle
-    Snore:
-      collection: Snores
-    Weh:
-      collection: Weh
-    Hew:
-      collection: Hew
-    Honk:
-      collection: BikeHorn
diff --git a/Resources/Prototypes/_DV/Damage/modifier_sets.yml b/Resources/Prototypes/_DV/Damage/modifier_sets.yml
index 95d6e1b3113..396a45bfc71 100644
--- a/Resources/Prototypes/_DV/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_DV/Damage/modifier_sets.yml
@@ -66,79 +66,3 @@
     Slash: 1.2
     Radiation: 1.5
     Holy: 0.5
-    Shadow: 0.5
-
-- type: damageModifierSet
-  id: Avali
-  coefficients:
-    Blunt: 1.3
-    Piercing: 1.1
-    Slash: 1.1
-
-# Represents which damage types should be modified
-# in relation to how they cause bleed rate.
-- type: damageModifierSet
-  id: BloodlossIPC
-  coefficients:
-    Blunt: 0.00 # no evil doublestack damage
-    Slash: 0.25
-    Piercing: 0.2
-    Shock: 0.0
-    Heat: -0.5 # heat damage cauterizes wounds, but will still hurt obviously.
-    Cold: 0.0
-    Poison: 0.0
-    Radiation: 0.0
-    Asphyxiation: 0.0
-    Bloodloss: 0.0
-    Cellular: 0.0
-    Caustic: 0.0
-    Ion: 0.0
-
-- type: damageModifierSet
-  id: Felinid
-  coefficients:
-    Blunt: 1.15
-    Slash: 1.15
-    Piercing: 1.15
-
-- type: damageModifierSet
-  id: Oni
-  coefficients:
-    Blunt: 0.85
-    Slash: 0.85
-    Piercing: 0.85
-
-- type: damageModifierSet
-  id: CancerMouse
-  coefficients:
-    Radiation: -0.25
-
-- type: damageModifierSet
-  id: CorporealSpirit
-  coefficients:
-    Cold: 0.0
-    Shock: 0.5
-    Blunt: 0.5
-    Slash: 0.5
-    Piercing: 0.5
-    Heat: 1.5
-    Holy: 3.0
-
-- type: damageModifierSet
-  id: ShockAbsorber
-  coefficients:
-    Blunt: 0.7
-    Slash: 0.5
-    Piercing: 0.7
-    Shock: 0
-  flatReductions:
-    Blunt: 5
-    Heat: 5
-
-- type: damageModifierSet
-  id: Spirit
-  coefficients:
-    Cold: 0.0
-    Shock: 0.2
-    Heat: 3.0
-    Holy: 5.0
diff --git a/Resources/Prototypes/_DV/Damage/types.yml b/Resources/Prototypes/_DV/Damage/types.yml
deleted file mode 100644
index bb4467cb56d..00000000000
--- a/Resources/Prototypes/_DV/Damage/types.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: damageType
-  id: Ion
-  name: damage-type-ion
-  armorCoefficientPrice: 1
-  armorFlatPrice: 1
-
-- type: damageType
-  id: Shadow
-  name: damage-type-shadow
-  armorCoefficientPrice: 1
-  armorFlatPrice: 1
diff --git a/Resources/Prototypes/_DV/DeviceLinking/sink_ports.yml b/Resources/Prototypes/_DV/DeviceLinking/sink_ports.yml
deleted file mode 100644
index 4e9f03740e8..00000000000
--- a/Resources/Prototypes/_DV/DeviceLinking/sink_ports.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: sinkPort
-  id: PowerToggle
-  name: signal-port-name-power-toggle
-  description: signal-port-description-power-toggle
-
-- type: sinkPort
-  id: Pause
-  name: tape-recorder-menu-stopped-button
-  description: signal-port-description-pause
-
-- type: sinkPort
-  id: Record
-  name: tape-recorder-menu-recording-button
-  description: signal-port-description-record
-
-- type: sinkPort
-  id: Playback
-  name: tape-recorder-menu-playing-button
-  description: signal-port-description-playback
-
-- type: sinkPort
-  id: Rewind
-  name: tape-recorder-menu-rewinding-button
-  description: signal-port-description-rewind
diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_DV/Entities/Clothing/Head/hoods.yml
index 285d07f1761..5e992d97c62 100644
--- a/Resources/Prototypes/_DV/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/_DV/Entities/Clothing/Head/hoods.yml
@@ -9,29 +9,3 @@
     sprite: _DV/Clothing/Head/Hoods/interdynechemhood.rsi
   - type: Clothing
     sprite: _DV/Clothing/Head/Hoods/interdynechemhood.rsi
-
-- type: entity
-  parent: ClothingHeadHelmetArmoredBase
-  id: ClothingHeadHatHarbingerHelmet
-  name: harbinger helmet
-  description: an old-fashioned helm under a leather hood to strike terror into your forces.
-  components:
-  - type: Sprite
-    sprite: _DV/Clothing/Head/Hoods/harbingerhood.rsi
-  - type: Clothing
-    sprite: _DV/Clothing/Head/Hoods/harbingerhood.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
-        Holy: 0.9
-        Shadow: 0.9
-  - type: Tag
-    tags:
-    - WhitelistChameleon
-  - type: HideLayerClothing
-    slots:
-    - Hair
diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml
index cc2209821b6..19bd97f100e 100644
--- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml
@@ -158,27 +158,3 @@
   - type: TemperatureProtection
     coolingCoefficient: 0.1
     heatingCoefficient: 1.1
-
-- type: entity
-  parent: ClothingOuterStorageBase
-  id: ClothingOuterCoatHarbingerCoat
-  name: harbinger's leather coat
-  description: A loose-fitting leather coat worn by those who take up the title of harbinger.
-  components:
-  - type: Sprite
-    sprite: _DV/Clothing/OuterClothing/Coats/harbingercoat.rsi
-  - type: Clothing
-    sprite: _DV/Clothing/OuterClothing/Coats/harbingercoat.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.75
-        Heat: 0.75
-        Holy: 0.60
-        Shadow: 0.60
-  - type: AllowSuitStorage
-  - type: TemperatureProtection
-    coolingCoefficient: 0.1
-    heatingCoefficient: 1.1
diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml
index c8f09f8faf7..fc7528e1a79 100644
--- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -23,8 +23,6 @@
         Radiation: 0.75
         Caustic: 0.75
         Heat: 0.75
-        Holy: 0.85
-        Shadow: 0.85
   - type: StaminaResistance
     damageCoefficient: 0.3 # It's a hardsuit, duh
   - type: ClothingSpeedModifier
@@ -77,8 +75,6 @@
         Radiation: 0.80
         Caustic: 0.80
         Heat: 0.80
-        Holy: 0.85
-        Shadow: 0.85
   - type: ClothingSpeedModifier
     walkModifier: 0.85
     sprintModifier: 0.85
@@ -123,8 +119,6 @@
         Radiation: 0.70
         Caustic: 0.70
         Heat: 0.40
-        Holy: 0.80
-        Shadow: 0.80
   - type: StaminaResistance
     damageCoefficient: 0.2
   - type: ClothingSpeedModifier
@@ -171,8 +165,6 @@
         Radiation: 0.75
         Caustic: 0.75
         Heat: 0.75
-        Holy: 0.75
-        Shadow: 0.75
   - type: StaminaResistance
     damageCoefficient: 0.2
   - type: ClothingSpeedModifier
@@ -223,8 +215,6 @@
         Radiation: 0.0
         Caustic: 0.4
         Heat: 0.70
-        Holy: 0.60
-        Shadow: 0.60
   - type: StaminaResistance
     damageCoefficient: 0.3
   - type: ClothingSpeedModifier
@@ -335,8 +325,6 @@
         Heat: 0.6
         Radiation: 0
         Caustic: 0.35
-        Holy: 0.50
-        Shadow: 0.50
   - type: StaminaResistance
     damageCoefficient: 0.2
   - type: ClothingSpeedModifier
diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml
index ec82bcb2f42..d6abbd40c2d 100644
--- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -532,14 +532,3 @@
     sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
   - type: Clothing
     sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformHarbingerTunic
-  name: harbinger tunic
-  description: Something easy to move in. Good for hunting.
-  components:
-  - type: Sprite
-    sprite: _DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi
-  - type: Clothing
-    sprite: _DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/rodentia.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/rodentia.yml
index 9e0cab2b513..fbbc3307f78 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/rodentia.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/rodentia.yml
@@ -270,7 +270,7 @@
   id: RodentiaCheeksWhiskers
   markingCategory: Head # for no-cost markings
   bodyPart: HeadTop # for layering
-  speciesRestriction: [Rodentia]
+  speciesRestriction: [Rodentia, IPC]
   sprites:
     - sprite: _DV/Mobs/Customization/Rodentia/cheek_markings.rsi
       state: whiskers
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/vulpkanin.yml
index 0a2afa69883..c5ffdaa4a78 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/vulpkanin.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/vulpkanin.yml
@@ -517,7 +517,7 @@
   id: VulpBellyCrest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Vulpkanin]
+  speciesRestriction: [Vulpkanin, IPC]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: belly_crest
@@ -526,7 +526,7 @@
   id: VulpBellyFull
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Vulpkanin]
+  speciesRestriction: [Vulpkanin, IPC]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: belly_full
@@ -535,7 +535,7 @@
   id: VulpBellyFox
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Vulpkanin]
+  speciesRestriction: [Vulpkanin, IPC]
   sprites:
     - sprite: _DV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: belly_fox
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/displaycase.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/displaycase.yml
deleted file mode 100644
index 78aa5d13d4f..00000000000
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/displaycase.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: entity
-  parent: BaseMachineCircuitboard
-  id: ArtifactDisplayCaseMachineCircuitBoard
-  name: artifact display case machine board
-  components:
-  - type: Sprite
-    state: science
-  - type: MachineBoard
-    prototype: DisplayCaseArtifact
-    stackRequirements:
-      Manipulator: 2
-      Glass: 5
-      Steel: 5
-      Cable: 5
-    tagRequirements:
-      Artifact:
-        amount: 1
-        defaultPrototype: SimpleXenoArtifactItem
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml
index b0cf129b673..00b87a58325 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/tape_recorder.yml
@@ -50,17 +50,6 @@
     interfaces:
       enum.TapeRecorderUIKey.Key:
         type: TapeRecorderBoundUserInterface
-  - type: DeviceNetwork
-    deviceNetId: Wireless
-    receiveFrequencyId: BasicDevice
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: DeviceLinkSink
-    ports:
-    - Pause
-    - Record
-    - Playback
-    - Rewind
 
 - type: entity
   parent: TapeRecorder
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml
deleted file mode 100644
index e00a90c1309..00000000000
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-- type: entity
-  parent: BaseItem
-  abstract: true
-  id: AncientBookBase
-  name: Ancient Book
-  components:
-  - type: StaticPrice
-    price: 10
-
-- type: entity
-  parent: AncientBookBase
-  id: AncientBookDamagedCommon
-  name: damaged ancient book
-  description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it.
-  components:
-  - type: Sprite
-    layers:
-      - sprite: _DV/Objects/Misc/books.rsi
-        state: ancientbookdamaged2
-  - type: Construction
-    graph: AncientBookCommonRestored
-    node: start
-  - type: Tag
-    tags:
-      - AncientBookDamagedCommon
-
-- type: entity
-  parent: AncientBookBase
-  id: AncientBookDamagedUncommon
-  name: damaged ancient book
-  description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it.
-  components:
-  - type: Sprite
-    layers:
-      - sprite: _DV/Objects/Misc/books.rsi
-        state: ancientbookdamaged3
-  - type: Construction
-    graph: AncientBookUncommonRestored
-    node: start
-  - type: Tag
-    tags:
-      - AncientBookDamagedUncommon
-
-- type: entity
-  parent: AncientBookBase
-  id: AncientBookDamagedRare
-  name: damaged ancient book
-  description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it.
-  components:
-  - type: Sprite
-    layers:
-      - sprite: _DV/Objects/Misc/books.rsi
-        state: ancientbookdamaged1
-  - type: Construction
-    graph: AncientBookRareRestored
-    node: start
-  - type: Tag
-    tags:
-      - AncientBookDamagedRare
-
-- type: entity
-  parent: AncientBookBase
-  id: AncientBookCommon
-  name: common ancient book
-  description: A very old book commonly found in archives. Read it to discover what it is.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: paper
-    - state: cover_strong
-      color: "#0f204f"
-    - state: decor_wingette_circle
-      color: "#a6adb8"
-  - type: Construction
-    graph: AncientBookCommonRestored
-    node: bookrestored
-  - type: SpawnItemsOnUse
-    items:
-      - id: ResearchDisk
-      - id: AncientBookCommon1
-        orGroup: AncientBookCommonPool
-      - id: AncientBookCommon2
-        orGroup: AncientBookCommonPool
-      - id: AncientBookCommon3
-        orGroup: AncientBookCommonPool
-
-- type: entity
-  parent: AncientBookBase
-  id: AncientBookUncommon
-  name: uncommon ancient book
-  description: A very old book generally only found in private collections. Read it to discover what it is.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: paper
-    - state: cover_strong
-      color: "#771c1c"
-    - state: decor_wingette_circle
-      color: "#a6adb8"
-  - type: Construction
-    graph: AncientBookUncommonRestored
-    node: bookrestored
-  - type: SpawnItemsOnUse
-    items:
-      - id: ResearchDisk5000
-      - id: AncientBookUncommon1
-        orGroup: AncientBookUncommonPool
-      - id: AncientBookUncommon2
-        orGroup: AncientBookUncommonPool
-      - id: AncientBookUncommon3
-        orGroup: AncientBookUncommonPool
-
-- type: entity
-  parent: AncientBookBase
-  id: AncientBookRare
-  name: rare ancient book
-  description: A very old book sought after for it's rarity and value. Read it to discover what it is.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: paper
-    - state: cover_strong
-      color: "#61104f"
-    - state: decor_wingette_circle
-      color: "#a6adb8"
-  - type: Construction
-    graph: AncientBookRareRestored
-    node: bookrestored
-  - type: SpawnItemsOnUse
-    items:
-      - id: ResearchDisk10000
-      - id: AncientBookRare1
-        orGroup: AncientBookRarePool
-      - id: AncientBookRare2
-        orGroup: AncientBookRarePool
-      - id: AncientBookRare3
-        orGroup: AncientBookRarePool
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml
index 6f80619cc71..a3c2c922d35 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml
@@ -108,127 +108,3 @@
     guides:
     - Cargo
     - Salvage
-
-- type: entity
-  parent: BaseItem # inherits from baseitem instead of BookBase because sprites break using BookBase
-  id: BaseAncientBookReadable
-  name: Base Ancient Book
-  abstract: true
-  components:
-  - type: ActivatableUI
-    key: enum.PaperUiKey.Key
-    requiresComplex: false
-  - type: UserInterface
-    interfaces:
-      enum.PaperUiKey.Key:
-        type: PaperBoundUserInterface
-  - type: Tag
-    tags:
-    - Book
-  - type: PaperVisuals
-    backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png"
-    backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0
-    contentMargin: 20.0, 20.0, 20.0, 20.0
-  - type: Paper
-    content: book-text-ancientbookcommon-1
-    contentSize: 12000
-  - type: MeleeWeapon
-    soundHit:
-      collection: Punch
-    damage:
-      types:
-        Blunt: 1
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 1
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookCommon1
-  name: ancient worn book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookcommon1
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookCommon2
-  name: ancient tattered book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookcommon2
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookCommon3
-  name: ancient fractured book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookcommon3
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookUncommon1
-  name: ancient heavy book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookuncommon1
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookUncommon2
-  name: Ancient Dusty Book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookuncommon2
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookUncommon3
-  name: ancient wellworn book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookuncommon3
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookRare1
-  name: ancient mysterious book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookrare1
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookRare2
-  name: ancient ominous book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookrare2
-
-- type: entity
-  parent: BaseAncientBookReadable
-  id: AncientBookRare3
-  name: ancient shining book
-  description: An ancient book lost to time. One can only wonder what can be learned from these...
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Misc/books.rsi
-    state: ancientbookrare3
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml
deleted file mode 100644
index 183150e6e53..00000000000
--- a/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-- type: tool
-  id: Restoring
-  name: tool-quality-restoration-name
-  toolName: tool-quality-restoration-tool-name
-  spawn: BookRestorationKit
-  icon: { sprite: _DV/Objects/Tools/book_restoration.rsi, state: icon }
-
-
-- type: entity
-  name: book restoration kit
-  parent: BaseItem
-  id: BookRestorationKit
-  description: A kit filled with various tools necessary for restoring old and damaged books. This one smells a bit like vanilla.
-  components:
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/wrench_drop.ogg
-  - type: Sprite
-    sprite: _DV/Objects/Tools/book_restoration.rsi
-    state: icon
-  - type: Item
-    sprite: _DV/Objects/Tools/book_restoration.rsi
-    storedSprite:
-      sprite: _DV/Objects/Tools/book_restoration.rsi
-      state: storage
-    inhandVisuals:
-      left:
-      - state: inhand-left
-      right:
-      - state: inhand-right
-  - type: MeleeWeapon
-    wideAnimationRotation: 135
-    attackRate: 1.5
-    damage:
-      types:
-        Blunt: 1.5
-    soundHit:
-      collection: MetalThud
-  - type: Tool
-    qualities:
-      - Restoring
-    useSound:
-      path: /Audio/Effects/plant_rustle.ogg
-  - type: StaticPrice
-    price: 22
-  - type: GuideHelp
-    guides:
-    - Construction
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index f4b29d2cfb4..59b23607e8c 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -2,7 +2,7 @@
   id: WispLash
   damage:
     types:
-      Shadow: 8
+      Cold: 8
       Shock: 8
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 3143d1d2994..ecd9c427697 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -137,49 +137,3 @@
     damage:
       types:
         Piercing: 20
-
-- type: entity
-  parent: BaseBullet
-  id: AccursedWave
-  name: accursed wave
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - sprite: Structures/Power/Generation/PA/particle.rsi
-      color: purple
-      state: particle0
-      shader: unshaded
-      map: [ "unshaded" ]
-  - type: Physics
-    bodyType: Dynamic
-    linearDamping: .9
-    angularDamping: .9
-  - type: Fixtures
-    fixtures:
-      projectile:
-        shape:
-          !type:PhysShapeAabb
-            bounds: "-0.48,-0.48,0.48,0.48"
-        hard: false
-        mask:
-        - Opaque
-      fly-by:
-        shape: !type:PhysShapeCircle
-          radius: 1.5
-        layer:
-        - Impassable
-        - MidImpassable
-        - HighImpassable
-        - LowImpassable
-        hard: False
-  - type: Projectile
-    deleteOnCollide: false
-    impactEffect: null
-    soundHit:
-      path: /Audio/_DV/Weapons/shatter.ogg
-    damage:
-      types:
-        Shadow: 20
-  - type: TimedDespawn
-    lifetime: 0.4 # really short, shouldn't travel far at all
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 32c7f95e701..c6263137dbc 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -255,9 +255,8 @@
     sprite: _DV/Objects/Weapons/Guns/Rifles/lasercarbine.rsi
   - type: ChamberMagazineAmmoProvider
     boltClosed: null
-  - type: GunRequiresWield
   - type: Gun
-    fireRate: 1.5
+    fireRate: 3
     minAngle: 1
     maxAngle: 4
     selectedMode: SemiAuto
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/accursedscythe.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/accursedscythe.yml
deleted file mode 100644
index 1aaec7256a8..00000000000
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/accursedscythe.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: AccursedScythe
-  name: accursed scythe
-  description: a deadly scythe radiating terrible energy
-  components:
-  - type: Sharp
-  - type: Execution
-    doAfterDuration: 2.5
-  - type: Sprite
-    sprite: _DV/Objects/Weapons/Melee/evilscythe.rsi
-    state: icon
-  - type: Item
-    size: Large
-  - type: AmmoCounter
-  - type: UseDelayOnShoot
-  - type: UseDelay
-    delay: 1
-  - type: Gun
-    projectileSpeed: 5
-    soundGunshot: /Audio/_DV/Weapons/scytheshot.ogg
-    fireRate: 1
-    useKey: false
-  - type: RechargeBasicEntityAmmo
-    rechargeCooldown: 5
-    rechargeSound:
-      path: /Audio/_DV/Weapons/shadowreload.ogg
-  - type: BasicEntityAmmoProvider
-    proto: AccursedWave
-    capacity: 1
-    count: 1
-  - type: MeleeWeapon
-    attackRate: 1.2
-    wideAnimationRotation: -135
-    damage:
-      types:
-        Slash: 6
-        Shadow: 6
-    soundHit:
-        path: /Audio/Weapons/bladeslice.ogg
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Slash: 2
-        Shadow: 6
-  - type: GunRequiresWield
-  - type: DisarmMalus
-  - type: Prying
-  - type: DashAbility
-  - type: LimitedCharges
-    maxCharges: 1
-  - type: AutoRecharge
-    rechargeDuration: 60
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml
deleted file mode 100644
index 5994181a38f..00000000000
--- a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-- type: entity
-  id: DisplayCaseArtifact
-  parent: [ DisplayCase, BaseMachinePowered ]
-  name: artifact display case
-  description: A sturdy display case for showing off interesting artifacts.
-  components:
-  - type: ContainerContainer
-    containers:
-      entity_storage: !type:Container
-      paper_label: !type:ContainerSlot
-      machine_board: !type:Container
-      machine_parts: !type:Container
-  - type: ResearchPointSource
-    pointspersecond: 5
-    active: true
-  - type: Machine
-    board: ArtifactDisplayCaseMachineCircuitBoard
-  - type: PowerSwitch
-  - type: ResearchClient
-  - type: ActivatableUI
-    key: enum.ResearchClientUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: PointLight
-    radius: 0.8
-    energy: 0.5
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.29"
-        density: 50
-        mask:
-        - CrateMask #this is so they can go under plastic flaps
-        layer:
-        - MachineLayer
-  - type: UserInterface
-    interfaces:
-      enum.ResearchClientUiKey.Key:
-        type: ResearchClientBoundUserInterface
-
-- type: entity
-  id: DisplayCase
-  parent: CrateBaseSecure
-  name: display case
-  description: A sturdy display case. This one doesn't give any research points, but you can put whatever you want in it.
-  components:
-  - type: AccessReader
-    access: [["Research"]]
-  - type: Sprite
-    drawdepth: Objects
-    sprite: _DV/Structures/Storage/display_cases.rsi
-    layers:
-    - state: display_case
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: display_case_glass
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: locked
-      map: ["enum.LockVisualLayers.Lock"]
-      shader: unshaded
-    - state: paper
-      map: ["enum.PaperLabelVisuals.Layer"]
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.29"
-        density: 50
-        mask:
-        - CrateMask #this is so they can go under plastic flaps
-        layer:
-        - MachineLayer
-  - type: Icon
-    sprite: _DV/Structures/Storage/display_cases.rsi
-    state: display_case_icon
-  - type: EntityStorageVisuals
-    sprite: _DV/Structures/Storage/display_cases.rsi
-    stateDoorOpen: display_case_open
-    stateDoorClosed: display_case_glass
diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml
index b27a9936de7..b99aad5bd79 100644
--- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml
@@ -3,17 +3,17 @@
 - type: loadout
   id: SecurityFirearmWeaponPistolPollock
   equipment:
-    pocket1: WeaponPistolPollock
+    pocket1: WeaponPistolPollockNonlethal
 
 - type: loadout
   id: SecurityFirearmWeaponPistolSLP57
   equipment:
-    pocket1: WeaponPistolSLP57
+    pocket1: WeaponPistolSLP57Nonlethal
 
 - type: loadout
   id: SecurityFirearmWeaponPistolMk58
   equipment:
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
 
 - type: loadout
   id: SecurityFirearmWeaponDisabler
diff --git a/Resources/Prototypes/_DV/Recipes/Crafting/Graphs/ancientbooks.yml b/Resources/Prototypes/_DV/Recipes/Crafting/Graphs/ancientbooks.yml
deleted file mode 100644
index c4560cd7c88..00000000000
--- a/Resources/Prototypes/_DV/Recipes/Crafting/Graphs/ancientbooks.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-- type: constructionGraph
-  id: AncientBookCommonRestored
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: bookrestored
-          steps:
-            - tool: Restoring
-              doAfter: 20
-    - node: bookrestored
-      entity: AncientBookCommon
-
-- type: constructionGraph
-  id: AncientBookUncommonRestored
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: bookrestored
-          steps:
-            - tool: Restoring
-              doAfter: 20
-    - node: bookrestored
-      entity: AncientBookUncommon
-
-- type: constructionGraph
-  id: AncientBookRareRestored
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: bookrestored
-          steps:
-            - tool: Restoring
-              doAfter: 20
-    - node: bookrestored
-      entity: AncientBookRare
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml
index 68597bea9af..3928c21bdaf 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml
@@ -9,4 +9,3 @@
   id: EpistemicsBoards
   recipes:
   - ReverseEngineeringMachineCircuitboard
-  - ArtifactDisplayCaseMachineCircuitBoard
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml
index 5c6f21e3df6..7022448e076 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml
@@ -42,8 +42,3 @@
   parent: BaseCircuitboardRecipe
   id: DeepFryerMachineCircuitboard
   result: DeepFryerMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ArtifactDisplayCaseMachineCircuitBoard
-  result: ArtifactDisplayCaseMachineCircuitBoard
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/security.yml b/Resources/Prototypes/_DV/Recipes/Lathes/security.yml
index 2f9537b4ea1..6d2f1056842 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/security.yml
@@ -88,6 +88,7 @@
   materials:
     Plastic: 1250
     Steel: 75
+    Bluespace: 75
 
 - type: latheRecipe
   parent: BaseAmmoRecipe
@@ -96,6 +97,7 @@
   materials:
     Plastic: 300
     Steel: 200
+    Bluespace: 200
     Glass: 100
 
 # Tools
diff --git a/Resources/Prototypes/_DV/Research/biochemical.yml b/Resources/Prototypes/_DV/Research/biochemical.yml
index 7839400a5ba..c5a7cadfae3 100644
--- a/Resources/Prototypes/_DV/Research/biochemical.yml
+++ b/Resources/Prototypes/_DV/Research/biochemical.yml
@@ -1,7 +1,37 @@
 # Tier 1
 
+- type: technology
+  id: BasicAugmentation
+  name: research-technology-basic-augmentation
+  icon:
+    sprite: _DV/Objects/Augments/power.rsi
+    state: cell
+  discipline: Biochemical
+  tier: 1
+  cost: 5000
+  recipeUnlocks:
+  - AugmentPowerCellSlotCasing
+  - AugmentRechargerCasing
+
 # Tier 2
 
+- type: technology
+  id: ImplantedTools
+  name: research-technology-implanted-tools
+  icon:
+    sprite: _DV/Objects/Augments/arm.rsi
+    state: base
+  discipline: Biochemical
+  tier: 2
+  cost: 10000
+  technologyPrerequisites: [ BasicAugmentation ]
+  recipeUnlocks:
+  - AugmentToolPanelCasing
+  - AugmentUtilityPanelElectronics
+  - AugmentBotanyPanelElectronics
+  - AugmentSurgeryPanelElectronics
+  - AugmentPaperworkPanelElectronics
+
 - type: technology
   id: Cloning
   name: research-technology-cloning
diff --git a/Resources/Prototypes/_DV/Research/experimental.yml b/Resources/Prototypes/_DV/Research/experimental.yml
deleted file mode 100644
index 3d2e8aa7a5a..00000000000
--- a/Resources/Prototypes/_DV/Research/experimental.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: technology
-  id: ArtifactDisplayCases
-  name: research-technology-artifact-display
-  icon:
-    sprite: _DV/Structures/Storage/display_cases.rsi
-    state: display_case_icon
-  discipline: Experimental
-  tier: 2
-  cost: 5000
-  recipeUnlocks:
-  - ArtifactDisplayCaseMachineCircuitBoard
diff --git a/Resources/Prototypes/_DV/Shaders/highglimmer.yml b/Resources/Prototypes/_DV/Shaders/highglimmer.yml
deleted file mode 100644
index f5eb0487827..00000000000
--- a/Resources/Prototypes/_DV/Shaders/highglimmer.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: shader
-  id: HighGlimmer
-  kind: source
-  path: "/Textures/_DV/Shaders/highglimmer.swsl"
diff --git a/Resources/Prototypes/_DV/status_effects.yml b/Resources/Prototypes/_DV/status_effects.yml
index e7429595d58..2b4ca420ae2 100644
--- a/Resources/Prototypes/_DV/status_effects.yml
+++ b/Resources/Prototypes/_DV/status_effects.yml
@@ -15,9 +15,3 @@
 
 - type: statusEffect
   id: PainNumbness
-
-- type: statusEffect
-  id: ScrambledSpeech
-
-- type: statusEffect
-  id: RepeatingTelepath
diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml
index 0dd825f057c..34a06b6fbf2 100644
--- a/Resources/Prototypes/_DV/tags.yml
+++ b/Resources/Prototypes/_DV/tags.yml
@@ -1,8 +1,5 @@
 ## This is for Nyano and Delta V tags
 
-- type: Tag
-  id: Artifact
-
 - type: Tag
   id: AugmentAPCBoard
 
@@ -147,9 +144,6 @@
 - type: Tag
   id: SecDogWearable # allows Laika to wear meson goggles (and more later?)
 
-- type: Tag
-  id: SiliconOrIPCEmotes # upstream's SiliconEmotes = only bots and borgs, this one includes IPCs
-
 - type: Tag
   id: Skirt
 
@@ -176,18 +170,3 @@
 
 - type: Tag
   id: AgentUplink # Used for allowing agent to buy their suit
-
-- type: Tag
-  id: CleaningGrenade
-
-- type: Tag
-  id: Hoodie
-
-- type: Tag
-  id: AncientBookDamagedCommon
-
-- type: Tag
-  id: AncientBookDamagedUncommon
-
-- type: Tag
-  id: AncientBookDamagedRare
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
index 5a8cf6d273f..e26466bf4d5 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
@@ -32,7 +32,6 @@
     - type: ZombieImmune
     - type: DoAfter
     - type: RotationVisuals
-      defaultRotation: 90 # DeltaV
       horizontalRotation: 90
     - type: Examiner
     # - type: Recyclable
@@ -195,7 +194,7 @@
         - CanPilot
         - FootstepSound
         - DoorBumpOpener
-        - SiliconOrIPCEmotes # DeltaV
+        - SiliconEmotes # DeltaV
     - type: Hands
     - type: Inventory
       templateId: human
diff --git a/Resources/Prototypes/_EE/Voice/speech_emotes.yml b/Resources/Prototypes/_EE/Voice/speech_emotes.yml
index ba4a964b0e3..d993a3b2e46 100644
--- a/Resources/Prototypes/_EE/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/_EE/Voice/speech_emotes.yml
@@ -10,17 +10,17 @@
   icon: _DV/Interface/Emotes/ecg.png # DeltaV - Added icon
   category: Vocal
   whitelist:
-    tags: # DeltaV - let borgs, bots, and IPCs use it
-    - SiliconOrIPCEmotes
-  chatMessages: [ boops. ] # DeltaV - period
+    tags: # DeltaV - let bots use it too
+    - SiliconEmotes
+  chatMessages: [ boops ]
   chatTriggers:
     - boops
 
 - type: emote
   id: Whirr # uncategorized as it is generic
   whitelist:
-    tags: # DeltaV - let borgs, bots, and IPCs use it
-    - SiliconOrIPCEmotes
+    tags: # DeltaV - let bots use it too
+    - SiliconEmotes
   name: chat-emote-name-whirr
   chatMessages: [ whirrs ]
   chatTriggers:
diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Backpacks/duffelbag.yml
deleted file mode 100644
index dc02870d8a0..00000000000
--- a/Resources/Prototypes/_Goobstation/Catalog/Fills/Backpacks/duffelbag.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateStealthHardsuitBundle
-  name: cybersun stealthsuit bundle
-  description: "An advanced cybersun stealth hardsuit bundle."
-  components:
-  - type: StorageFill
-    contents:
-    - id: ClothingOuterHardsuitCybersunStealth
-    - id: ClothingMaskGasSyndicate
-    - id: ClothingHandsGlovesCombat
-    - id: DoubleEmergencyOxygenTankFilled
-    - id: DoubleEmergencyNitrogenTankFilled
diff --git a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
deleted file mode 100644
index d280db98e13..00000000000
--- a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- type: listing
-  id: UplinkHardsuitCybersunStealth
-  name: uplink-hardsuit-cybersun-stealth-name
-  description: uplink-hardsuit-cybersun-stealth-desc
-  icon: { sprite: /Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateStealthHardsuitBundle
-  cost:
-    Telecrystal: 15 # Harmony - modified since goob has different TC ratio.
-  categories:
-  - UplinkWearables
-# begin Harmony change - yeah let's not give this to syndies
-  # Begin DeltaV additions - we ARE giving this to syndies
-  #conditions:
-  #- !type:StoreWhitelistCondition
-  #  whitelist:
-  #    tags:
-  #    - NukeOpsUplink
-  # End DeltaV additions - we ARE giving this to syndies
-# end Harmony change
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml
deleted file mode 100644
index ec70efb9f02..00000000000
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-- type: entity
-  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ] # Harmony - Changed parent to upstream convention
-  id: ClothingHeadHelmetHardsuitCybersunStealth
-  # suffix: stealth - Harmony change
-  name: cybersun stealth hardsuit helmet
-  description: A helmet with plating for stealth operations.
-  components:
-  - type: Sprite
-    sprite: _Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi
-  - type: Clothing
-    sprite: _Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi
-  - type: PointLight
-    color: green
-  - type: PressureProtection
-    highPressureMultiplier: 0.08
-    lowPressureMultiplier: 1000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.95
-        Heat: 0.95
-  - type: ClothingGrantComponent
-    component:
-    - type: Stealth
-    # Harmony start
-    - type: StealthOnMove
-      passiveVisibilityRate: -0.5
-      movementVisibilityRate: 0.45 # DeltaV - was 0.6
-    # Harmony end
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml
deleted file mode 100644
index 51e25b1f365..00000000000
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-- type: entity
-  parent: [ ClothingOuterHardsuitBase, BaseSyndicateContraband ]
-  id: ClothingOuterHardsuitCybersunStealth
-  # suffix: stealth - Harmony change
-  name: cybersun stealth hardsuit
-  description: A hardsuit with stealth plating for operations, the shielding doesn't work while you're moving though! Needs the helmet on to finish the stealth field.
-  components:
-  - type: Sprite
-    sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi
-  - type: Item
-    size: Huge
-  - type: Clothing
-    sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.05
-    lowPressureMultiplier: 1000
-  - type: ExplosionResistance
-    damageCoefficient: 0.8 # DeltaV - was 0.65
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7 # DeltaV - was 0.65
-        Slash: 0.7 # DeltaV - was 0.65
-        Piercing: 0.6 
-        Heat: 0.8 # DeltaV - was 0.6
-        Radiation: 0.8 # DeltaV - was 0.55
-        #Caustic: 0.7 # DeltaV
-  - type: StaminaResistance # DeltaV
-    damageCoefficient: 0.7
-  - type: ClothingSpeedModifier
-    walkModifier: 1.0 # DeltaV - was 0.8
-    sprintModifier: 1.0 # DeltaV - was 0.85
-  - type: HeldSpeedModifier
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitCybersunStealth
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
-  # Harmony start
-  # - type: ClothingGrantComponent
-  #   component:
-  #   - type: StealthOnMove
-  #     passiveVisibilityRate: -0.5
-  #     movementVisibilityRate: 0.6
-  # Harmony end
diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/robotic_arm.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/robotic_arm.yml
index fdda6f6b651..614258bdcb7 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/robotic_arm.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/robotic_arm.yml
@@ -99,11 +99,9 @@
   - type: DeviceLinkSink
     ports:
     - RoboticArmInput
-    - PowerToggle #DeltaV
     # - On
     # - Off
     # TODO: ports to disable it
-  - type: PowerTogglePort #DeltaV
   - type: DeviceLinkSource
     ports:
     - RoboticArmOutput
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_damage.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_damage.yml
deleted file mode 100644
index 5cef576d49f..00000000000
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_damage.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-# Pyroclastic
-- type: damageModifierSet
-  id: AnomalitePyroclastic
-  coefficients:
-    Heat: 0.0
-  flatReductions:
-    Heat: 100
-
-# Gravity
-- type: damageModifierSet
-  id: AnomaliteGravity
-  coefficients:
-    Blunt: 0.3
-    Piercing: 0.3
-    Slash: 0.3
-
-# Ice
-- type: damageModifierSet
-  id: AnomaliteIce
-  coefficients:
-    Cold: 0.0
-  flatReductions:
-    Cold: 100
-
-# Flesh
-- type: damageModifierSet
-  id: AnomaliteFlesh
-  coefficients:
-    Slash: 0.0
-
-# Rock
-- type: damageModifierSet
-  id: AnomaliteRock
-  coefficients:
-    Blunt: 0.0
-    Structural: 2.0
-
-# Reagent
-- type: damageModifierSet
-  id: AnomaliteLiquid
-  coefficients:
-    Poison: 0.0
-
-# Bluespace
-- type: damageModifierSet
-  id: AnomaliteBluespace
-  coefficients:
-    Cellular: 0.0
-    Radiation: 0.0
-
-# Electricity
-- type: damageModifierSet
-  id: AnomaliteElectricity
-  coefficients:
-    Shock: 0.0
-
-# Flora
-- type: damageModifierSet
-  id: AnomaliteFlora
-  coefficients:
-    Piercing: 0.0
-
-# Shadow
-- type: damageModifierSet
-  id: AnomaliteShadow
-  coefficients:
-    Asphyxiation: 0.0
-    Bloodloss: 0.0
-    Holy: 2.0 # let there be light
-
-# Tech
-- type: damageModifierSet
-  id: AnomaliteTech
-  coefficients:
-    Radiation: 0.5
-    Shock: 0.5
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_nameidentifiers.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_nameidentifiers.yml
deleted file mode 100644
index d335805bcc0..00000000000
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_nameidentifiers.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-- type: nameIdentifierGroup
-  id: AnomalitePyroclastic
-  prefix: ANOM-PY
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteBluespace
-  prefix: ANOM-BL
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteElectric
-  prefix: ANOM-EL
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteFlesh
-  prefix: ANOM-MT # mt for meat - to differentiate from fl for flora
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteFlora
-  prefix: ANOM-FL
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteGravity
-  prefix: ANOM-GR
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteIce
-  prefix: ANOM-FR # fr for frost. i don't think IC would read well
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteReagent
-  prefix: ANOM-LQ # lq for liquid
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteRock
-  prefix: ANOM-RK
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteShadow
-  prefix: ANOM-SH
-  minValue: 0
-  maxValue: 999
-
-- type: nameIdentifierGroup
-  id: AnomaliteTech
-  prefix: ANOM-TK # tk for tech. tc, te, and th, don't read well
-  minValue: 0
-  maxValue: 999
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_sounds.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_sounds.yml
deleted file mode 100644
index 76276143a2b..00000000000
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_sounds.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: speechSounds
-  id: Anomalite
-  saySound:
-    path: /Audio/_Impstation/Voice/Talk/Anomalite/anomalite.ogg
-  askSound:
-    path: /Audio/_Impstation/Voice/Talk/Anomalite/anomalite_ask.ogg
-  exclaimSound:
-    path: /Audio/_Impstation/Voice/Talk/Anomalite/anomalite_exclaim.ogg
-
-- type: speechVerb
-  id: Anomalite
-  name: chat-speech-verb-name-anomalite
-  speechVerbStrings:
-  - chat-speech-verb-anomalite-1
-  - chat-speech-verb-anomalite-2
-  - chat-speech-verb-anomalite-3
-
-- type: emoteSounds
-  id: Anomalite
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      path: /Audio/_Impstation/Voice/Talk/Anomalite/anomalite_scream.ogg
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_spawners.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_spawners.yml
deleted file mode 100644
index f93a19a7378..00000000000
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalite_spawners.yml
+++ /dev/null
@@ -1,274 +0,0 @@
-# Pyroclastic
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomalitePyroclastic
-  name: anomalite spawn point
-  suffix: Pyroclastic
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-fireanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomalitePyroclastic
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyfire
-
-# Gravity
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteGravity
-  name: anomalite spawn point
-  suffix: Gravity
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-gravanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteGravity
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalygravity
-
-# Ice
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteIce
-  name: anomalite spawn point
-  suffix: Ice
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-iceanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteIce
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyice
-
-# Flesh
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteFlesh
-  name: anomalite spawn point
-  suffix: Flesh
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-fleshanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteFlesh
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyflesh
-
-# Rock
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteRock
-  name: anomalite spawn point
-  suffix: Rock
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-rockanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteRock
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyrock
-
-# Reagent
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteLiquid
-  name: anomalite spawn point
-  suffix: Reagent
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-reagentanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteLiquid
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyreagent
-
-# Bluespace
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteBluespace
-  name: anomalite spawn point
-  suffix: Bluespace
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-bluespaceanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteBluespace
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalybluespace
-
-# Electricity
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteElectricity
-  name: anomalite spawn point
-  suffix: Electric
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-electricanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteElectricity
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyelectric
-
-# Flora
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteFlora
-  name: anomalite spawn point
-  suffix: Flora
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-floralanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteFlora
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyflower
-
-# Shadow
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteShadow
-  name: anomalite spawn point
-  suffix: Shadow
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-shadowanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteShadow
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalyshadow
-
-# Shadow
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostAnomaliteTech
-  name: anomalite spawn point
-  suffix: Tech
-  categories: [ DoNotMap ]
-  components:
-  - type: GhostRole
-    name: ghost-role-information-techanomalite-name
-    description: ghost-role-information-anomalite-description
-    rules: ghost-role-information-familiar-anomalite-rules
-    mindRoles:
-    - MindRoleGhostRoleFamiliar
-    raffle:
-      settings: short
-  - type: GhostRoleMobSpawner
-    prototype: MobAnomaliteTech
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _Impstation/Mobs/Anomalites/anomalite.rsi
-        state: anomalytech
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
deleted file mode 100644
index 5eff64204da..00000000000
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml
+++ /dev/null
@@ -1,695 +0,0 @@
-- type: entity
-  parent: BaseAnomalyInertCore
-  id: AnomaliteCore
-  name: anomalite core
-  description: It's empty.
-  components:
-  - type: Sprite
-    sprite: Structures/Specific/Anomalies/Cores/gravity_core.rsi
-
-# Base Anomalite
-- type: entity
-  parent: [ BaseMob, MobDamageable, MobPolymorphable, MobAtmosExposed, MobCombat, MobBloodstream, MobFlammable ]
-  id: BaseAnomalite
-  name: anomalite
-  abstract: true
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: MindContainer
-    showExamineInfo: true
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
-    scale: 1, 1
-  - type: MeleeWeapon
-    damage:
-      types:
-        Blunt: 0 # this should be a custom type and value for each anomaly type.
-    angle: 0
-    animation: WeaponArcBite
-  - type: NpcFactionMember
-    factions:
-    - SimpleNeutral
-  - type: Body
-    prototype: Animal
-  - type: Damageable # DeltaV - Change their damage to BiologicalMetaphysical, since they're magical sprite things. Also the shadow anomalite is supposed to take holy damage and it can't normally
-    damageContainer: BiologicalMetaphysical
-  - type: Dispellable # DeltaV - they're anomalies so they should be dispellable
-  - type: Climbing
-  - type: NameIdentifier
-    group: Anomalite
-  - type: GhostTakeoverAvailable
-  - type: Tag
-    tags:
-    - VimPilot
-    - DoorBumpOpener
-    - AnomalyHost # this is potentially really funny. if not, or if it causes problems, we can remove it.
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 75
-        restitution: 0.0
-        mask:
-        - CrateMask # this is so they can fly over tables and through plastic flaps
-        layer:
-        - MobLayer
-  - type: Bloodstream
-    bloodMaxVolume: 75
-    bloodReagent: Entropy # DeltaV - Was Anomalium, not part of the initial Anomalite PR. Might port it eventually, but until then Entropy is our closest analogue.
-  - type: InteractionPopup
-    successChance: 0.1
-    interactSuccessString: petting-success-anomalite
-    interactFailureString: petting-success-anomalite
-    interactSuccessSpawn: EffectHearts
-    interactSuccessSound:
-      path: /Audio/Animals/mouse_squeak.ogg # this should be unique per-type.
-    interactFailureSound:
-      path: /Audio/Effects/tesla_consume.ogg # this should be unique per-type.
-  - type: StatusEffects
-    allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
-    - Stutter
-    - Electrocution
-    - ForcedSleep
-    - TemporaryBlindness
-    - Pacified
-    - StaminaModifier
-    - Flashed
-    - RadiationProtection
-    - Drowsiness
-    - Adrenaline
-  - type: Puller
-    needsHands: false
-  - type: ComplexInteraction
-  - type: SSDIndicator
-  - type: Speech
-    speechVerb: Anomalite
-    speechSounds: Anomalite
-    allowedEmotes: [ 'Scream' ]
-  - type: Vocal
-    sounds:
-      Male: Anomalite
-      Female: Anomalite
-      Unsexed: Anomalite
-  - type: Emoting
-  - type: BodyEmotes
-    soundsId: GeneralBodyEmotes
-  - type: MobState
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      100: Dead
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 200
-      behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          AnomaliteCore:
-            min: 1
-            max: 1
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 1500
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  - type: StandingState
-  # Anomaly component. Some settings changed to make them not be fucked-up powerful. now they're only a little bit fucked-up powerful.
-  - type: Anomaly
-    cannotSupercrit: true
-    cannotRandomPulse: true
-    deleteEntity: false
-    maxPointsPerSecond: 10
-    corePrototype: AnomaliteCore
-    healthChangePerSecond: 0.0
-    decayhreshold: 9999.0
-    growthThreshold: 9999.0
-  # apid-type always weightless movement
-  - type: MovementAlwaysTouching
-  - type: MovementIgnoreGravity
-    gravityState: true
-  - type: Physics
-    bodyStatus: InAir
-  - type: CanMoveInAir
-  - type: FloatingVisuals
-    animationKey: anomalyfloat
-  - type: AnimationPlayer
-  - type: MovementSpeedModifier
-    weightlessFriction: 1
-    weightlessFrictionNoInput: 2 # so they can actually stop moving
-    weightlessAcceleration: 1.5
-  - type: NoSlip
-  - type: Familiar # Provides information on core to the pinpointer
-  - type: Inventory
-    templateId: anomalite
-  - type: InventorySlots
-  - type: Loadout
-    prototypes:
-      - StartingGearAnomalitePinpointer
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
-  - type: Hands
-
-# Anomalites:
-# Pyroclastic
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomalitePyroclastic
-  suffix: Pyroclastic
-  description: A flickering little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/fire.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/fire.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Heat: 5
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomalitePyroclastic
-  - type: Temperature
-    heatDamageThreshold: 325
-    coldDamageThreshold: 0
-    currentTemperature: 310.15
-    coldDamage:
-      types:
-        Cold: 0.1
-    specificHeat: 42
-    heatDamage:
-      types:
-        Heat: 0.0
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#E25822"
-  - type: NameIdentifier
-    group: AnomalitePyroclastic
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionPyroclastic
-    skipStun: true
-
-# Gravity
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteGravity
-  suffix: Gravity
-  description: A strange little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/grav.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/grav.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Blunt: 5
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteGravity
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#1e070e"
-  - type: NameIdentifier
-    group: AnomaliteGravity
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionGravity
-    skipStun: true
-
-# Ice
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteIce
-  suffix: Ice
-  description: A chilly little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/ice.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/ice.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Cold: 5
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteIce
-  - type: Temperature
-    heatDamageThreshold: 325
-    coldDamageThreshold: 0
-    currentTemperature: 310.15
-    coldDamage:
-      types:
-        Cold: 0.0
-    specificHeat: 42
-    heatDamage:
-      types:
-        Heat: 1.5
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#befaff"
-  - type: NameIdentifier
-    group: AnomaliteIce
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionIce
-    skipStun: true
-
-# Flesh
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteFlesh
-  suffix: Flesh
-  description: A gristly little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/flesh.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/flesh.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 5
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteFlesh
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#cb5b7e"
-  - type: NameIdentifier
-    group: AnomaliteFlesh
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionFlesh
-    skipStun: true
-
-# Rock
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteRock
-  suffix: Rock
-  description: A sturdy little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/rock.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/rock.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Blunt: 5
-        Structural: 15
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteRock
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#5ca8cb"
-  - type: NameIdentifier
-    group: AnomaliteRock
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionRock
-    skipStun: true
-
-# Reagent
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteLiquid
-  suffix: Liquid
-  description: A sopping little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/reagent.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/reagent.rsi
-    layers:
-    - state: anom
-      map: [ "enum.AnomalyVisualLayers.Base", "enum.DamageStateVisualLayers.Base" ]
-    - state: pulse
-      map: [ "enum.AnomalyVisualLayers.Animated" ]
-      visible: false
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Poison: 1 # reduced cus they inject their solution into you
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteLiquid
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#ffffff"
-  - type: NameIdentifier
-    group: AnomaliteReagent
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionLiquid
-    skipStun: true
-  - type: SolutionContainerManager
-    solutions:
-      anomaly:
-        maxVol: 1500
-  - type: MeleeChemicalInjector
-    solution: anomaly
-    transferAmount: 6
-  - type: RandomSprite
-    selected:
-      enum.AnomalyVisualLayers.Base:
-        anom: "#ffffff"
-      enum.AnomalyVisualLayers.Animated:
-        pulse: "#ffffff"
-  - type: SolutionScanner # i think it's fun for them to be able to scan their solutions
-
-# Bluespace
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteBluespace
-  suffix: Bluespace
-  description: A non-euclidean little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/bluespace.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/bluespace.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Cellular: 5 # there was a great big flash, everything just changed / his molecules got all rearranged
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteBluespace
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#00ccff"
-  - type: NameIdentifier
-    group: AnomaliteBluespace
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionBluespace
-    skipStun: true
-
-# Electricity
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteElectricity
-  suffix: Electricity
-  description: A shocking little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/electric.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/electric.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Shock: 5
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteElectricity
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#ffffaa"
-  - type: NameIdentifier
-    group: AnomaliteElectric
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionElectric
-    skipStun: true
-
-# Flora
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteFlora
-  suffix: Flora
-  description: A blossoming little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/flower.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/flower.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Piercing: 5 # thorns?
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteFlora
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#6270bb"
-  - type: NameIdentifier
-    group: AnomaliteFlora
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionFlora
-    skipStun: true
-
-# Shadow
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteShadow
-  suffix: Shadow
-  description: A dark little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/shadow.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/shadow.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Asphyxiation: 10 # suffocating darkness
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteShadow
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#793a80"
-  - type: NameIdentifier
-    group: AnomaliteShadow
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionShadow
-    skipStun: true
-  # QB: We haven't ported night vision yet!
-  #- type: NightVision
-  #  isActive: true
-  #  toggleAction: null
-  #  color: "#50595C"
-  #  activateSound: null
-  #  deactivateSound: null
-
-# Tech
-- type: entity
-  parent: [ BaseAnomalite ]
-  id: MobAnomaliteTech
-  suffix: Tech
-  description: A cybernetic little sprite, born from the leftover energies of an anomaly core.
-  components:
-  - type: Icon
-    sprite: _Impstation/Mobs/Anomalites/tech.rsi
-    state: anom
-  - type: Sprite
-    sprite: _Impstation/Mobs/Anomalites/tech.rsi
-    layers:
-    - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: anom
-    noRot: true
-    drawdepth: Mobs
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: anom
-      Dead:
-        Base: dead
-  - type: MeleeWeapon
-    damage:
-      types:
-        Radiation: 5 # there's not really a relevant damage type for this
-    angle: 0
-    animation: WeaponArcBite
-  - type: Damageable
-    damageModifierSet: AnomaliteTech
-  - type: PointLight
-    radius: 2
-    energy: 1
-    softness: 10
-    color: "#56c1e8"
-  - type: NameIdentifier
-    group: AnomaliteTech
-  # Anomaly functionality
-  - type: InnerBodyAnomaly
-    injectionProto: AnomalyInjectionTech
-    skipStun: true
diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Specific/Anomaly/anomaly_injections.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Specific/Anomaly/anomaly_injections.yml
deleted file mode 100644
index aaf7c8cf473..00000000000
--- a/Resources/Prototypes/_Impstation/Entities/Structures/Specific/Anomaly/anomaly_injections.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-# Imp. This is only used for Anomalites
-- type: entity
-  parent: AnomalyInjectionBase
-  id: AnomalyInjectionLiquid
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: PointLight
-    color: "#ffffff"
-  - type: PuddleCreateAnomaly
-    solution: anomaly
-  - type: InjectionAnomaly
-    solution: anomaly
-    superCriticalInjectRadius: 10
-  - type: ReagentProducerAnomaly
-    solution: anomaly
-    needRecolor: true
-    dangerousChemicals:
-    - UnstableMutagen
-    - Mold
-    - PolytrinicAcid
-    - FerrochromicAcid
-    - FluorosulfuricAcid
-    - SulfuricAcid
-    - HeartbreakerToxin
-    - VentCrud
-    - UncookedAnimalProteins
-    - Thermite
-    - Napalm
-    - Phlogiston
-    - ChlorineTrifluoride
-    - FoamingAgent
-    - BuzzochloricBees
-    - RobustHarvest
-    usefulChemicals:
-    - Cryptobiolin
-    - Dylovene
-    - Arithrazine
-    - Bicaridine
-    - Cryoxadone
-    - Dermaline
-    - Dexalin
-    - DexalinPlus
-    - Epinephrine
-    - Leporazine
-    - Ambuzol
-    - Tricordrazine
-    - Artifexium
-    - Ethylredoxrazine
-    funChemicals:
-    - Desoxyephedrine
-    - Ephedrine
-    - THC
-    - SpaceDrugs
-    - Nocturine
-    - MuteToxin
-    - NorepinephricAcid
-    - Pax
-    - Ipecac
-    - Cognizine
-    - Beer
-    - SpaceGlue
-    - SpaceLube
-    - CogChamp
-    - Honk
-    - Carpetium
-    - JuiceThatMakesYouWeh
-  - type: Drink
-    solution: anomaly
-  - type: DrainableSolution
-    solution: anomaly
-  - type: DrawableSolution
-    solution: anomaly
-  - type: ExaminableSolution
-    solution: anomaly
-  - type: RefillableSolution
-    solution: anomaly
-  - type: InjectableSolution
-    solution: beaker
diff --git a/Resources/Prototypes/_Impstation/InventoryTemplates/anomalite_inventory_template.yml b/Resources/Prototypes/_Impstation/InventoryTemplates/anomalite_inventory_template.yml
deleted file mode 100644
index a3f650e0d15..00000000000
--- a/Resources/Prototypes/_Impstation/InventoryTemplates/anomalite_inventory_template.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- type: inventoryTemplate
-  id: anomalite
-  slots:
-    - name: pocket1
-      slotTexture: pocket
-      fullTextureName: template_small
-      slotFlags: POCKET
-      slotGroup: MainHotbar
-      stripTime: 3
-      uiWindowPos: 0,3
-      strippingWindowPos: 0,4
-      dependsOn: jumpsuit
-      displayName: Pocket 1
-      stripHidden: true
diff --git a/Resources/Prototypes/_Impstation/Objects/Devices/pinpointer.yml b/Resources/Prototypes/_Impstation/Objects/Devices/pinpointer.yml
deleted file mode 100644
index bb10c12f89f..00000000000
--- a/Resources/Prototypes/_Impstation/Objects/Devices/pinpointer.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: entity
-  parent: PinpointerBase
-  name: core pull
-  description: You have an instinctual knowledge of the location of your core.
-  suffix: Station, Unremoveable
-  id: PinpointerAnomalite
-  components:
-  - type: Sprite
-    sprite: _DV/Objects/Devices/pinpointer.rsi # DeltaV - They were just using the impstation dragon pinpointer so I made them a custom one
-    layers:
-    - state: pinpointer-anomalite
-      map: ["enum.PinpointerLayers.Base"]
-    - state: pinonnull
-      map: ["enum.PinpointerLayers.Screen"]
-      shader: unshaded
-      visible: false
-  - type: Icon
-    sprite: _DV/Objects/Devices/pinpointer.rsi # DeltaV - They were just using the impstation dragon pinpointer so I made them a custom one
-    state: pinpointer-anomalite
-  - type: Pinpointer
-    targetName: your core
-    activateImmediately: true
-  - type: Unremoveable
-
-- type: startingGear
-  id: StartingGearAnomalitePinpointer
-  equipment:
-    pocket1: PinpointerAnomalite
diff --git a/Resources/Prototypes/_QB/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_QB/Entities/Clothing/Ears/headsets.yml
deleted file mode 100644
index 7915634a96a..00000000000
--- a/Resources/Prototypes/_QB/Entities/Clothing/Ears/headsets.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  parent: ClothingHeadsetService
-  id: ClothingHeadsetLibrarian
-  name: librarian headset
-  description: Headset used by the Librarian, archiving scientific and literary works, bringing knowledge to all.
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeyService
-      - EncryptionKeyScience
-      - EncryptionKeyCommon
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml
index 8f192859e8b..1596bf30e4e 100644
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -11,7 +11,6 @@
   - type: ItemBorgModule
     moduleId: Surgery
     items:
-    - HandheldHealthAnalyzerUnpowered # DeltaV - Add Scanners to Surgery Modules.
     - Scalpel
     - Drill
     - Hemostat
@@ -35,7 +34,6 @@
   - type: ItemBorgModule
     moduleId: AdvancedSurgery
     items:
-    - HandheldHealthAnalyzerUnpowered # DeltaV - Add Scanners to Surgery Modules.
     - EnergyScalpel
     - EnergyCautery
     - AdvancedRetractor
diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml
index c3a57b2687b..9091014cf71 100644
--- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml
@@ -1,27 +1,18 @@
 ## Static
 
 - type: latheRecipePack
-  id: IPCLimbsStatic # DeltaV - Share Surgery Parts between Epi and Med. Non-Medical Parts moved to IPCPartsStatic
+  id: IPCPartsStatic
   recipes:
-  # - TorsoIPC # DeltaV - Moved to IPCLimbsStatic
+  - TorsoIPC
   - LeftArmIPC
   - RightArmIPC
   - LeftLegIPC
   - RightLegIPC
-  # - HeadIPC # DeltaV - Moved to IPCLimbsStatic
+  - HeadIPC
   - LeftHandIPC
   - RightHandIPC
   - LeftFootIPC
   - RightFootIPC
-
-# Begin DeltaV additions
-- type: latheRecipePack
-  parent: IPCLimbsStatic
-  id: IPCPartsStatic
-  recipes:
-  - TorsoIPC
-  - HeadIPC
-# End DeltaV additions
   - OrganIPCEyes
   - OrganIPCPump
 
@@ -44,15 +35,5 @@
   - JawsOfLifeRightArm
   - SpeedLeftLeg
   - SpeedRightLeg
-  # - BasicCyberneticEyes # DeltaV - Moved to CyberneticsRobotics
-  - ClothingHandsGlovesMechanicalSurgical
-  # - OrganIPCSpacePump # DeltaV - Moved to CyberneticsRobotics
-
-  # Begin DeltaV additions
-- type: latheRecipePack # DeltaV - Share Surgery Parts between Epi and Med. Non-Organic & Robotics cybernetics moved to ExoFab.
-  parent: Cybernetics
-  id: CyberneticsRobotics
-  recipes:
   - BasicCyberneticEyes
-  - OrganIPCSpacePump
-  # End DeltaV additions
+  - ClothingHandsGlovesMechanicalSurgical
diff --git a/Resources/Prototypes/_Starlight/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_Starlight/Loadouts/Miscellaneous/trinkets.yml
deleted file mode 100644
index 0bd302b9019..00000000000
--- a/Resources/Prototypes/_Starlight/Loadouts/Miscellaneous/trinkets.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Instruments
-- type: loadout
-  id: SuperSynthesizerInstrument #Delta-V - ports supersynth trinket from Starlight.
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobMusician
-      time: 360000 #Delta-V - 10hr originally, but changed to 200 for delta-V because I want the musicians to suffer.
-  storage:
-    back:
-    - SuperSynthesizerInstrument #Delta-V - Supersynth spawns in backpack if chosen as trinket.
-  groupBy: "Instruments"
-#Starlight-End
diff --git a/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml b/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml
index 6070e3b9851..3a3857ae4cb 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml
@@ -49,7 +49,6 @@
     <GuideEntityEmbed Entity="SignalControlledValve" Caption=""/>
     <GuideEntityEmbed Entity="PressureControlledValve" Caption=""/>
     <GuideEntityEmbed Entity="GasPassiveGate" Caption=""/>
-    <GuideEntityEmbed Entity="GasPressureRegulator" Caption=""/>
   </Box>
   <Box>
     ## Valves
diff --git a/Resources/ServerInfo/Guidebook/Engineering/PressureRegulator.xml b/Resources/ServerInfo/Guidebook/Engineering/PressureRegulator.xml
deleted file mode 100644
index 2b23ea50396..00000000000
--- a/Resources/ServerInfo/Guidebook/Engineering/PressureRegulator.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Document>
-  # Inlet Pressure Regulator
-  The Inlet Pressure Regulator is a passive device that allows gas to escape from a [textlink="pipenet" link="PipeNetworks"] when the pressure exceeds a certain threshold.
-
-  <Box>
-    <GuideEntityEmbed Entity="GasPressureRegulator"/>
-  </Box>
-
-  ## Operation
-  The valve will automatically [color=green]open[/color] when the pressure in the pipe exceeds the set threshold, allowing gas to escape to the connected output pipe.
-
-  The valve will [color=red]close[/color] again when the pressure drops below the set threshold.
-
-  The flow rate of the valve is limited to [color=orange][protodata="GasPressureRegulator" comp="GasPressureRegulator" member="MaxTransferRate"/] L/s[/color].
-
-  ## Example Uses
-  The valve is commonly used to prevent overpressure situations in gas systems, such as [textlink="TEG" link="TEG"] cooling loops and [textlink="pipes" link="Pipes"], which would cause a failure in the system (clogged [textlink="pumps" link="Pumps"]).
-
-  The valve can also be used to vent off ready-to-use, hot gas from a burn chamber.
-  For example, it may be undesirable to allow a burn chamber to drop below a specific pressure for a long time, as this may cause the gas to cool down too much and thin out, which would cause a flameout.
-
-  An inlet pressure regulator can be used to vent off excess gas, while keeping the pressure in the burn chamber above a certain threshold, which may help in sustaining a fire in the chamber.
-</Document>
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Valves.xml b/Resources/ServerInfo/Guidebook/Engineering/Valves.xml
index 46f5b0f6292..db8c18807cd 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/Valves.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Valves.xml
@@ -6,7 +6,6 @@
     <GuideEntityEmbed Entity="SignalControlledValve"/>
     <GuideEntityEmbed Entity="PressureControlledValve"/>
     <GuideEntityEmbed Entity="GasPassiveGate"/>
-    <GuideEntityEmbed Entity="GasPressureRegulator"/>
   </Box>
   All valves do not require [textlink="power" link="Power"] to operate.
 
diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml
index 837bc9f2c25..724c5844516 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml
@@ -12,13 +12,11 @@
 
   ## Benefits
   - They take [color=#1e90ff]15% less Blunt, Slash, and Piercing damage[/color].
-  - Does more damage in melee; [color=#1e90ff]35% more Blunt and Asphyxiation, 20% more Slash and Piercing[/color].
-  - They are slowed down [color=#1e90ff]25% less[/color] by clothing.
+  - Does more damage in melee; 35% more Blunt and Asphyxiation, 20% more Slash and Piercing.
   - Due to their big size, they can easily carry, shove, and pull any other morphotypes.
   - They are harder to shove.
   - Slightly more stamina than Humans.
-  - Deal [color=#1e90ff]25% more stamina damage[/color], excluding truncheons and similar.
-  - They have an easier time prying open doors, taking 50% less time than other species.
+  - They have an easier time prying open doors, taking around 50% less time than other species.
 
   ## Drawbacks
   - Their accuracy with guns is terrible.
diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml
index 0c3dca4c236..288debbde72 100644
--- a/Resources/ServerInfo/Guidebook/Science/Science.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Science.xml
@@ -4,13 +4,13 @@
 [color=#c96dbf]Epistemics[/color], often called Research and Development, is a job made up of both generating research points to unlock new technologies as well as using said technologies to produce new items at lathes to help out the station.
 
 ## Personnel
-[color=#c96dbf]Epistemics[/color]' staff is made up of Research Assistants, Scientists, the chaplain, the archivist, and the Psionic Mantis. [color=#c96dbf]Epistemics[/color] is run by the Mystagogue.
+[color=#c96dbf]Epistemics[/color]' staff is made up of Research Assistants, Scientists and the Psionic Mantis. [color=#c96dbf]Epistemics[/color] is run by the Mystagogue.
 
   <Box>
    <GuideEntityEmbed Entity="ToyFigurineScientist" Caption="Scientist"/>
    <GuideEntityEmbed Entity="ToyFigurineResearchDirector" Caption="RD"/>
-   <GuideEntityEmbed Entity="ToyFigurineChaplain" Caption="Chaplain"/>
   </Box>
+  
 ## Technologies
   <Box>
     <GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/>
diff --git a/Resources/ServerInfo/Guidebook/Service/Service.xml b/Resources/ServerInfo/Guidebook/Service/Service.xml
index 55e19515182..7fe9b55a77d 100644
--- a/Resources/ServerInfo/Guidebook/Service/Service.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Service.xml
@@ -12,6 +12,7 @@
     <GuideEntityEmbed Entity="ToyFigurineJanitor" Caption="Janitor"/>
   </Box>
   <Box>
+    <GuideEntityEmbed Entity="ToyFigurineChaplain" Caption="Chaplain"/>
     <GuideEntityEmbed Entity="ToyFigurineClown" Caption="Clown"/>
     <GuideEntityEmbed Entity="ToyFigurineMime" Caption="Mime"/>
     <GuideEntityEmbed Entity="ToyFigurineMusician" Caption="Musician"/>
diff --git a/Resources/ServerInfo/Guidebook/_DV/Epistemics/GlimmerCreatures.xml b/Resources/ServerInfo/Guidebook/_DV/Epistemics/GlimmerCreatures.xml
index e8e9fdd7c57..3d2f07a2fe3 100644
--- a/Resources/ServerInfo/Guidebook/_DV/Epistemics/GlimmerCreatures.xml
+++ b/Resources/ServerInfo/Guidebook/_DV/Epistemics/GlimmerCreatures.xml
@@ -75,7 +75,7 @@ Unlike wisps, revenants cannot be attacked in any way by default.
 Once a revenant uses their abilities, they can be attacked by any means for a short time.
 
 ## Procedure
-Holy damage from a bible or anti-psionic knife is especially effective at taking down revenants.
+Holy damage from a bible or anti-psionic knife is especially effective at taking down wisps.
 
 Assistance from the Security department is usually recommended.
 
diff --git a/Resources/Textures/Decals/stencil.rsi/meta.json b/Resources/Textures/Decals/stencil.rsi/meta.json
deleted file mode 100644
index 69cebf29d0f..00000000000
--- a/Resources/Textures/Decals/stencil.rsi/meta.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "made by Alkheemist (GitHub/Discord)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "stencil0"
-        },
-        {
-            "name": "stencil1"
-        },
-        {
-            "name": "stencil2"
-        },
-        {
-            "name": "stencil3"
-        },
-        {
-            "name": "stencil4"
-        },
-        {
-            "name": "stencil5"
-        },
-        {
-            "name": "stencil6"
-        },
-        {
-            "name": "stencil7"
-        },
-        {
-            "name": "stencil8"
-        },
-        {
-            "name": "stencil9"
-        },
-        {
-            "name": "stencilA"
-        },
-        {
-            "name": "stencilB"
-        },
-        {
-            "name": "stencilC"
-        },
-        {
-            "name": "stencilD"
-        },
-        {
-            "name": "stencilE"
-        },
-        {
-            "name": "stencilF"
-        },
-        {
-            "name": "stencilG"
-        },
-        {
-            "name": "stencilH"
-        },
-        {
-            "name": "stencilI"
-        },
-        {
-            "name": "stencilJ"
-        },
-        {
-            "name": "stencilK"
-        },
-        {
-            "name": "stencilL"
-        },
-        {
-            "name": "stencilM"
-        },
-        {
-            "name": "stencilN"
-        },
-        {
-            "name": "stencilO"
-        },
-        {
-            "name": "stencilP"
-        },
-        {
-            "name": "stencilQ"
-        },
-        {
-            "name": "stencilR"
-        },
-        {
-            "name": "stencilS"
-        },
-        {
-            "name": "stencilT"
-        },
-        {
-            "name": "stencilU"
-        },
-        {
-            "name": "stencilV"
-        },
-        {
-            "name": "stencilW"
-        },
-        {
-            "name": "stencilX"
-        },
-        {
-            "name": "stencilY"
-        },
-        {
-            "name": "stencilZ"
-        },
-        {
-            "name": "stencil_Ampersand"
-        },
-        {
-            "name": "stencil_Asterix"
-        },
-        {
-            "name": "stencil_Dash"
-        },
-		{
-            "name": "stencil_Equals"
-        },
-        {
-            "name": "stencil_Exclaim"
-        },
-        {
-            "name": "stencil_Hash"
-        },
-        {
-            "name": "stencil_Speso"
-        },
-        {
-            "name": "stencil_Multiocular"
-        },
-		{
-            "name": "stencil_Plus"
-        },
-		{
-            "name": "stencil_Question"
-        }
-    ]
-}
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil0.png b/Resources/Textures/Decals/stencil.rsi/stencil0.png
deleted file mode 100644
index 5c313927469..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil0.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil1.png b/Resources/Textures/Decals/stencil.rsi/stencil1.png
deleted file mode 100644
index aaf94006b44..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil1.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil2.png b/Resources/Textures/Decals/stencil.rsi/stencil2.png
deleted file mode 100644
index 4c2b20879b4..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil2.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil3.png b/Resources/Textures/Decals/stencil.rsi/stencil3.png
deleted file mode 100644
index 2e32055f76d..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil3.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil4.png b/Resources/Textures/Decals/stencil.rsi/stencil4.png
deleted file mode 100644
index 041dbb45c20..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil4.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil5.png b/Resources/Textures/Decals/stencil.rsi/stencil5.png
deleted file mode 100644
index 0fac5c690bf..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil5.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil6.png b/Resources/Textures/Decals/stencil.rsi/stencil6.png
deleted file mode 100644
index 46ceaf0d565..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil6.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil7.png b/Resources/Textures/Decals/stencil.rsi/stencil7.png
deleted file mode 100644
index 54826779ced..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil7.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil8.png b/Resources/Textures/Decals/stencil.rsi/stencil8.png
deleted file mode 100644
index 7c97b60c89b..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil8.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil9.png b/Resources/Textures/Decals/stencil.rsi/stencil9.png
deleted file mode 100644
index d0c4a680d2a..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil9.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilA.png b/Resources/Textures/Decals/stencil.rsi/stencilA.png
deleted file mode 100644
index c3a92548260..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilA.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilB.png b/Resources/Textures/Decals/stencil.rsi/stencilB.png
deleted file mode 100644
index fc62e40c950..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilB.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilC.png b/Resources/Textures/Decals/stencil.rsi/stencilC.png
deleted file mode 100644
index e79cf206cc8..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilC.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilD.png b/Resources/Textures/Decals/stencil.rsi/stencilD.png
deleted file mode 100644
index 649f4043a55..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilD.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilE.png b/Resources/Textures/Decals/stencil.rsi/stencilE.png
deleted file mode 100644
index a387756bbc9..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilE.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilF.png b/Resources/Textures/Decals/stencil.rsi/stencilF.png
deleted file mode 100644
index e50436bd474..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilF.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilG.png b/Resources/Textures/Decals/stencil.rsi/stencilG.png
deleted file mode 100644
index 3e1fd2acabd..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilG.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilH.png b/Resources/Textures/Decals/stencil.rsi/stencilH.png
deleted file mode 100644
index 26e8f89348c..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilH.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilI.png b/Resources/Textures/Decals/stencil.rsi/stencilI.png
deleted file mode 100644
index 3c8bc08bc73..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilI.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilJ.png b/Resources/Textures/Decals/stencil.rsi/stencilJ.png
deleted file mode 100644
index 360ffb4fab2..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilJ.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilK.png b/Resources/Textures/Decals/stencil.rsi/stencilK.png
deleted file mode 100644
index 7c5dcd10a3c..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilK.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilL.png b/Resources/Textures/Decals/stencil.rsi/stencilL.png
deleted file mode 100644
index cc578c18b5c..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilL.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilM.png b/Resources/Textures/Decals/stencil.rsi/stencilM.png
deleted file mode 100644
index f69505f58be..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilM.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilN.png b/Resources/Textures/Decals/stencil.rsi/stencilN.png
deleted file mode 100644
index 0052eeba7cd..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilN.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilO.png b/Resources/Textures/Decals/stencil.rsi/stencilO.png
deleted file mode 100644
index d8b11a7d9c3..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilO.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilP.png b/Resources/Textures/Decals/stencil.rsi/stencilP.png
deleted file mode 100644
index dd7ef904272..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilP.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilQ.png b/Resources/Textures/Decals/stencil.rsi/stencilQ.png
deleted file mode 100644
index b4af8484176..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilQ.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilR.png b/Resources/Textures/Decals/stencil.rsi/stencilR.png
deleted file mode 100644
index bb4f0a2d040..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilR.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilS.png b/Resources/Textures/Decals/stencil.rsi/stencilS.png
deleted file mode 100644
index 4a1a69e1b02..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilS.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilT.png b/Resources/Textures/Decals/stencil.rsi/stencilT.png
deleted file mode 100644
index f895a92edda..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilT.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilU.png b/Resources/Textures/Decals/stencil.rsi/stencilU.png
deleted file mode 100644
index 2e09e218b96..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilU.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilV.png b/Resources/Textures/Decals/stencil.rsi/stencilV.png
deleted file mode 100644
index 572e40bf95b..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilV.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilW.png b/Resources/Textures/Decals/stencil.rsi/stencilW.png
deleted file mode 100644
index 29cb98300e1..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilW.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilX.png b/Resources/Textures/Decals/stencil.rsi/stencilX.png
deleted file mode 100644
index d76ab6de061..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilX.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilY.png b/Resources/Textures/Decals/stencil.rsi/stencilY.png
deleted file mode 100644
index 9f5f0ed52f8..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilY.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencilZ.png b/Resources/Textures/Decals/stencil.rsi/stencilZ.png
deleted file mode 100644
index 7c40d838a30..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencilZ.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Ampersand.png b/Resources/Textures/Decals/stencil.rsi/stencil_Ampersand.png
deleted file mode 100644
index ac7583bf5f8..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Ampersand.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Asterix.png b/Resources/Textures/Decals/stencil.rsi/stencil_Asterix.png
deleted file mode 100644
index 37ca93425fa..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Asterix.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Dash.png b/Resources/Textures/Decals/stencil.rsi/stencil_Dash.png
deleted file mode 100644
index c77f630a77c..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Dash.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Equals.png b/Resources/Textures/Decals/stencil.rsi/stencil_Equals.png
deleted file mode 100644
index caefdf09947..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Equals.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Exclaim.png b/Resources/Textures/Decals/stencil.rsi/stencil_Exclaim.png
deleted file mode 100644
index 9b7024bc539..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Exclaim.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Hash.png b/Resources/Textures/Decals/stencil.rsi/stencil_Hash.png
deleted file mode 100644
index 1e22e4b779e..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Hash.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Multiocular.png b/Resources/Textures/Decals/stencil.rsi/stencil_Multiocular.png
deleted file mode 100644
index 284401a1880..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Multiocular.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Plus.png b/Resources/Textures/Decals/stencil.rsi/stencil_Plus.png
deleted file mode 100644
index e50358d2840..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Plus.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Question.png b/Resources/Textures/Decals/stencil.rsi/stencil_Question.png
deleted file mode 100644
index 63fd0ad8f2f..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Question.png and /dev/null differ
diff --git a/Resources/Textures/Decals/stencil.rsi/stencil_Speso.png b/Resources/Textures/Decals/stencil.rsi/stencil_Speso.png
deleted file mode 100644
index a6c97f78596..00000000000
Binary files a/Resources/Textures/Decals/stencil.rsi/stencil_Speso.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 6be47457a8e..8dd3bacec6c 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github)| Cluwne icon by Professor Renderer (Discord)| Librarian re-recoloured by AeraAulin (github)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord)",
     "size": {
         "x": 8,
         "y": 8
diff --git a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/equipped-NECK.png
deleted file mode 100644
index 9f2631cc4cc..00000000000
Binary files a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json
index dc90d533f33..2c3dac1d21f 100644
--- a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json
@@ -28,10 +28,6 @@
     {
       "name": "super-inhand-right",
       "directions": 4
-    },
-    {
-      "name": "equipped-NECK",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png
index d73dfea4606..3e638f8bab0 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index 26825483ee4..0a5a37d8025 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github). | idcurator recoloured by AeraAulin (github).",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github).",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
index 4dceb4af72e..632c7bcf5be 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
@@ -1,165 +1,62 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. pvalve taken from https://github.com/tgstation/tgstation/commit/584068b59e271c0108557902e8516c70d6ae56f2 and modified by ArtisticRoomba (GitHub)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "pumpDigitalValve",
-            "directions": 4
-        },
-        {
-            "name": "pumpManualValve",
-            "directions": 4
-        },
-        {
-            "name": "pumpManualValveOn",
-            "directions": 4
-        },
-        {
-            "name": "pumpSignalValve",
-            "directions": 4
-        },
-        {
-            "name": "pumpSignalValveOn",
-            "directions": 4
-        },
-        {
-            "name": "pumpPassiveGate",
-            "directions": 4
-        },
-        {
-            "name": "pumpPassiveGateOn",
-            "directions": 4
-        },
-        {
-            "name": "pumpPressure",
-            "directions": 4
-        },
-        {
-            "name": "pumpPressureOn",
-            "directions": 4,
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "pumpVolume",
-            "directions": 4
-        },
-        {
-            "name": "pumpVolumeOn",
-            "directions": 4,
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "pumpVolumeBlocked",
-            "directions": 4,
-            "delays": [
-                [
-                    1,
-                    1
-                ],
-                [
-                    1,
-                    1
-                ],
-                [
-                    1,
-                    1
-                ],
-                [
-                    1,
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "pumpPressureRegulator",
-            "directions": 4
-        },
-        {
-            "name": "pumpPressureRegulatorOn",
-            "directions": 4
-        }
-    ]
+   "version":1,
+   "size":{
+      "x":32,
+      "y":32
+   },
+   "license":"CC-BY-SA-3.0",
+   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378",
+   "states":[
+      {
+         "name":"pumpDigitalValve",
+         "directions":4
+      },
+      {
+         "name":"pumpManualValve",
+         "directions":4
+      },
+      {
+         "name":"pumpManualValveOn",
+         "directions":4
+      },
+      {
+         "name":"pumpSignalValve",
+         "directions":4
+      },
+      {
+         "name":"pumpSignalValveOn",
+         "directions":4
+      },
+      {
+         "name":"pumpPassiveGate",
+         "directions":4
+      },
+      {
+         "name":"pumpPassiveGateOn",
+         "directions":4
+      },
+      {
+         "name":"pumpPressure",
+         "directions":4
+      },
+      {
+         "name":"pumpPressureOn",
+         "directions":4,
+         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+      },
+      {
+         "name":"pumpVolume",
+         "directions":4
+      },
+      {
+         "name":"pumpVolumeOn",
+         "directions":4,
+         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+      },
+      {
+         "name":"pumpVolumeBlocked",
+         "directions":4,
+         "delays":[ [ 1.0, 1.0 ], [ 1.0, 1.0 ], [ 1.0, 1.0 ], [ 1.0, 1.0 ] ]
+      }
+   ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png
index eb35e1a42ea..8903bc85649 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png and b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png
deleted file mode 100644
index cb7322d040a..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png
deleted file mode 100644
index 8a8f85cec72..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
index d7a2ccb3b61..ef758967953 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba.",
     "size": {
         "x": 32,
         "y": 32
     },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy.",
     "states": [
         {
             "name": "pumpDigitalValve",
@@ -136,30 +136,22 @@
             "directions": 4,
             "delays": [
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ],
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ],
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ],
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ]
             ]
-        },
-        {
-            "name": "pumpPressureRegulator",
-            "directions": 4
-        },
-        {
-            "name": "pumpPressureRegulatorOn",
-            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png
index 94e5322cfca..3a634fc9294 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png
deleted file mode 100644
index ee53abca292..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png
deleted file mode 100644
index 8523dbcba38..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
index d7a2ccb3b61..ef758967953 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba.",
     "size": {
         "x": 32,
         "y": 32
     },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy.",
     "states": [
         {
             "name": "pumpDigitalValve",
@@ -136,30 +136,22 @@
             "directions": 4,
             "delays": [
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ],
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ],
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ],
                 [
-                    1,
-                    1
+                    1.0,
+                    1.0
                 ]
             ]
-        },
-        {
-            "name": "pumpPressureRegulator",
-            "directions": 4
-        },
-        {
-            "name": "pumpPressureRegulatorOn",
-            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png
index a5961b09961..cb5286e46c2 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png
deleted file mode 100644
index dcca92daaa1..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png
deleted file mode 100644
index 3f5eabda343..00000000000
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/equipped-HELMET.png b/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/equipped-HELMET.png
deleted file mode 100644
index 5b4061c37fc..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/icon.png b/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/icon.png
deleted file mode 100644
index ad8c61f5419..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/inhand-left.png
deleted file mode 100644
index 18ff3204bbd..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/inhand-right.png
deleted file mode 100644
index 29750d28c6e..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/meta.json b/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/meta.json
deleted file mode 100644
index a8b7e6fbbbf..00000000000
--- a/Resources/Textures/_DV/Clothing/Head/Hoods/harbingerhood.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "version": 1,
-    "license": "CC0-1.0",
-    "copyright": "harbingerhelmet.rsi sprites by AeraAulin(github)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index ea27189ae97..00000000000
Binary files a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/icon.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/icon.png
deleted file mode 100644
index b49cc4bef21..00000000000
Binary files a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/inhand-left.png
deleted file mode 100644
index f7131459840..00000000000
Binary files a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/inhand-right.png
deleted file mode 100644
index f873436eb5c..00000000000
Binary files a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/meta.json b/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/meta.json
deleted file mode 100644
index e1a0f23136c..00000000000
--- a/Resources/Textures/_DV/Clothing/OuterClothing/Coats/harbingercoat.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "version": 1,
-    "license": "CC0-1.0",
-    "copyright": "harbingercoat.rsi sprites by AeraAulin(github)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-OUTERCLOTHING",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index cd4f4fdef62..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/icon.png
deleted file mode 100644
index fdf0eb64e03..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/inhand-left.png
deleted file mode 100644
index 2c056a47351..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/inhand-right.png
deleted file mode 100644
index d034a15188d..00000000000
Binary files a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/meta.json
deleted file mode 100644
index 08691f5e968..00000000000
--- a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/harbingertunic.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "version": 1,
-    "license": "CC0-1.0",
-    "copyright": "harbingertunic.rsi sprites by AeraAulin(github)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-INNERCLOTHING",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/cooldown.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/cooldown.png
deleted file mode 100644
index d7f4d9190be..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/cooldown.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/despawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/despawning.png
deleted file mode 100644
index 98a43bd46ee..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/despawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/meta.json b/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/meta.json
deleted file mode 100644
index e38e667e32b..00000000000
--- a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/meta.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Default sprite (ready) by AftrLite (Github). Other states (spawning, despawning, cooldown) modified from the original by NoElkaTheGod (GitHub).",
-    "size": {
-        "x": 96,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "ready"
-        },
-        {
-            "name": "cooldown",
-            "delays": [
-                [
-                    1.9,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "spawning",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "despawning",
-            "delays": [
-                [
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    60
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/spawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/spawning.png
deleted file mode 100644
index 41bd6be45de..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/spawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/cooldown.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/cooldown.png
deleted file mode 100644
index ed40542f205..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/cooldown.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/despawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/despawning.png
deleted file mode 100644
index d93acf8aff6..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/despawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/meta.json b/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/meta.json
deleted file mode 100644
index e38e667e32b..00000000000
--- a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/meta.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Default sprite (ready) by AftrLite (Github). Other states (spawning, despawning, cooldown) modified from the original by NoElkaTheGod (GitHub).",
-    "size": {
-        "x": 96,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "ready"
-        },
-        {
-            "name": "cooldown",
-            "delays": [
-                [
-                    1.9,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "spawning",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "despawning",
-            "delays": [
-                [
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    60
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/spawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/spawning.png
deleted file mode 100644
index 8f0a1b1da32..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/spawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/active.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/active.png
deleted file mode 100644
index d7d6a829767..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/active.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/cooldown.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/cooldown.png
deleted file mode 100644
index 0ddd4b9457f..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/cooldown.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/despawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/despawning.png
deleted file mode 100644
index 5e0e9f2de07..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/despawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/meta.json b/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/meta.json
deleted file mode 100644
index 59356059992..00000000000
--- a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/meta.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Default sprite (ready) by AftrLite (Github). Other states (spawning, despawning, cooldown, active) modified from the original by NoElkaTheGod (GitHub).",
-    "size": {
-        "x": 96,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "ready"
-        },
-        {
-            "name": "cooldown",
-            "delays": [
-                [
-                    1.9,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "active",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "spawning",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "despawning",
-            "delays": [
-                [
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    60
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/spawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/spawning.png
deleted file mode 100644
index 6503ceccaae..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/spawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/despawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/despawning.png
deleted file mode 100644
index c173b96d9d5..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/despawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/meta.json b/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/meta.json
deleted file mode 100644
index 8ea8ec9c125..00000000000
--- a/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/meta.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Default sprite (ready) by AftrLite (Github). Other states (spawning, despawning) modified from the original by NoElkaTheGod (GitHub).",
-    "size": {
-        "x": 96,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "ready"
-        },
-        {
-            "name": "spawning",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "despawning",
-            "delays": [
-                [
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    60
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/spawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/spawning.png
deleted file mode 100644
index 4e8424339aa..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/spawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/active.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/active.png
deleted file mode 100644
index fcfb394cdc8..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/active.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/cooldown.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/cooldown.png
deleted file mode 100644
index cddc4a98534..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/cooldown.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/despawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/despawning.png
deleted file mode 100644
index c8e3545a18e..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/despawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/meta.json b/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/meta.json
deleted file mode 100644
index 59356059992..00000000000
--- a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/meta.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Default sprite (ready) by AftrLite (Github). Other states (spawning, despawning, cooldown, active) modified from the original by NoElkaTheGod (GitHub).",
-    "size": {
-        "x": 96,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "ready"
-        },
-        {
-            "name": "cooldown",
-            "delays": [
-                [
-                    1.9,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "active",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "spawning",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "despawning",
-            "delays": [
-                [
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    60
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/spawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/spawning.png
deleted file mode 100644
index f255aed5942..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/spawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/cooldown.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/cooldown.png
deleted file mode 100644
index 5795c03462d..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/cooldown.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/despawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/despawning.png
deleted file mode 100644
index 7ae5b7868eb..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/despawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/meta.json b/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/meta.json
deleted file mode 100644
index e38e667e32b..00000000000
--- a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/meta.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Default sprite (ready) by AftrLite (Github). Other states (spawning, despawning, cooldown) modified from the original by NoElkaTheGod (GitHub).",
-    "size": {
-        "x": 96,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "ready"
-        },
-        {
-            "name": "cooldown",
-            "delays": [
-                [
-                    1.9,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "spawning",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    60
-                ]
-            ]
-        },
-        {
-            "name": "despawning",
-            "delays": [
-                [
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    0.05,
-                    60
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/spawning.png b/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/spawning.png
deleted file mode 100644
index 799e7bbaa02..00000000000
Binary files a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/spawning.png and /dev/null differ
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/ready.png b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/blades.png
similarity index 100%
rename from Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi/ready.png
rename to Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/blades.png
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/ready.png b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/cessation.png
similarity index 100%
rename from Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi/ready.png
rename to Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/cessation.png
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/ready.png b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/knowledge.png
similarity index 100%
rename from Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi/ready.png
rename to Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/knowledge.png
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/meta.json b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/meta.json
new file mode 100644
index 00000000000..759023c3637
--- /dev/null
+++ b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "A custom item by AftrLite (Github).",
+    "size": {
+        "x": 96,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cessation"
+        },
+        {
+            "name": "blades"
+        },
+        {
+            "name": "warding"
+        },
+        {
+            "name": "knowledge"
+        },
+        {
+            "name": "truth"
+        },
+        {
+            "name": "projection"
+        }
+    ]
+}
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/ready.png b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/projection.png
similarity index 100%
rename from Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi/ready.png
rename to Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/projection.png
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/ready.png b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/truth.png
similarity index 100%
rename from Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi/ready.png
rename to Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/truth.png
diff --git a/Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/ready.png b/Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/warding.png
similarity index 100%
rename from Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi/ready.png
rename to Resources/Textures/_DV/CosmicCult/Objects/glyphs_floor.rsi/warding.png
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/inhand-left.png
deleted file mode 100644
index d3648228491..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/inhand-right.png
deleted file mode 100644
index 8f268d6a75f..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/meta.json
deleted file mode 100644
index 88a7d9c9d16..00000000000
--- a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/meta.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pinpointer-anomalite by AeraAulin(Github)",
-    "states": [
-        {
-            "name": "pinonalert",
-            "directions": 8,
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonalertdirect",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonalertnull",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonclose",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinondirect",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinondirectlarge",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinondirectsmall",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinondirectxtrlarge",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonfar",
-            "delays": [
-                [
-                    0.6,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonmedium",
-            "delays": [
-                [
-                    0.4,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonnull",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinpointer-anomalite"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalert.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalert.png
deleted file mode 100644
index 39e73ee2664..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalert.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalertdirect.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalertdirect.png
deleted file mode 100644
index 6e53ef3a3b2..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalertdirect.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalertnull.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalertnull.png
deleted file mode 100644
index 1556d82c76d..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonalertnull.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonclose.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonclose.png
deleted file mode 100644
index d652e4cd02a..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonclose.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirect.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirect.png
deleted file mode 100644
index c2ac6e44e27..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirect.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectlarge.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectlarge.png
deleted file mode 100644
index c8b1fa48752..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectlarge.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectsmall.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectsmall.png
deleted file mode 100644
index ab7940efd99..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectsmall.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png
deleted file mode 100644
index 5db693402ca..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonfar.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonfar.png
deleted file mode 100644
index fd0fbf51ac6..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonfar.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonmedium.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonmedium.png
deleted file mode 100644
index 5f8e89aec24..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonmedium.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonnull.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonnull.png
deleted file mode 100644
index a309d053e59..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinonnull.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinpointer-anomalite.png b/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinpointer-anomalite.png
deleted file mode 100644
index 01415647c1a..00000000000
Binary files a/Resources/Textures/_DV/Objects/Devices/pinpointer.rsi/pinpointer-anomalite.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon1.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon1.png
deleted file mode 100644
index 553143754db..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon1.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon2.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon2.png
deleted file mode 100644
index ce3a4fae089..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon2.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon3.png
deleted file mode 100644
index fbaea3e6f67..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon3.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged1.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged1.png
deleted file mode 100644
index 4ab1c176100..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged1.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged2.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged2.png
deleted file mode 100644
index 0c3d02ea429..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged2.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged3.png
deleted file mode 100644
index ae6329eb2c9..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged3.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare1.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare1.png
deleted file mode 100644
index adcc051ed50..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare1.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare2.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare2.png
deleted file mode 100644
index f694ec57b0c..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare2.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare3.png
deleted file mode 100644
index 947b87102c2..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare3.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon1.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon1.png
deleted file mode 100644
index de990443cf8..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon1.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon2.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon2.png
deleted file mode 100644
index 6b432b25265..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon2.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon3.png
deleted file mode 100644
index 422806a4b93..00000000000
Binary files a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon3.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json
index b8df8f66dde..cdc6c23e03c 100644
--- a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/blob/39ed5e01bcffa0c2271348e21a1b757a2e5040b9/icons/obj/service/library.dmi, modified by AeraAulin (github)",
+    "copyright": "icon_kiss by Kr8",
     "size": {
         "x": 32,
         "y": 32
@@ -9,42 +9,6 @@
     "states": [
         {
             "name": "icon_kiss"
-        },
-        {
-            "name": "ancientbookdamaged1"
-        },
-        {
-            "name": "ancientbookdamaged2"
-        },
-        {
-            "name": "ancientbookdamaged3"
-        },
-        {
-            "name": "ancientbookcommon1"
-        },
-        {
-            "name": "ancientbookcommon2"
-        },
-        {
-            "name": "ancientbookcommon3"
-        },
-        {
-            "name": "ancientbookuncommon1"
-        },
-        {
-            "name": "ancientbookuncommon2"
-        },
-        {
-            "name": "ancientbookuncommon3"
-        },
-        {
-            "name": "ancientbookrare1"
-        },
-        {
-            "name": "ancientbookrare2"
-        },
-        {
-            "name": "ancientbookrare3"
         }
     ]
 }
diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/equipped-BELT.png
deleted file mode 100644
index 0a90c1c9e00..00000000000
Binary files a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/icon.png b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/icon.png
deleted file mode 100644
index 3f7ed3c975b..00000000000
Binary files a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-left.png
deleted file mode 100644
index a7dd4b8878c..00000000000
Binary files a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-right.png
deleted file mode 100644
index fd56d631f0d..00000000000
Binary files a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json
deleted file mode 100644
index 312825683d0..00000000000
--- a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Sprites by AeraAulin (github)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "equipped-BELT",
-            "directions": 4
-        },
-        {
-            "name": "storage"
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/storage.png b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/storage.png
deleted file mode 100644
index 3f7ed3c975b..00000000000
Binary files a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/storage.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/icon.png
deleted file mode 100644
index 61a8a3bff7e..00000000000
Binary files a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/inhand-left.png
deleted file mode 100644
index 60075833e26..00000000000
Binary files a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/inhand-right.png
deleted file mode 100644
index 0910ba72f7b..00000000000
Binary files a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/meta.json
deleted file mode 100644
index 4f268d6925e..00000000000
--- a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by AeraAulin(github)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "wielded-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "wielded-inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/wielded-inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/wielded-inhand-left.png
deleted file mode 100644
index 760c640777e..00000000000
Binary files a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/wielded-inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/wielded-inhand-right.png
deleted file mode 100644
index 2ae40b73a00..00000000000
Binary files a/Resources/Textures/_DV/Objects/Weapons/Melee/evilscythe.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Shaders/highglimmer.swsl b/Resources/Textures/_DV/Shaders/highglimmer.swsl
deleted file mode 100644
index 2ae52f2fd0c..00000000000
--- a/Resources/Textures/_DV/Shaders/highglimmer.swsl
+++ /dev/null
@@ -1,49 +0,0 @@
-// Shader by Xor, taken and modified from https://www.shadertoy.com/view/3fKSzc.
-// Licensed under CC BY-NC-SA 3.0: https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en
-
-const highp float TimeScale = 0.2;
-
-uniform highp float size;
-
-void fragment() {
-    highp vec2 iResolution = vec2(1.0);
-    highp vec2 I = UV * iResolution;
-
-	//Raymarch depth
-    highp float z = 0.0;
-	//Step distance
-    highp float d = 0.0;
-	//Raymarch iterator
-    highp float i = 0.0;
-	//Animation time
-    highp float t = TIME * TimeScale;
-
-    highp vec4 O = vec4(0.0);
-
-	//Clear fragColor and raymarch (some amount of) steps
-    while (i++ < 25.0) {
-        // sample point (from ray direction)
-        highp vec3 p = z * normalize(vec3(I + I, 0.0) - iResolution.xyx) + 0.1;
-
-        // polar coordinates
-        p = vec3(atan(p.y, p.x) * 2.0, p.z / (3.0*(3.0-size)), length(p.xy) - 4.5 - z * (0.5 * 2.8-size));
-
-        // apply turbulence
-        d = 0.0;
-        highp float j = 0.0;
-        while (++j < 9.0)
-            p += sin(p.yzx * j - t + 0.2 * i) / j;
-
-        // distance to cylinder and waves
-        d = 0.2 * length(vec4(p.z, 0.1 * cos(p * 3.0) - 0.1));
-        z += d;
-
-        // coloring and brightness
-        O += (1.0 + cos(i * 0.7 + vec4(6.0, 1.0, 2.0, 0.0))) / d / i;
-    }
-
-    // tanh tonemap
-    O = tanh(O * O / 900.0);
-
-    COLOR = O;
-}
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/bounty.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/bounty.png
deleted file mode 100644
index d72d30b9537..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/bounty.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/captains_paper.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/captains_paper.png
deleted file mode 100644
index 9c767a263f1..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/captains_paper.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case.png
deleted file mode 100644
index 7ee9bed1a62..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_glass.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_glass.png
deleted file mode 100644
index 9a975e8eec1..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_glass.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_icon.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_icon.png
deleted file mode 100644
index 5b83c8b0eb5..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_icon.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_open.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_open.png
deleted file mode 100644
index 4fe5b46898a..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_open.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/invoice.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/invoice.png
deleted file mode 100644
index 944c2326d67..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/invoice.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/locked.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/locked.png
deleted file mode 100644
index d7d051708a7..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/locked.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json
deleted file mode 100644
index 3175a53d2bc..00000000000
--- a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from mojave sun mirror of tgstation https://github.com/Mojave-Sun/mojave-sun-13/blob/d97a2e2dd99a727f33924682e25927c0ea2e9b09/icons/obj/stationobjs.dmi Sprite modified by AeraAulin (Github),",
-    "states": [
-        {
-            "name": "display_case"
-        },
-        {
-            "name": "display_case_glass"
-        },
-        {
-            "name": "display_case_open"
-        },
-        {
-            "name": "display_case_icon"
-        },
-        {
-            "name": "locked"
-        },
-        {
-            "name": "unlocked"
-        },
-        {
-            "name": "welded"
-        },
-        {
-            "name": "paper"
-        },
-        {
-            "name": "bounty"
-        },
-        {
-            "name": "captains_paper"
-        },
-        {
-            "name": "invoice"
-        }
-    ]
-}
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/paper.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/paper.png
deleted file mode 100644
index 9d2da8bf6d9..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/paper.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/unlocked.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/unlocked.png
deleted file mode 100644
index d3d98670348..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/unlocked.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/welded.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/welded.png
deleted file mode 100644
index b7a617ce6de..00000000000
Binary files a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/welded.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon-flash.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon-flash.png
deleted file mode 100644
index 902c847556b..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon-flash.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon.png
deleted file mode 100644
index 7e08dc20a8c..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/meta.json
deleted file mode 100644
index c7fa1cabe64..00000000000
--- a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites made by InfinityPandaRed for Goobstation",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/off-equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/off-equipped-HELMET.png
deleted file mode 100644
index 53c9cabfcf4..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/off-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/on-equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/on-equipped-HELMET.png
deleted file mode 100644
index d1d62fa7ffb..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/on-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 311aab9ba82..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/icon.png
deleted file mode 100644
index 474bca0f87d..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-left.png
deleted file mode 100644
index 2eadf95d78c..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-right.png
deleted file mode 100644
index b3d23c6752c..00000000000
Binary files a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/meta.json
deleted file mode 100644
index fdd5058584c..00000000000
--- a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "made by InfinityPandaRed for goob station",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/equipped-SUITSTORAGE.png
deleted file mode 100644
index f83175c3625..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/icon.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/icon.png
deleted file mode 100644
index a3d5f13be2f..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/inhand-left.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/inhand-left.png
deleted file mode 100644
index 0eaa616fe63..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/inhand-right.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/inhand-right.png
deleted file mode 100644
index 14a8b2560a3..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/meta.json b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/meta.json
deleted file mode 100644
index 6d27ae4813c..00000000000
--- a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/buckler.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, suit storage sprite by DieselMohawk",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/equipped-SUITSTORAGE.png
deleted file mode 100644
index 53d05b198fa..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/icon.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/icon.png
deleted file mode 100644
index 3c5cdb61dcc..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/inhand-left.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/inhand-left.png
deleted file mode 100644
index dfc21c1e58d..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/inhand-right.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/inhand-right.png
deleted file mode 100644
index 22d3727dd3a..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/meta.json b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/meta.json
deleted file mode 100644
index 6d27ae4813c..00000000000
--- a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/makeshift-shield.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, suit storage sprite by DieselMohawk",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/equipped-SUITSTORAGE.png
deleted file mode 100644
index 5aa4063baef..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/icon.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/icon.png
deleted file mode 100644
index 3efef44a6f5..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/inhand-left.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/inhand-left.png
deleted file mode 100644
index 2dfe40f0522..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/inhand-right.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/inhand-right.png
deleted file mode 100644
index 468f4ea0894..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/meta.json b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/meta.json
deleted file mode 100644
index 6d27ae4813c..00000000000
--- a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-bullet-shield.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, suit storage sprite by DieselMohawk",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/equipped-SUITSTORAGE.png
deleted file mode 100644
index f7b01c492f3..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/icon.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/icon.png
deleted file mode 100644
index dd00a61e411..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/inhand-left.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/inhand-left.png
deleted file mode 100644
index d0cad8761c3..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/inhand-right.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/inhand-right.png
deleted file mode 100644
index f29fe962d9e..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/meta.json b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/meta.json
deleted file mode 100644
index 6d27ae4813c..00000000000
--- a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-laser-shield.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, suit storage sprite by DieselMohawk",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/equipped-SUITSTORAGE.png
deleted file mode 100644
index 6764fd2af1e..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/icon.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/icon.png
deleted file mode 100644
index 29b2087910c..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/inhand-left.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/inhand-left.png
deleted file mode 100644
index f4d5743d0d5..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/inhand-right.png b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/inhand-right.png
deleted file mode 100644
index 2765e99f209..00000000000
Binary files a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/meta.json b/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/meta.json
deleted file mode 100644
index 6d27ae4813c..00000000000
--- a/Resources/Textures/_Harmony/Objects/Weapons/Melee/Shields/riot-shield.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, suit storage sprite by DieselMohawk",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalybluespace.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalybluespace.png
deleted file mode 100644
index 7c3f8dac62d..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalybluespace.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyelectric.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyelectric.png
deleted file mode 100644
index 530bb211449..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyelectric.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyfire.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyfire.png
deleted file mode 100644
index 4b6be1ac9e3..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyfire.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyflesh.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyflesh.png
deleted file mode 100644
index c35520eb1c7..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyflesh.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyflower.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyflower.png
deleted file mode 100644
index d3c9d23e2fa..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyflower.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalygravity.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalygravity.png
deleted file mode 100644
index 52529bcd2b2..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalygravity.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyice.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyice.png
deleted file mode 100644
index 9b3fb6052c4..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyice.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyreagent.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyreagent.png
deleted file mode 100644
index 3b37969da05..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyreagent.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyrock.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyrock.png
deleted file mode 100644
index 3694bc89ab8..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyrock.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyshadow.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyshadow.png
deleted file mode 100644
index 3eb26da5c13..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalyshadow.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalytech.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalytech.png
deleted file mode 100644
index 6f3e9a8bb6e..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/anomalytech.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/blank.png b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/blank.png
deleted file mode 100644
index 414ce7e3f61..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/blank.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/meta.json
deleted file mode 100644
index 342f1a1b3e8..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/anomalite.rsi/meta.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anomalybluespace",
-        "directions": 4
-      },
-      {
-        "name": "anomalyelectric",
-        "directions": 4
-      },
-      {
-        "name": "anomalyfire",
-        "directions": 4
-      },
-      {
-        "name": "anomalyflesh",
-        "directions": 4
-      },
-      {
-        "name": "anomalyflower",
-        "directions": 4
-      },
-      {
-        "name": "anomalygravity",
-        "directions": 4
-      },
-      {
-        "name": "anomalyice",
-        "directions": 4
-      },
-      {
-        "name": "anomalyreagent",
-        "directions": 4
-      },
-      {
-        "name": "anomalyrock",
-        "directions": 4
-      },
-      {
-        "name": "anomalyshadow",
-        "directions": 4
-      },
-      {
-        "name": "anomalytech",
-        "directions": 4
-      },
-      {
-        "name": "blank",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/anom.png
deleted file mode 100644
index 7c3f8dac62d..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/dead.png
deleted file mode 100644
index e4ff8eeeaee..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/pulse.png
deleted file mode 100644
index 7c3f8dac62d..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/bluespace.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/anom.png
deleted file mode 100644
index 530bb211449..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/dead.png
deleted file mode 100644
index 84a3becf70d..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/pulse.png
deleted file mode 100644
index 530bb211449..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/electric.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/anom.png
deleted file mode 100644
index 4b6be1ac9e3..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/dead.png
deleted file mode 100644
index 61bf38134f1..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/pulse.png
deleted file mode 100644
index 4b6be1ac9e3..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/fire.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/anom.png
deleted file mode 100644
index c35520eb1c7..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/dead.png
deleted file mode 100644
index d88f4516e53..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/pulse.png
deleted file mode 100644
index c35520eb1c7..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/flesh.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/anom.png
deleted file mode 100644
index d3c9d23e2fa..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/dead.png
deleted file mode 100644
index dd34573ca5b..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/pulse.png
deleted file mode 100644
index d3c9d23e2fa..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/flower.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/anom.png
deleted file mode 100644
index 52529bcd2b2..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/dead.png
deleted file mode 100644
index 77cb270fa3a..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/pulse.png
deleted file mode 100644
index 52529bcd2b2..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/grav.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/anom.png
deleted file mode 100644
index 9b3fb6052c4..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/dead.png
deleted file mode 100644
index 22e05c2df95..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/pulse.png
deleted file mode 100644
index 9b3fb6052c4..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/ice.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/anom.png
deleted file mode 100644
index 3b37969da05..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/dead.png
deleted file mode 100644
index 1e531ffba72..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/pulse.png
deleted file mode 100644
index 3b37969da05..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/reagent.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/anom.png
deleted file mode 100644
index 3694bc89ab8..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/dead.png
deleted file mode 100644
index d68e1aa613d..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/pulse.png
deleted file mode 100644
index 3694bc89ab8..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/rock.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/anom.png
deleted file mode 100644
index 3eb26da5c13..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/dead.png
deleted file mode 100644
index 0dd63aeb9d3..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/pulse.png
deleted file mode 100644
index 3eb26da5c13..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/shadow.rsi/pulse.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/anom.png b/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/anom.png
deleted file mode 100644
index 6f3e9a8bb6e..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/anom.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/dead.png b/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/dead.png
deleted file mode 100644
index 31826c4d023..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/dead.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/meta.json
deleted file mode 100644
index ac9c7ae5230..00000000000
--- a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by FaelinDraws",
-    "states": [
-      {
-        "name": "anom",
-        "directions": 4
-      },
-      {
-        "name": "pulse",
-        "directions": 4
-      },
-      {
-        "name": "dead",
-        "directions": 4
-      }
-    ]
-  }
diff --git a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/pulse.png b/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/pulse.png
deleted file mode 100644
index 6f3e9a8bb6e..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Anomalites/tech.rsi/pulse.png and /dev/null differ