diff --git a/Content.Client/ADT/Lobby/UI/QuirksWindow.xaml.cs b/Content.Client/ADT/Lobby/UI/QuirksWindow.xaml.cs
index 36946c40c4c..15ff6c0d4e3 100644
--- a/Content.Client/ADT/Lobby/UI/QuirksWindow.xaml.cs
+++ b/Content.Client/ADT/Lobby/UI/QuirksWindow.xaml.cs
@@ -41,7 +41,12 @@ public void Populate(HumanoidCharacterProfile profile)
         else
             SelectedQuirksLabel.SetMessage(Loc.GetString("quirks-window-selected-none"), null, Color.White);
 
-        var protoList = _proto.EnumeratePrototypes<TraitPrototype>().Where(x => x.Quirk && !x.SpeciesBlacklist.Contains(profile.Species)).ToList();
+        var protoList = _proto.EnumeratePrototypes<TraitPrototype>()
+            .Where(x => x.Quirk
+                        && (x.SpeciesWhitelist.Count == 0 || x.SpeciesWhitelist.Contains(profile.Species))
+                        && !x.SpeciesBlacklist.Contains(profile.Species))
+            .ToList();
+
         protoList.Sort((x, y) => Loc.GetString(x.Name)[0].CompareTo(Loc.GetString(y.Name)[0]));
         protoList.Sort((x, y) => x.Cost.CompareTo(y.Cost));
 
diff --git a/Content.Client/ADT/MidroundCustomization/MidroundCustomizationBoundUserInterface.cs b/Content.Client/ADT/MidroundCustomization/MidroundCustomizationBoundUserInterface.cs
index b33a3c50f11..72b6168bf36 100644
--- a/Content.Client/ADT/MidroundCustomization/MidroundCustomizationBoundUserInterface.cs
+++ b/Content.Client/ADT/MidroundCustomization/MidroundCustomizationBoundUserInterface.cs
@@ -22,6 +22,7 @@ protected override void Open()
         _window.OnSlotColorChanged += args => SendMessage(new MidroundCustomizationChangeColorMessage(args.Category, args.Colors, args.Slot));
         _window.OnSlotAdded += args => SendMessage(new MidroundCustomizationAddSlotMessage(args));
         _window.OnSlotRemoved += args => SendMessage(new MidroundCustomizationRemoveSlotMessage(args.Category, args.Slot));
+        _window.OnPointLightColorToggled += enabled => SendMessage(new MidroundCustomizationPointLightColorToggleMessage(enabled));
 
         _window.OnVoiceChanged += voiceId => SendMessage(new MidroundCustomizationChangeVoiceMessage(voiceId, voiceId));
         _window.OnBarkProtoChanged += proto => SendMessage(new MidroundCustomizationChangeBarkProtoMessage(proto));
diff --git a/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml b/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml
index 145b8fac5ae..24c225ed7ff 100644
--- a/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml
+++ b/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml
@@ -5,7 +5,7 @@
     <ScrollContainer HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False">
         <BoxContainer Name="VoiceContainer" Orientation="Vertical" Margin="8">
             <BoxContainer Orientation="Vertical" Margin="4" >
-                <Label Text="{Loc 'humanoid-profile-editor-voice-label'}" />
+                <Label Text="{Loc 'humanoid-profile-editor-voice-tab'}" />
                 <BoxContainer Orientation="Horizontal" Margin="0 4 0 0">
                     <OptionButton Name="VoiceButton" HorizontalExpand="True" />
                     <Button Name="VoicePlayButton" Text="{Loc 'humanoid-profile-editor-voice-play'}" MaxWidth="80" />
@@ -19,6 +19,7 @@
             <ScrollContainer HorizontalExpand="True" VerticalExpand="True" VScrollEnabled="False" HScrollEnabled="True">
                 <BoxContainer Name="MarkingsContainer" VerticalExpand="True" HorizontalExpand="True" Orientation="Horizontal" Margin="4"/>
             </ScrollContainer>
+            <CheckBox Name="PointLightColorCheckBox" Text="{Loc 'midround-customization-pointlight-color'}" Margin="8 12 8 8"/>
         </BoxContainer>
     </ScrollContainer>
 </DefaultWindow>
diff --git a/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml.cs b/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml.cs
index 69dda6391fc..d3612eec77e 100644
--- a/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml.cs
+++ b/Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml.cs
@@ -29,6 +29,7 @@ public sealed partial class MidroundCustomizationWindow : DefaultWindow
     public Action<(MarkingCategories Category, int Slot, List<Color> Colors)>? OnSlotColorChanged;
     public Action<(MarkingCategories Category, int Slot)>? OnSlotRemoved;
     public Action<MarkingCategories>? OnSlotAdded;
+    public Action<bool>? OnPointLightColorToggled;
 
     public Action<string>? OnVoiceChanged;
     public Action<string>? OnBarkProtoChanged;
@@ -75,6 +76,10 @@ public MidroundCustomizationWindow()
 
         BarkProtoButton.OnPressed += _ => OpenBarkWindow();
         BarkPlayButton.OnPressed += _ => PlayPreviewBark();
+        PointLightColorCheckBox.OnToggled += args =>
+        {
+            OnPointLightColorToggled?.Invoke(args.Pressed);
+        };
 
         _voiceList = _prototypeManager
             .EnumeratePrototypes<TTSVoicePrototype>()
@@ -177,6 +182,12 @@ public void UpdateState(MidroundCustomizationUiState state)
             MarkingsContainer.AddChild(picker);
         }
 
+        PointLightColorCheckBox.Visible = state.PointLightColor;
+        if (state.PointLightColor)
+        {
+            PointLightColorCheckBox.Pressed = state.PointLightColorEnabled;
+        }
+
         if (state.TTS != null)
         {
             _currentVoice = state.TTS;
diff --git a/Content.Server/ADT/MidroundCustomization/MidroundCustomizationComponent.cs b/Content.Server/ADT/MidroundCustomization/MidroundCustomizationComponent.cs
index ed5b0603002..524d1b16a89 100644
--- a/Content.Server/ADT/MidroundCustomization/MidroundCustomizationComponent.cs
+++ b/Content.Server/ADT/MidroundCustomization/MidroundCustomizationComponent.cs
@@ -2,12 +2,32 @@
 using Content.Shared.Humanoid.Markings;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
+using Content.Shared.Mobs;
 
 namespace Content.Server.ADT.MidroundCustomization;
 
 /// <summary>
 /// Allows humanoids to change their appearance mid-round.
 /// </summary>
+[DataDefinition]
+public sealed partial class ChangeSlotOnStateEntry
+{
+    [DataField(required: true)]
+    public MobState State { get; set; }
+
+    [DataField(required: true)]
+    public MarkingCategories Category { get; set; }
+
+    [DataField(required: true)]
+    public int Slot { get; set; }
+
+    [DataField(required: true)]
+    public string Marking { get; set; } = string.Empty;
+
+    [DataField]
+    public List<Color> Colors { get; set; } = new();
+}
+
 [RegisterComponent]
 public sealed partial class MidroundCustomizationComponent : Component
 {
@@ -74,4 +94,20 @@ public sealed partial class MidroundCustomizationComponent : Component
     [DataField, AutoNetworkedField]
     public EntityUid? ActionEntity;
 
+    /// <summary>
+    /// Changes slot on state.
+    /// </summary>
+    [DataField]
+    public List<ChangeSlotOnStateEntry> ChangeSlotOnState { get; set; } = new();
+
+    [DataField]
+    public bool PointLightColor = false;
+
+    [DataField, AutoNetworkedField]
+    public bool PointLightColorEnabled;
+
+    public Color OriginalPointLightColor = Color.White;
+
+    public Dictionary<MarkingCategories, (string Marking, List<Color> Colors)> RemovedMarkingsBuffer { get; set; } = new();
+    public Dictionary<(MarkingCategories Category, int Slot), (string Marking, List<Color> Colors)> OriginalMarkings = new();
 }
diff --git a/Content.Server/ADT/MidroundCustomization/MidroundCustomizationSystem.cs b/Content.Server/ADT/MidroundCustomization/MidroundCustomizationSystem.cs
index ebacb5502fe..8b3a1fdb611 100644
--- a/Content.Server/ADT/MidroundCustomization/MidroundCustomizationSystem.cs
+++ b/Content.Server/ADT/MidroundCustomization/MidroundCustomizationSystem.cs
@@ -14,6 +14,9 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.ADT.MidroundCustomization;
 
@@ -31,6 +34,7 @@ public sealed partial class MidroundCustomizationSystem : EntitySystem
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly ActionsSystem _action = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
 
     public override void Initialize()
     {
@@ -48,11 +52,14 @@ public override void Initialize()
             subs.Event<MidroundCustomizationChangeBarkPitchMessage>(OnTryChangeBarkPitch);
             subs.Event<MidroundCustomizationChangeBarkMinVarMessage>(OnTryChangeBarkMinVar);
             subs.Event<MidroundCustomizationChangeBarkMaxVarMessage>(OnTryChangeBarkMaxVar);
+            subs.Event<MidroundCustomizationPointLightColorToggleMessage>(OnPointLightColorToggle);
         });
 
         SubscribeLocalEvent<MidroundCustomizationComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<MidroundCustomizationComponent, ComponentShutdown>(OnShutdown);
 
+        SubscribeLocalEvent<MidroundCustomizationComponent, MobStateChangedEvent>(OnMobStateChanged);
+
         SubscribeLocalEvent<MidroundCustomizationComponent, SlimeHairSelectDoAfterEvent>(OnSelectSlotDoAfter);
         SubscribeLocalEvent<MidroundCustomizationComponent, SlimeHairChangeColorDoAfterEvent>(OnChangeColorDoAfter);
         SubscribeLocalEvent<MidroundCustomizationComponent, SlimeHairRemoveSlotDoAfterEvent>(OnRemoveSlotDoAfter);
@@ -150,8 +157,17 @@ private void OnChangeColorDoAfter(EntityUid uid, MidroundCustomizationComponent
         if (args.Handled || args.Target == null || args.Cancelled)
             return;
 
+        if (!TryComp<HumanoidAppearanceComponent>(uid, out var humanoid) ||
+            !humanoid.MarkingSet.TryGetCategory(args.Category, out var markings) ||
+            args.Slot < 0 ||
+            args.Slot >= markings.Count)
+            return;
+
         _humanoid.SetMarkingColor(uid, args.Category, args.Slot, args.Colors, force: false);
 
+        if (args.Category == MarkingCategories.FacialHair && component.PointLightColorEnabled)
+            UpdatePointLightColorIfEnabled(uid, component);
+
         // using this makes the UI feel like total ass
         // que
         // UpdateInterface(uid, component.Target, message.Session);
@@ -182,7 +198,18 @@ private void OnRemoveSlotDoAfter(EntityUid uid, MidroundCustomizationComponent c
         if (args.Handled || args.Target == null || args.Cancelled)
             return;
 
+        if (!TryComp<HumanoidAppearanceComponent>(uid, out var humanoid) ||
+            !humanoid.MarkingSet.TryGetCategory(args.Category, out var markings) ||
+            args.Slot < 0 ||
+            args.Slot >= markings.Count)
+            return;
+
+        var current = markings[args.Slot];
+        component.RemovedMarkingsBuffer[args.Category] = (current.MarkingId, current.MarkingColors.ToList());
+
         _humanoid.RemoveMarking(uid, args.Category, args.Slot);
+        if (args.Category == MarkingCategories.FacialHair)
+            UpdatePointLightColorIfEnabled(uid, component);
 
         _audio.PlayPvs(component.ChangeMarkingSound, uid);
         UpdateInterface(uid, component);
@@ -211,15 +238,40 @@ private void OnAddSlotDoAfter(EntityUid uid, MidroundCustomizationComponent comp
         if (args.Handled || args.Target == null || args.Cancelled || !TryComp(uid, out HumanoidAppearanceComponent? humanoid))
             return;
 
-        var marking = _markings.MarkingsByCategoryAndSpecies(args.Category, humanoid.Species).Keys.FirstOrDefault();
+        string markingId;
+        List<Color> colors;
 
-        if (string.IsNullOrEmpty(marking))
-            return;
+        if (component.RemovedMarkingsBuffer.TryGetValue(args.Category, out var removed) &&
+            !string.IsNullOrEmpty(removed.Marking))
+        {
+            markingId = removed.Marking;
+            colors = removed.Colors;
+            component.RemovedMarkingsBuffer.Remove(args.Category);
+        }
+        else
+        {
+            markingId = _markings.MarkingsByCategoryAndSpecies(args.Category, humanoid.Species).Keys.FirstOrDefault() ?? string.Empty;
+            if (string.IsNullOrEmpty(markingId))
+                return;
 
-        Color color = component.DefaultSkinColoring ? humanoid.SkinColor : Color.White;
+            var defaultColor = component.DefaultSkinColoring ? humanoid.SkinColor : Color.White;
+            colors = new List<Color> { defaultColor };
+        }
+
+        if (string.IsNullOrEmpty(markingId))
+            return;
 
         _audio.PlayPvs(component.ChangeMarkingSound, uid);
-        _humanoid.AddMarking(uid, marking, color);
+
+        int newSlotIndex = 0;
+        if (humanoid.MarkingSet.TryGetCategory(args.Category, out var currentList))
+            newSlotIndex = currentList.Count;
+
+        _humanoid.AddMarking(uid, markingId, colors.Count > 0 ? colors[0] : Color.White);
+        _humanoid.SetMarkingColor(uid, args.Category, newSlotIndex, colors, force: false);
+        if (args.Category == MarkingCategories.FacialHair)
+            UpdatePointLightColorIfEnabled(uid, component);
+
         UpdateInterface(uid, component);
     }
 
@@ -429,7 +481,9 @@ private void UpdateInterface(EntityUid uid, MidroundCustomizationComponent compo
             humanoid.Bark.MinVar,
             humanoid.Bark.MaxVar,
             markingDict,
-            slotsDict);
+            slotsDict,
+            component.PointLightColor,
+            component.PointLightColorEnabled);
 
         _uiSystem.SetUiState(uid, MidroundCustomizationUiKey.Key, state);
     }
@@ -437,6 +491,150 @@ private void UpdateInterface(EntityUid uid, MidroundCustomizationComponent compo
     private void OnMapInit(EntityUid uid, MidroundCustomizationComponent component, MapInitEvent args)
     {
         _action.AddAction(uid, ref component.ActionEntity, component.Action);
+
+        if (component.ChangeSlotOnState.Count == 0)
+            return;
+
+        if (!TryComp<MobStateComponent>(uid, out var mobState) ||
+            !TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
+            return;
+
+        var current = mobState.CurrentState;
+        if (component.ChangeSlotOnState.Any(e => e.State == current))
+        {
+            RecordOriginals(uid, component, humanoid);
+            ApplyStateChanges(uid, component, current, humanoid);
+        }
+    }
+
+    private void OnPointLightColorToggle(EntityUid uid, MidroundCustomizationComponent component, MidroundCustomizationPointLightColorToggleMessage args)
+    {
+        if (!component.PointLightColor)
+            return;
+
+        if (component.PointLightColorEnabled == args.Enabled)
+            return;
+
+        if (args.Enabled)
+        {
+            if (_pointLight.TryGetLight(uid, out var light))
+                component.OriginalPointLightColor = light.Color;
+
+            component.PointLightColorEnabled = true;
+            UpdatePointLightColorIfEnabled(uid, component);
+        }
+        else
+        {
+            _pointLight.SetColor(uid, component.OriginalPointLightColor);
+            component.PointLightColorEnabled = false;
+        }
+
+        UpdateInterface(uid, component);
+    }
+
+    private void UpdatePointLightColorIfEnabled(EntityUid uid, MidroundCustomizationComponent component)
+    {
+        if (!component.PointLightColorEnabled)
+            return;
+
+        if (!TryComp<HumanoidAppearanceComponent>(uid, out var humanoid) ||
+            !humanoid.MarkingSet.TryGetCategory(MarkingCategories.FacialHair, out var markings) ||
+            markings.Count == 0 || markings[0].MarkingColors.Count == 0)
+        {
+            _pointLight.SetColor(uid, component.OriginalPointLightColor);
+            return;
+        }
+
+        var facialColor = markings[0].MarkingColors[0];
+        _pointLight.SetColor(uid, facialColor);
+    }
+
+    private void OnMobStateChanged(EntityUid uid, MidroundCustomizationComponent component, MobStateChangedEvent args)
+    {
+        if (component.ChangeSlotOnState.Count == 0)
+            return;
+
+        if (!TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
+            return;
+
+        var oldManaged = component.ChangeSlotOnState.Any(e => e.State == args.OldMobState);
+        var newManaged = component.ChangeSlotOnState.Any(e => e.State == args.NewMobState);
+
+        if (!oldManaged && newManaged)
+        {
+            RecordOriginals(uid, component, humanoid);
+        }
+
+        if (oldManaged && !newManaged)
+        {
+            RevertToOriginals(uid, component, humanoid);
+            return;
+        }
+
+        if (oldManaged && newManaged)
+            RevertToOriginals(uid, component, humanoid);
+
+        if (newManaged)
+            ApplyStateChanges(uid, component, args.NewMobState, humanoid);
+    }
+
+    private void RecordOriginals(EntityUid uid, MidroundCustomizationComponent component, HumanoidAppearanceComponent humanoid)
+    {
+        component.OriginalMarkings.Clear();
+
+        var managedSlots = component.ChangeSlotOnState
+            .Select(e => (e.Category, e.Slot))
+            .Distinct()
+            .ToList();
+
+        foreach (var (category, slot) in managedSlots)
+        {
+            if (!humanoid.MarkingSet.TryGetCategory(category, out var list) || slot < 0 || slot >= list.Count)
+                continue;
+
+            var current = list[slot];
+            component.OriginalMarkings[(category, slot)] = (current.MarkingId, current.MarkingColors.ToList());
+        }
+    }
+
+    private void ApplyStateChanges(EntityUid uid, MidroundCustomizationComponent component, MobState state, HumanoidAppearanceComponent humanoid)
+    {
+        var defaultColor = component.DefaultSkinColoring ? humanoid.SkinColor : Color.White;
+
+        foreach (var entry in component.ChangeSlotOnState)
+        {
+            if (entry.State != state)
+                continue;
+
+            if (!humanoid.MarkingSet.TryGetCategory(entry.Category, out var list) ||
+                entry.Slot < 0 ||
+                entry.Slot >= list.Count)
+                continue;
+
+            _humanoid.SetMarkingId(uid, entry.Category, entry.Slot, entry.Marking, force: false, defaultColor: defaultColor);
+
+            if (entry.Colors.Count > 0)
+            {
+                _humanoid.SetMarkingColor(uid, entry.Category, entry.Slot, entry.Colors, force: false);
+            }
+        }
+
+        UpdatePointLightColorIfEnabled(uid, component);
+    }
+
+    private void RevertToOriginals(EntityUid uid, MidroundCustomizationComponent component, HumanoidAppearanceComponent humanoid)
+    {
+        var defaultColor = component.DefaultSkinColoring ? humanoid.SkinColor : Color.White;
+
+        foreach (var ((cat, slot), (origMarking, origColors)) in component.OriginalMarkings)
+        {
+            if (string.IsNullOrEmpty(origMarking)) continue;
+
+            _humanoid.SetMarkingId(uid, cat, slot, origMarking, force: false, defaultColor: defaultColor);
+            _humanoid.SetMarkingColor(uid, cat, slot, origColors, force: false);
+        }
+
+        UpdatePointLightColorIfEnabled(uid, component);
     }
 
     private void OnShutdown(EntityUid uid, MidroundCustomizationComponent component, ComponentShutdown args)
diff --git a/Content.Server/Mobs/DeathgaspComponent.cs b/Content.Server/Mobs/DeathgaspComponent.cs
index cb1f02f0d97..9b359316bd5 100644
--- a/Content.Server/Mobs/DeathgaspComponent.cs
+++ b/Content.Server/Mobs/DeathgaspComponent.cs
@@ -15,4 +15,12 @@ public sealed partial class DeathgaspComponent : Component
     /// </summary>
     [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer<EmotePrototype>))]
     public string Prototype = "DefaultDeathgasp";
+
+    //ADT-Tweak-Start
+    /// <summary>
+    ///     If true - deathgasp will play from any mob state to dead.
+    /// </summary>
+    [DataField]
+    public bool OnAnyState = false;
+    //ADT-Tweak-End
 }
diff --git a/Content.Server/Mobs/DeathgaspSystem.cs b/Content.Server/Mobs/DeathgaspSystem.cs
index c531784ea69..2745431434e 100644
--- a/Content.Server/Mobs/DeathgaspSystem.cs
+++ b/Content.Server/Mobs/DeathgaspSystem.cs
@@ -20,9 +20,14 @@ public override void Initialize()
 
     private void OnMobStateChanged(EntityUid uid, DeathgaspComponent component, MobStateChangedEvent args)
     {
+        //ADT-Tweak-Start
+        // deathgasp if they going from any mob state to dead
+        if (args.NewMobState != MobState.Dead)
+            return;
         // don't deathgasp if they arent going straight from crit to dead
-        if (args.NewMobState != MobState.Dead || args.OldMobState != MobState.Critical)
+        if (!component.OnAnyState && args.OldMobState != MobState.Critical)
             return;
+        //ADT-Tweak-End
 
         Deathgasp(uid, component);
     }
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index d6035f887b1..4ad2ac4e6a1 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -45,7 +45,7 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 continue;
 
             // Add all components required by the prototype
-            EntityManager.AddComponents(args.Mob, traitPrototype.Components, false);
+            EntityManager.AddComponents(args.Mob, traitPrototype.Components, traitPrototype.RewriteComponents); //ADT-Tweak
 
             // Add item required by the trait
             if (traitPrototype.TraitGear == null)
diff --git a/Content.Shared/ADT/MidroundCustomization/BUI.cs b/Content.Shared/ADT/MidroundCustomization/BUI.cs
index aa88c1a6627..ee24a80718e 100644
--- a/Content.Shared/ADT/MidroundCustomization/BUI.cs
+++ b/Content.Shared/ADT/MidroundCustomization/BUI.cs
@@ -15,7 +15,8 @@ public sealed class MidroundCustomizationUiState : BoundUserInterfaceState
 {
     public MidroundCustomizationUiState(string species, Sex sex, bool allowColors, string tts,
                             string barkProto, float barkPitch, float barkMinVar, float barkMaxVar,
-                            Dictionary<MarkingCategories, List<Marking>> markings, Dictionary<MarkingCategories, int> slotsTotal)
+                            Dictionary<MarkingCategories, List<Marking>> markings, Dictionary<MarkingCategories, int> slotsTotal,
+                            bool pointLightColor, bool pointLightColorEnabled)
     {
         Species = species;
         Sex = sex;
@@ -29,6 +30,9 @@ public MidroundCustomizationUiState(string species, Sex sex, bool allowColors, s
         BarkPitch = barkPitch;
         BarkMinVar = barkMinVar;
         BarkMaxVar = barkMaxVar;
+
+        PointLightColor = pointLightColor;
+        PointLightColorEnabled = pointLightColorEnabled;
     }
 
     public string Species;
@@ -43,6 +47,8 @@ public MidroundCustomizationUiState(string species, Sex sex, bool allowColors, s
     public float BarkPitch;
     public float BarkMinVar;
     public float BarkMaxVar;
+    public bool PointLightColor;
+    public bool PointLightColorEnabled;
 }
 
 [Serializable, NetSerializable]
@@ -155,3 +161,14 @@ public MidroundCustomizationChangeBarkMaxVarMessage(float maxVar)
 
     public float MaxVar { get; }
 }
+
+[Serializable, NetSerializable]
+public sealed class MidroundCustomizationPointLightColorToggleMessage : BoundUserInterfaceMessage
+{
+    public bool Enabled { get; }
+
+    public MidroundCustomizationPointLightColorToggleMessage(bool enabled)
+    {
+        Enabled = enabled;
+    }
+}
diff --git a/Content.Shared/ADT/Silicons/MobIpcComponent.cs b/Content.Shared/ADT/Silicons/MobIpcComponent.cs
index f5ec514cc32..9aec0315859 100644
--- a/Content.Shared/ADT/Silicons/MobIpcComponent.cs
+++ b/Content.Shared/ADT/Silicons/MobIpcComponent.cs
@@ -1,7 +1,14 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
 namespace Content.Shared.ADT.Silicon;
 
 [RegisterComponent]
 public sealed partial class MobIpcComponent : Component
 {
+    [DataField]
+    public bool DisablePointLightOnDeath = false;
 
+    [DataField]
+    public bool LightDisabledByDeath;
 }
diff --git a/Content.Shared/ADT/Silicons/MobIpcSystem.cs b/Content.Shared/ADT/Silicons/MobIpcSystem.cs
new file mode 100644
index 00000000000..e0413b5a105
--- /dev/null
+++ b/Content.Shared/ADT/Silicons/MobIpcSystem.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Mobs;
+using Robust.Shared.GameObjects;
+
+namespace Content.Shared.ADT.Silicon;
+
+public sealed class MobIpcSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MobIpcComponent, MobStateChangedEvent>(OnMobStateChanged);
+    }
+
+    private void OnMobStateChanged(Entity<MobIpcComponent> ent, ref MobStateChangedEvent args)
+    {
+        if (args.NewMobState == MobState.Dead &&
+            ent.Comp.DisablePointLightOnDeath &&
+            _pointLight.TryGetLight(ent.Owner, out var lightComp) &&
+            lightComp.Enabled)
+        {
+            _pointLight.SetEnabled(ent.Owner, false);
+            ent.Comp.LightDisabledByDeath = true;
+            Dirty(ent.Owner, ent.Comp);
+            return;
+        }
+
+        if (args.OldMobState == MobState.Dead &&
+            args.NewMobState != MobState.Dead &&
+            ent.Comp.LightDisabledByDeath)
+        {
+            _pointLight.SetEnabled(ent.Owner, true);
+            ent.Comp.LightDisabledByDeath = false;
+            Dirty(ent.Owner, ent.Comp);
+        }
+    }
+}
diff --git a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs
index 861fcd8dafe..a4824a867ab 100644
--- a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs
+++ b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs
@@ -47,6 +47,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SuitSensorComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<SuitSensorComponent, ComponentStartup>(OnStartup); //ADT-Tweak
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawn);
         SubscribeLocalEvent<SuitSensorComponent, ClothingGotEquippedEvent>(OnEquipped);
         SubscribeLocalEvent<SuitSensorComponent, ClothingGotUnequippedEvent>(OnUnequipped);
@@ -79,7 +80,11 @@ public bool CheckSensorAssignedStation(Entity<SuitSensorComponent> sensor)
     private void OnMapInit(Entity<SuitSensorComponent> ent, ref MapInitEvent args)
     {
         // Fallback
+        //ADT-Tweak-Start
+        if (ent.Comp.OnMob)
+            ent.Comp.User = ent.Owner;
         ent.Comp.StationId ??= _stationSystem.GetOwningStation(ent.Owner);
+        //ADT-Tweak-End
 
         // generate random mode
         if (ent.Comp.RandomMode)
@@ -99,6 +104,30 @@ private void OnMapInit(Entity<SuitSensorComponent> ent, ref MapInitEvent args)
         Dirty(ent);
     }
 
+    //ADT-Tweak-Start
+    private void OnStartup(Entity<SuitSensorComponent> ent, ref ComponentStartup args)
+    {
+        if (!ent.Comp.OnMob)
+            return;
+
+        var dirty = false;
+        if (ent.Comp.User == null)
+        {
+            ent.Comp.User = ent.Owner;
+            dirty = true;
+        }
+
+        if (ent.Comp.StationId == null)
+        {
+            ent.Comp.StationId = _stationSystem.GetOwningStation(ent.Owner);
+            dirty = true;
+        }
+
+        if (dirty)
+            Dirty(ent);
+    }
+    //ADT-Tweak-End
+
     private void OnPlayerSpawn(PlayerSpawnCompleteEvent ev)
     {
         // If the player spawns in arrivals then the grid underneath them may not be appropriate.
@@ -126,12 +155,22 @@ private void RecursiveSensor(EntityUid uid, EntityUid stationUid)
 
     private void OnEquipped(Entity<SuitSensorComponent> ent, ref ClothingGotEquippedEvent args)
     {
+        //ADT-Tweak-Start
+        if (ent.Comp.OnMob)
+            return;
+        //ADT-Tweak-End
+
         ent.Comp.User = args.Wearer;
         Dirty(ent);
     }
 
     private void OnUnequipped(Entity<SuitSensorComponent> ent, ref ClothingGotUnequippedEvent args)
     {
+        //ADT-Tweak-Start
+        if (ent.Comp.OnMob)
+            return;
+        //ADT-Tweak-End
+
         ent.Comp.User = null;
         Dirty(ent);
     }
@@ -195,9 +234,14 @@ private void OnVerb(Entity<SuitSensorComponent> ent, ref GetVerbsEvent<Verb> arg
         if (!_interactionSystem.InRangeUnobstructed(args.User, args.Target))
             return;
 
-        // check if target is incapacitated (cuffed, dead, etc)
-        if (ent.Comp.User != null && args.User != ent.Comp.User && _actionBlocker.CanInteract(ent.Comp.User.Value, null))
-            return;
+        //ADT-Tweak-Start
+        if (!ent.Comp.OnMob)
+        {
+            // check if target is incapacitated (cuffed, dead, etc)
+            if (ent.Comp.User != null && args.User != ent.Comp.User && _actionBlocker.CanInteract(ent.Comp.User.Value, null))
+                return;
+        }
+        //ADT-Tweak-End
 
         args.Verbs.UnionWith(new[]
         {
@@ -210,6 +254,11 @@ private void OnVerb(Entity<SuitSensorComponent> ent, ref GetVerbsEvent<Verb> arg
 
     private void OnInsert(Entity<SuitSensorComponent> ent, ref EntGotInsertedIntoContainerMessage args)
     {
+        //ADT-Tweak-Start
+        if (ent.Comp.OnMob)
+            return;
+        //ADT-Tweak-End
+
         if (args.Container.ID != ent.Comp.ActivationContainer)
             return;
 
@@ -219,6 +268,11 @@ private void OnInsert(Entity<SuitSensorComponent> ent, ref EntGotInsertedIntoCon
 
     private void OnRemove(Entity<SuitSensorComponent> ent, ref EntGotRemovedFromContainerMessage args)
     {
+        //ADT-Tweak-Start
+        if (ent.Comp.OnMob)
+            return;
+        //ADT-Tweak-End
+
         if (args.Container.ID != ent.Comp.ActivationContainer)
             return;
 
@@ -347,6 +401,19 @@ public void SetAllSensors(EntityUid target, SuitSensorMode mode, SlotFlags slots
         var sensor = ent.Comp1;
         var transform = ent.Comp2;
 
+        //ADT-Tweak-Start
+        // check if sensor is not on a mob but has a user, ensure no OnMob sensor exists for the same user
+        if (!sensor.OnMob && sensor.User != null)
+        {
+            var query = EntityManager.EntityQuery<SuitSensorComponent>();
+            foreach (var other in query)
+            {
+                if (other.User == sensor.User && other.OnMob)
+                    return null;
+            }
+        }
+        //ADT-Tweak-End
+
         // check if sensor is enabled and worn by user
         if (sensor.Mode == SuitSensorMode.SensorOff || sensor.User == null || !HasComp<MobStateComponent>(sensor.User) || transform.GridUid == null)
             return null;
diff --git a/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs
index 19bee1b0173..00742f953f7 100644
--- a/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs
+++ b/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs
@@ -94,4 +94,9 @@ public sealed partial class SuitSensorComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField, ViewVariables]
     public bool PreviousControlsLocked = false;
+
+    //ADT-Tweak-Start
+    [DataField, AutoNetworkedField]
+    public bool OnMob = false;
+    //ADT-Tweak-End
 }
diff --git a/Content.Shared/Traits/TraitPrototype.cs b/Content.Shared/Traits/TraitPrototype.cs
index f1ce87ba5e7..d745df42330 100644
--- a/Content.Shared/Traits/TraitPrototype.cs
+++ b/Content.Shared/Traits/TraitPrototype.cs
@@ -62,17 +62,29 @@ public sealed partial class TraitPrototype : IPrototype
     [DataField]
     public ProtoId<TraitCategoryPrototype>? Category;
 
-    // ADT Tweak start
+    //ADT-Tweak-Start
     /// <summary>
     /// Will not be selectable if current species equals any of these
     /// </summary>
     [DataField]
     public List<ProtoId<SpeciesPrototype>> SpeciesBlacklist = new();
 
+    /// <summary>
+    /// Will ONLY be selectable if current species equals any of these.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<SpeciesPrototype>> SpeciesWhitelist = new();
+
     [DataField]
     public bool Quirk = false;
 
     [DataField]
     public bool SponsorOnly = false;
-    // ADT Tweak end
+
+    /// <summary>
+    /// if true will rewrite components.
+    /// </summary>
+    [DataField]
+    public bool RewriteComponents = false;
+    //ADT-Tweak-End
 }
diff --git a/Resources/Audio/ADT/Voice/IPC/attributions.yml b/Resources/Audio/ADT/Voice/IPC/attributions.yml
new file mode 100644
index 00000000000..761f710721b
--- /dev/null
+++ b/Resources/Audio/ADT/Voice/IPC/attributions.yml
@@ -0,0 +1,144 @@
+- files:
+  - i_whistle_1.ogg
+  - i_whistle_2.ogg
+  - i_whistle_3.ogg
+  license: "CC0-1.0"
+  copyright: "Taken from https://freesound.org/, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/taure/sounds/411638/"
+
+- files:
+  - i_whistle_4.ogg
+  license: "Custom"
+  copyright: "Sampling Plus 1.0 license. Taken from https://freesound.org/, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/jackstrebor/sounds/34782/"
+
+- files: ["i_spit_1.ogg", "i_spit_2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Sounds by https://github.com/TauCetiStation/TauCetiClassic/pull/12835, modified by orange6775 (discord)"
+  source: "https://github.com/Project-IS12/IS12-Warfare"
+
+- files:
+  - i_male_laugh_1.ogg
+  - i_male_laugh_2.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "/tg/station, modified by orange6775 (discord)"
+  source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"
+
+- files: ["i_male_sneeze_1.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "InspectorJ (www.jshaw.co.uk) of Freesound.org, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/InspectorJ/sounds/352177/"
+
+- files: ["i_male_sneeze_2.ogg", "i_neutral_sneeze.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Sounds by https://github.com/TauCetiStation/TauCetiClassic/pull/12835, modified by orange6775 (discord)"
+  source: "https://github.com/Project-IS12/IS12-Warfare"
+
+- files: ["i_male_cough_1.ogg"]
+  license: "CC0-1.0"
+  copyright: "dastudiospr on freesound.org, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/dastudiospr/sounds/537150/"
+
+- files: ["i_male_cough_2.ogg"]
+  license: "CC0-1.0"
+  copyright: "qubodup on freesound.org, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/qubodup/sounds/743360/"
+
+- files: ["i_male_yawn.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "ckvoiceover on freesound.org, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/ckvoiceover/sounds/401338/"
+
+- files: ["i_male_sigh_1.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "https://github.com/ss220-space/Paradise/, modified by orange6775 (discord)"
+  source: "https://github.com/ss220-space/Paradise/commit/89943a231ced9fc8db0aef65ff87093efee16b4e"
+
+- files: ["i_male_sigh_2.ogg"]
+  license: "CC-BY-NC-3.0"
+  copyright: "Original sound by https://freesound.org/people/Kash15/sounds/409785/ - cleaned up, converted to ogg by https://github.com/BasiaBelov, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/Kash15/sounds/409785/"
+
+- files:
+  - i_male_cry_1.ogg
+  - i_male_cry_2.ogg
+  license: "CC-BY-4.0"
+  copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/jacobmathiassen/sounds/254869/"
+
+- files:
+  - i_male_cry_3.ogg
+  license: "CC0-1.0"
+  copyright: "Taken from https://freesound.org/, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/scottemoil/sounds/263776/"
+
+- files:
+  - i_male_cry_4.ogg
+  license: "CC-BY-4.0"
+  copyright: "Taken from https://freesound.org/. Converted from FLAC to OGG, some part of the sound is taken, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/qubodup/sounds/200428/"
+
+- files:
+  - i_female_laugh_1.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "/tg/station, modified by orange6775 (discord)"
+  source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"
+
+- files: ["i_female_giggle_1.ogg", "i_female_giggle_2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Sounds by https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station, modified by orange6775 (discord)"
+  source: "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station"
+
+- files: ["i_female_laugh_2.ogg"]
+  license: "CC0-1.0"
+  copyright: "https://zvukogram.com/zvuk/86551/ edited by discord:filokini, modified by orange6775 (discord)"
+  source: "https://zvukogram.com/zvuk/86551/"
+
+- files: ["i_female_sneeze_1.ogg"]
+  license: "CC0-1.0"
+  copyright: "sherby168 on freesound.org, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/sherby168/sounds/540771/"
+
+- files: ["i_female_sneeze_2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Sounds by https://github.com/TauCetiStation/TauCetiClassic/pull/12835, modified by orange6775 (discord)"
+  source: "https://github.com/Project-IS12/IS12-Warfare"
+
+- files: ["i_female_cough_1.ogg"]
+  license: "CC0-1.0"
+  copyright: "Ashe Kirk, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/OwlStorm/sounds/151213/"
+
+- files: ["i_female_cough_2.ogg"]
+  license: "CC0-1.0"
+  copyright: "thatkellytrna on freesound.org, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/thatkellytrna/sounds/425777/"
+
+- files: ["i_female_yawn.ogg"]
+  license: "CC0-1.0"
+  copyright: "Reitanna on freesound.org, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/Reitanna/sounds/252239/"
+
+- files: ["i_female_sigh_1.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "https://github.com/ss220-space/Paradise/, modified by orange6775 (discord)"
+  source: "https://github.com/ss220-space/Paradise/commit/89943a231ced9fc8db0aef65ff87093efee16b4e"
+
+- files: ["i_female_sigh_2.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Original sound by https://freesound.org/people/biawinter/sounds/408090/ - cleaned up, converted to ogg by https://github.com/BasiaBelov, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/biawinter/sounds/408090/"
+
+- files:
+  - i_female_cry_1.ogg
+  - i_female_cry_2.ogg
+  license: "CC-BY-NC-3.0"
+  copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/Luzanne0/sounds/445299/"
+
+- files:
+  - i_female_cry_3.ogg
+  - i_female_cry_4.ogg
+  license: "CC-BY-NC-4.0"
+  copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts, modified by orange6775 (discord)"
+  source: "https://freesound.org/people/Idalize/sounds/408211/"
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_cough_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_cough_1.ogg
new file mode 100644
index 00000000000..a8ca301bc4c
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_cough_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_cough_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_cough_2.ogg
new file mode 100644
index 00000000000..d72e3db1b2a
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_cough_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_cry_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_cry_1.ogg
new file mode 100644
index 00000000000..98d132f7e76
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_cry_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_cry_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_cry_2.ogg
new file mode 100644
index 00000000000..5f0bc53299e
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_cry_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_cry_3.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_cry_3.ogg
new file mode 100644
index 00000000000..e399eb47940
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_cry_3.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_cry_4.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_cry_4.ogg
new file mode 100644
index 00000000000..4d4ecc540a2
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_cry_4.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_giggle_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_giggle_1.ogg
new file mode 100644
index 00000000000..26c83a415bd
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_giggle_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_giggle_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_giggle_2.ogg
new file mode 100644
index 00000000000..fac4e6dac3b
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_giggle_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_laugh_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_laugh_1.ogg
new file mode 100644
index 00000000000..f0503f2b1d6
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_laugh_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_laugh_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_laugh_2.ogg
new file mode 100644
index 00000000000..61070ce7b52
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_laugh_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_sigh_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_sigh_1.ogg
new file mode 100644
index 00000000000..cd534f56882
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_sigh_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_sigh_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_sigh_2.ogg
new file mode 100644
index 00000000000..0bb79d1cbc6
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_sigh_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_sneeze_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_sneeze_1.ogg
new file mode 100644
index 00000000000..37d1c57de00
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_sneeze_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_sneeze_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_sneeze_2.ogg
new file mode 100644
index 00000000000..b8110d2f39e
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_sneeze_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_female_yawn.ogg b/Resources/Audio/ADT/Voice/IPC/i_female_yawn.ogg
new file mode 100644
index 00000000000..7493957e872
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_female_yawn.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_cough_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_cough_1.ogg
new file mode 100644
index 00000000000..977494d3a69
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_cough_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_cough_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_cough_2.ogg
new file mode 100644
index 00000000000..0f885441d9e
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_cough_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_cry_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_cry_1.ogg
new file mode 100644
index 00000000000..63d160fa344
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_cry_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_cry_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_cry_2.ogg
new file mode 100644
index 00000000000..012b34b0782
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_cry_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_cry_3.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_cry_3.ogg
new file mode 100644
index 00000000000..390078263c4
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_cry_3.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_cry_4.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_cry_4.ogg
new file mode 100644
index 00000000000..90ab84a892c
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_cry_4.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_laugh_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_laugh_1.ogg
new file mode 100644
index 00000000000..cc507b0ebd1
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_laugh_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_laugh_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_laugh_2.ogg
new file mode 100644
index 00000000000..2dfbf437ad5
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_laugh_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_sigh_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_sigh_1.ogg
new file mode 100644
index 00000000000..2ad46f58f17
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_sigh_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_sigh_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_sigh_2.ogg
new file mode 100644
index 00000000000..2cae3f0f9d7
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_sigh_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_sneeze_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_sneeze_1.ogg
new file mode 100644
index 00000000000..b5de5e8c9c0
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_sneeze_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_sneeze_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_sneeze_2.ogg
new file mode 100644
index 00000000000..babb34f03c5
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_sneeze_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_male_yawn.ogg b/Resources/Audio/ADT/Voice/IPC/i_male_yawn.ogg
new file mode 100644
index 00000000000..96e93d5e779
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_male_yawn.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_neutral_sneeze.ogg b/Resources/Audio/ADT/Voice/IPC/i_neutral_sneeze.ogg
new file mode 100644
index 00000000000..ed58bbb6084
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_neutral_sneeze.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_spit_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_spit_1.ogg
new file mode 100644
index 00000000000..06de6d9d016
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_spit_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_spit_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_spit_2.ogg
new file mode 100644
index 00000000000..529d6b3931a
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_spit_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_whistle_1.ogg b/Resources/Audio/ADT/Voice/IPC/i_whistle_1.ogg
new file mode 100644
index 00000000000..caccc3ea385
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_whistle_1.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_whistle_2.ogg b/Resources/Audio/ADT/Voice/IPC/i_whistle_2.ogg
new file mode 100644
index 00000000000..f371292f6df
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_whistle_2.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_whistle_3.ogg b/Resources/Audio/ADT/Voice/IPC/i_whistle_3.ogg
new file mode 100644
index 00000000000..a11438620e2
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_whistle_3.ogg differ
diff --git a/Resources/Audio/ADT/Voice/IPC/i_whistle_4.ogg b/Resources/Audio/ADT/Voice/IPC/i_whistle_4.ogg
new file mode 100644
index 00000000000..40efc801b47
Binary files /dev/null and b/Resources/Audio/ADT/Voice/IPC/i_whistle_4.ogg differ
diff --git a/Resources/Locale/ru-RU/ADT/Chat/emotes.ftl b/Resources/Locale/ru-RU/ADT/Chat/emotes.ftl
index 6ea35b8842e..be13282338a 100644
--- a/Resources/Locale/ru-RU/ADT/Chat/emotes.ftl
+++ b/Resources/Locale/ru-RU/ADT/Chat/emotes.ftl
@@ -2,6 +2,7 @@
 chat-emote-name-synth-yes = утвердительно пискнуть
 chat-emote-name-synth-no = отрицательно пискнуть
 chat-emote-name-sigh-buzz = раздражённо жужжать
+chat-emote-msg-deathgasp-ipc = замирает и недвижимо оседает, { POSS-ADJ($entity) } монитор трескается и выключается...
 
 chat-emote-name-workout = качаться
 chat-emote-name-laugh-apathy = выдавить из себя смех
diff --git a/Resources/Locale/ru-RU/ADT/actions/ipsscreen.ftl b/Resources/Locale/ru-RU/ADT/actions/ipsscreen.ftl
index a917cfab003..618a511bdd2 100644
--- a/Resources/Locale/ru-RU/ADT/actions/ipsscreen.ftl
+++ b/Resources/Locale/ru-RU/ADT/actions/ipsscreen.ftl
@@ -1,4 +1,6 @@
 ipc-screen-window-title = Сменить экран
 
 ent-ActionIpcScreen = Сменить экран
-    .desc = Никаких сторонних подключений! Смени свой экран прямо сейчас!
\ No newline at end of file
+    .desc = Никаких сторонних подключений! Смени свой экран прямо сейчас!
+
+midround-customization-pointlight-color = Фонарь - наследовать цвет экрана
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/ipc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/ipc.ftl
index 14ddfdea561..5e70e116038 100644
--- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/ipc.ftl
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/ipc.ftl
@@ -18,7 +18,7 @@ marking-ADTIPCScreenRgb = RGB
 marking-ADTIPCScreenGlider = Параплан
 marking-ADTIPCScreenRainbowhoriz = Горизонтальная радуга
 marking-ADTIPCScreenBsod = BSOD
-marking-ADTIPCScreenRedtext = Красный текст
+marking-ADTIPCScreenText = Текст
 marking-ADTIPCScreenSinewave = Синусоида
 marking-ADTIPCScreenSquarewave = Квадратная волна
 marking-ADTIPCScreenEcgwave = Кардиограмма
@@ -29,7 +29,7 @@ marking-ADTIPCScreenLoading = Загрузка...
 marking-ADTIPCScreenWindowsxp = Многолетний опыт
 marking-ADTIPCScreenTetris = Тетрис
 marking-ADTIPCScreenTv = ТВ
-marking-ADTIPCScreenTextdrop = Текст
+marking-ADTIPCScreenTextdrop = Падающий текст
 marking-ADTIPCScreenStars = Звёзды
 marking-ADTIPCScreenRainbowdiag = Диагональная радуга
 marking-ADTIPCScreenBlank = Мёртвый пиксель
diff --git a/Resources/Locale/ru-RU/ADT/traits/neutral.ftl b/Resources/Locale/ru-RU/ADT/traits/neutral.ftl
index ab953366556..1837d671080 100644
--- a/Resources/Locale/ru-RU/ADT/traits/neutral.ftl
+++ b/Resources/Locale/ru-RU/ADT/traits/neutral.ftl
@@ -37,3 +37,12 @@ trait-hushed-desc = Ваш голос не способен стать гром
 
 trait-pseudobulbar-affect-name = Псевдобульбарный аффект
 trait-pseudobulbar-affect-desc = Неврологическое расстройство из-за которого у вашего персонажа неконтролируемые приступы эмоций, как в речи так и в невербальном поведении.
+
+trait-disproportionate-name = Непропорциональный
+trait-disproportionate-desc = Ваше тело непропорционально, не позволяя носить комбинезоны. Взамен вы снабжены встроенными разъёмами под КПК, карманы, а также датчики.
+
+trait-female-ipc-name = Голосовой модуль (Женский)
+trait-female-ipc-desc = Вы способны издавать звуки женских человеческих особей.
+
+trait-male-ipc-name = Голосовой модуль (Мужской)
+trait-male-ipc-desc = Вы способны издавать звуки мужских человеческих особей.
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_screens.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_screens.yml
index 972238d3baf..28d09beb061 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_screens.yml
+++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_screens.yml
@@ -214,12 +214,12 @@
 - type: marking
   speciesRestriction: [IPC]
   #sponsorOnly: true # Corvax-Sponsors
-  id: ADTIPCScreenRedtext
+  id: ADTIPCScreenText
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi
-      state: ipc_screen_redtext
+      state: ipc_screen_text
   shader: unshaded
 
 - type: marking
@@ -731,3 +731,12 @@
     - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi
       state: ipc_screen_monoeye_alt
   shader: unshaded
+
+- type: marking
+  speciesRestriction: []
+  id: ADTIPCScreenBroken
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi
+      state: ipc_screen_broken
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/ipc.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/ipc.yml
index b74ad58ede4..7bda0ed6527 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/Species/ipc.yml
+++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/ipc.yml
@@ -29,6 +29,7 @@
     itemSlot: cell_slot
   - type: PickupHumans
   - type: MobIpc
+    disablePointLightOnDeath: true
   - type: InteractionPopup
     interactSuccessString: petting-success-ipc
     interactSuccessSound:
@@ -118,12 +119,9 @@
       Male: UnisexIPC
       Female: UnisexIPC
       Unsexed: UnisexIPC
-  - type: TriggerOnMobstateChange
-    mobState:
-    - Dead
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/ADT/IPC/borg_deathsound.ogg
+  - type: Deathgasp
+    prototype: IPCDeathgasp
+    onAnyState: true
   - type: TTS # Corvax-TTS
   - type: LanguageSpeaker
     languages:
@@ -177,12 +175,21 @@
     selectSlotTime: 0
     changeSlotTime: 0
     changeVoiceTime: 0
+    addSlotTime: 0
+    removeSlotTime: 0
     changeMarkingSound:
       path: /Audio/Machines/beep.ogg
     playSoundForVoiceChange: false
     customizableCategories:
     - FacialHair
     defaultSkinColoring: false
+    changeSlotOnState:
+    - state: Dead
+      category: FacialHair
+      slot: 0
+      marking: ADTIPCScreenBroken
+      colors: ["#ffffff"]
+    pointLightColor: true
   - type: AnimatedEmotes
   - type: Posing
   - type: SoftWalk
diff --git a/Resources/Prototypes/ADT/InventoryTemplates/ipc_inventory_template.yml b/Resources/Prototypes/ADT/InventoryTemplates/ipc_inventory_template.yml
index a8cfbb7cf13..f70772f2afe 100644
--- a/Resources/Prototypes/ADT/InventoryTemplates/ipc_inventory_template.yml
+++ b/Resources/Prototypes/ADT/InventoryTemplates/ipc_inventory_template.yml
@@ -148,3 +148,98 @@
       uiWindowPos: 3,0
       strippingWindowPos: 0,4
       displayName: Back
+
+- type: inventoryTemplate
+  id: ipcDisproportionate
+  slots:
+    - name: shoes
+      slotTexture: shoes
+      slotFlags: FEET
+      stripTime: 3
+      uiWindowPos: 1,0
+      strippingWindowPos: 1,2
+      displayName: Shoes
+    - name: outerClothing
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      stripTime: 6
+      uiWindowPos: 2,0
+      strippingWindowPos: 0,2
+      displayName: Suit
+    - name: gloves
+      slotTexture: gloves
+      slotFlags: GLOVES
+      uiWindowPos: 2,1
+      strippingWindowPos: 2,1
+      displayName: Gloves
+    - name: finger
+      slotTexture: finger
+      slotFlags: FINGER
+      stripTime: 2
+      uiWindowPos: 3,1
+      strippingWindowPos: 3,2
+      displayName: Finger
+    - name: neck
+      slotTexture: neck
+      slotFlags: NECK
+      uiWindowPos: 0,1
+      strippingWindowPos: 0,1
+      displayName: Neck
+    - name: head
+      slotTexture: head
+      slotFlags: HEAD
+      uiWindowPos: 1,1
+      strippingWindowPos: 1,1
+      displayName: Head
+      offset: 0, 0
+    - name: pocket1
+      slotTexture: pocket
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      stripTime: 3
+      uiWindowPos: 0,3
+      strippingWindowPos: 0,3
+      displayName: Pocket 1
+      stripHidden: true
+    - name: pocket2
+      slotTexture: pocket
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      stripTime: 3
+      uiWindowPos: 2,3
+      strippingWindowPos: 1,3
+      displayName: Pocket 2
+      stripHidden: true
+    - name: suitstorage
+      slotTexture: suit_storage
+      slotFlags:   SUITSTORAGE
+      stripTime: 3
+      uiWindowPos: 2,0
+      strippingWindowPos: 2,4
+      dependsOn: outerClothing
+      displayName: Suit Storage
+      slotGroup: MainHotbar
+    - name: id
+      slotTexture: id
+      slotFlags: IDCARD
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 2,1
+      strippingWindowPos: 2,3
+      displayName: ID
+    - name: belt
+      slotTexture: belt
+      slotFlags: BELT
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 3,1
+      strippingWindowPos: 1,4
+      displayName: Belt
+    - name: back
+      slotTexture: back
+      slotFlags: BACK
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 3,0
+      strippingWindowPos: 0,4
+      displayName: Back
diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml
index c4b40c0d7bc..79fcd42cec1 100644
--- a/Resources/Prototypes/ADT/SoundCollections/emotes.yml
+++ b/Resources/Prototypes/ADT/SoundCollections/emotes.yml
@@ -51,6 +51,100 @@
   files:
     - /Audio/ADT/IPC/buzz-two.ogg
 
+- type: soundCollection
+  id: IPCWhistles
+  files:
+    - /Audio/ADT/Voice/IPC/i_whistle_1.ogg
+    - /Audio/ADT/Voice/IPC/i_whistle_2.ogg
+    - /Audio/ADT/Voice/IPC/i_whistle_3.ogg
+    - /Audio/ADT/Voice/IPC/i_whistle_4.ogg
+
+- type: soundCollection
+  id: IPCSpits
+  files:
+  - /Audio/ADT/Voice/IPC/i_spit_1.ogg
+  - /Audio/ADT/Voice/IPC/i_spit_2.ogg
+
+- type: soundCollection
+  id: IPCMaleLaugh
+  files:
+    - /Audio/ADT/Voice/IPC/i_male_laugh_1.ogg
+    - /Audio/ADT/Voice/IPC/i_male_laugh_2.ogg
+
+- type: soundCollection
+  id: IPCMaleSneezes
+  files:
+    - /Audio/ADT/Voice/IPC/i_male_sneeze_1.ogg
+    - /Audio/ADT/Voice/IPC/i_male_sneeze_2.ogg
+    - /Audio/ADT/Voice/IPC/i_neutral_sneeze.ogg
+
+- type: soundCollection
+  id: IPCMaleCoughs
+  files:
+  - /Audio/ADT/Voice/IPC/i_male_cough_1.ogg
+  - /Audio/ADT/Voice/IPC/i_male_cough_2.ogg
+
+- type: soundCollection
+  id: IPCMaleYawn
+  files:
+  - /Audio/ADT/Voice/IPC/i_male_yawn.ogg
+
+- type: soundCollection
+  id: IPCMaleSigh
+  files:
+    - /Audio/ADT/Voice/IPC/i_male_sigh_1.ogg
+    - /Audio/ADT/Voice/IPC/i_male_sigh_2.ogg
+
+- type: soundCollection
+  id: IPCMaleCry
+  files:
+    - /Audio/ADT/Voice/IPC/i_male_cry_1.ogg
+    - /Audio/ADT/Voice/IPC/i_male_cry_2.ogg
+    - /Audio/ADT/Voice/IPC/i_male_cry_3.ogg
+    - /Audio/ADT/Voice/IPC/i_male_cry_4.ogg
+
+- type: soundCollection
+  id: IPCFemaleLaugh
+  files:
+    - /Audio/ADT/Voice/IPC/i_female_laugh_1.ogg
+    - /Audio/ADT/Voice/IPC/i_female_laugh_2.ogg
+    - /Audio/ADT/Voice/IPC/i_female_giggle_1.ogg
+    - /Audio/ADT/Voice/IPC/i_female_giggle_2.ogg
+
+- type: soundCollection
+  id: IPCFemaleSneezes
+  files:
+    - /Audio/ADT/Voice/IPC/i_female_sneeze_1.ogg
+    - /Audio/ADT/Voice/IPC/i_female_sneeze_2.ogg
+    - /Audio/ADT/Voice/IPC/i_neutral_sneeze.ogg
+
+- type: soundCollection
+  id: IPCFemaleCoughs
+  files:
+  - /Audio/ADT/Voice/IPC/i_female_cough_1.ogg
+  - /Audio/ADT/Voice/IPC/i_female_cough_2.ogg
+
+- type: soundCollection
+  id: IPCFemaleYawn
+  files:
+  - /Audio/ADT/Voice/IPC/i_female_yawn.ogg
+
+- type: soundCollection
+  id: IPCFemaleSigh
+  files:
+    - /Audio/ADT/Voice/IPC/i_female_sigh_1.ogg
+    - /Audio/ADT/Voice/IPC/i_female_sigh_2.ogg
+
+- type: soundCollection
+  id: IPCFemaleCry
+  files:
+    - /Audio/ADT/Voice/IPC/i_female_cry_1.ogg
+    - /Audio/ADT/Voice/IPC/i_female_cry_2.ogg
+    - /Audio/ADT/Voice/IPC/i_female_cry_3.ogg
+    - /Audio/ADT/Voice/IPC/i_female_cry_4.ogg
+
+# Novakid
+
 - type: soundCollection
   id: NovakidLaugh
   files:
diff --git a/Resources/Prototypes/ADT/Traits/quirks.yml b/Resources/Prototypes/ADT/Traits/quirks.yml
index d90f34d99f5..14832841801 100644
--- a/Resources/Prototypes/ADT/Traits/quirks.yml
+++ b/Resources/Prototypes/ADT/Traits/quirks.yml
@@ -157,6 +157,92 @@
   speciesBlacklist:
   - IPC
 
+- type: trait
+  id: ADTDisproportionate
+  name: trait-disproportionate-name
+  description: trait-disproportionate-desc
+  category: Quirks
+  cost: 0
+  rewriteComponents: true
+  components:
+  - type: SuitSensor
+    onMob: true
+    sensorsTime: 6
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    transmitFrequencyId: SuitSensor
+    savableAddress: false
+  - type: WirelessNetworkConnection
+    range: 1200
+  - type: StationLimitedNetwork
+  - type: Inventory
+    templateId: ipcDisproportionate
+    displacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
+  quirk: true
+  speciesWhitelist:
+  - IPC
+
+- type: trait
+  id: ADTFemaleIPC
+  name: trait-female-ipc-name
+  description: trait-female-ipc-desc
+  category: Quirks
+  cost: 0
+  rewriteComponents: true
+  components:
+  - type: Vocal
+    sounds:
+      Male: FemaleIPC
+      Female: FemaleIPC
+      Unsexed: FemaleIPC
+  - type: Tag
+    tags:
+    - CanPilot
+    - SiliconFootstepSound
+    - DoorBumpOpener
+    - ChangelingBlacklist
+    - ADTSiliconStealthWhitelist
+    - ADTSiliconEmotes
+    - ADTIgnoreChokeSpeechBlocking
+    - Unimplantable
+    - AnomalyHost
+  quirk: true
+  speciesWhitelist:
+  - IPC
+
+- type: trait
+  id: ADTMaleIPC
+  name: trait-male-ipc-name
+  description: trait-male-ipc-desc
+  category: Quirks
+  cost: 0
+  rewriteComponents: true
+  components:
+  - type: Vocal
+    sounds:
+      Male: MaleIPC
+      Female: MaleIPC
+      Unsexed: MaleIPC
+  - type: Tag
+    tags:
+    - CanPilot
+    - SiliconFootstepSound
+    - DoorBumpOpener
+    - ChangelingBlacklist
+    - ADTSiliconStealthWhitelist
+    - ADTSiliconEmotes
+    - ADTIgnoreChokeSpeechBlocking
+    - Unimplantable
+    - AnomalyHost
+  quirk: true
+  speciesWhitelist:
+  - IPC
+
 # - type: trait
 #   id: ADTPotentialPoltergeist
 #   name: trait-poltergeist-name
diff --git a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
index 68880f35ddc..d2cc966076e 100644
--- a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
@@ -400,6 +400,8 @@
 
 - type: emoteSounds
   id: UnisexIPC
+  params:
+    variation: 0.125
   sounds:
     RobotBeep:
       collection: RobotBeeps
@@ -411,7 +413,35 @@
       path: /Audio/ADT/IPC/buzz-sigh.ogg
     SighBuzz:
       path: /Audio/ADT/IPC/buzz-two.ogg
-    Sigh:
+    Scream:
+      path: /Audio/ADT/IPC/synth_scream.ogg
+    Beep:
+      path: /Audio/Machines/twobeep.ogg
+    Chime:
+      path: /Audio/Machines/chime.ogg
+    Buzz-Two:
+      path: /Audio/Machines/buzz-two.ogg
+    Honk:
+      path: /Audio/Items/bikehorn.ogg
+    Ping:
+      path: /Audio/Effects/Cargo/ping.ogg
+    IPCDeathgasp:
+      path: /Audio/ADT/IPC/borg_deathsound.ogg
+
+- type: emoteSounds
+  id: MaleIPC
+  params:
+    variation: 0.125
+  sounds:
+    RobotBeep:
+      collection: RobotBeeps
+    SynthYes:
+      path: /Audio/ADT/IPC/synth_yes.ogg
+    SynthNo:
+      path: /Audio/ADT/IPC/synth_no.ogg
+    Buzz:
+      path: /Audio/ADT/IPC/buzz-sigh.ogg
+    SighBuzz:
       path: /Audio/ADT/IPC/buzz-two.ogg
     Scream:
       path: /Audio/ADT/IPC/synth_scream.ogg
@@ -425,8 +455,70 @@
       path: /Audio/Items/bikehorn.ogg
     Ping:
       path: /Audio/Effects/Cargo/ping.ogg
+    IPCDeathgasp:
+      path: /Audio/ADT/IPC/borg_deathsound.ogg
+    Laugh:
+      collection: IPCMaleLaugh
+    Sneeze:
+      collection: IPCMaleSneezes
+    Cough:
+      collection: IPCMaleCoughs
+    Yawn:
+      collection: IPCMaleYawn
+    Sigh:
+      collection: IPCMaleSigh
+    Crying:
+      collection: IPCMaleCry
+    Whistle:
+      collection: IPCWhistles
+    Spit:
+      collection: IPCSpits
+
+- type: emoteSounds
+  id: FemaleIPC
   params:
     variation: 0.125
+  sounds:
+    RobotBeep:
+      collection: RobotBeeps
+    SynthYes:
+      path: /Audio/ADT/IPC/synth_yes.ogg
+    SynthNo:
+      path: /Audio/ADT/IPC/synth_no.ogg
+    Buzz:
+      path: /Audio/ADT/IPC/buzz-sigh.ogg
+    SighBuzz:
+      path: /Audio/ADT/IPC/buzz-two.ogg
+    Scream:
+      path: /Audio/ADT/IPC/synth_scream.ogg
+    Beep:
+      path: /Audio/Machines/twobeep.ogg
+    Chime:
+      path: /Audio/Machines/chime.ogg
+    Buzz-Two:
+      path: /Audio/Machines/buzz-two.ogg
+    Honk:
+      path: /Audio/Items/bikehorn.ogg
+    Ping:
+      path: /Audio/Effects/Cargo/ping.ogg
+    IPCDeathgasp:
+      path: /Audio/ADT/IPC/borg_deathsound.ogg
+    Laugh:
+      collection: IPCFemaleLaugh
+    Sneeze:
+      collection: IPCFemaleSneezes
+    Cough:
+      collection: IPCFemaleCoughs
+    Yawn:
+      collection: IPCFemaleYawn
+    Sigh:
+      collection: IPCFemaleSigh
+    Crying:
+      collection: IPCFemaleCry
+    Whistle:
+      collection: IPCWhistles
+    Spit:
+      collection: IPCSpits
 
 - type: emoteSounds
   id: MaleUrsus
diff --git a/Resources/Prototypes/ADT/Voice/speech_emotes.yml b/Resources/Prototypes/ADT/Voice/speech_emotes.yml
index 7d37213da74..a1ff5477f21 100644
--- a/Resources/Prototypes/ADT/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/ADT/Voice/speech_emotes.yml
@@ -315,7 +315,7 @@
     components:
     - BorgChassis
     tags:
-    - ADTSiliconEmotes
+    - SiliconEmotes
   chatMessages: ["chat-emote-msg-spit"]
   chatTriggers:
     - spit
@@ -329,6 +329,20 @@
     - харкает
     - делает харчок
 
+- type: emote
+  id: IPCDeathgasp
+  name: chat-emote-name-deathgasp
+  icon: Interface/Emotes/deathgasp.png
+  whitelist:
+    requireAll: true
+    components:
+    - MobState
+    tags:
+    - ADTSiliconEmotes
+  chatMessages: ["chat-emote-msg-deathgasp-ipc"]
+  chatTriggers:
+  - ipcdeathgasp
+
   #Vox
 
 - type: emote
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index 1b9d673b9cb..3b96db13e3a 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -13,7 +13,7 @@
     - BorgChassis
     # ADT tweak start
     tags:
-    - ADTSiliconEmotes
+    - SiliconEmotes
     # ADT tweak end
   chatTriggers:
     - sneeze
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index b5144e0f8f9..665fb4b40c0 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -92,7 +92,7 @@
     components:
     - Vocal
     tags:
-    - SiliconEmotes
+    - ADTSiliconEmotes #ADT-Tweak
   chatMessages: ["chat-emote-msg-honk"]
   chatTriggers:
     - honk
@@ -126,6 +126,7 @@
     - вздохнул
     - вздохнула
     # Corvax-Localization-End
+    - выдыхает #ADT-Tweak
 
 - type: emote
   id: Whistle
@@ -530,6 +531,11 @@
    - gasp
    - gasps
    - gasped
+   #ADT-Tweak-Start
+   - задыхается
+   - вдыхает
+   - жадно глотает воздух
+   #ADT-Tweak-End
 
 - type: emote
   id: DefaultDeathgasp
@@ -538,6 +544,11 @@
   whitelist:
     components:
     - MobState
+  #ADT-Tweak-Start
+  blacklist:
+    components:
+    - MobIpc
+  #ADT-Tweak-End
   chatMessages: ["chat-emote-msg-deathgasp"]
   chatTriggers:
   - deathgasp
@@ -564,7 +575,7 @@
     components:
     - Vocal
     tags:
-    - SiliconEmotes
+    - ADTSiliconEmotes #ADT-Tweak
   chatMessages: ["chat-emote-msg-buzz"]
   chatTriggers:
     - buzzing
@@ -625,7 +636,7 @@
     components:
     - Vocal
     tags:
-    - SiliconEmotes
+    - ADTSiliconEmotes #ADT-Tweak
   chatMessages: ["chat-emote-msg-beep"]
   chatTriggers:
     - beep
@@ -646,7 +657,7 @@
     components:
     - Vocal
     tags:
-    - SiliconEmotes
+    - ADTSiliconEmotes #ADT-Tweak
   chatMessages: ["chat-emote-msg-chime"]
   chatTriggers:
     - chime
@@ -667,7 +678,7 @@
     components:
     - Vocal
     tags:
-    - SiliconEmotes
+    - ADTSiliconEmotes #ADT-Tweak
   chatMessages: ["chat-emote-msg-buzzestwo"]
   chatTriggers:
     - buzztwice
@@ -699,7 +710,7 @@
     components:
     - Vocal
     tags:
-    - SiliconEmotes
+    - ADTSiliconEmotes #ADT-Tweak
   chatMessages: ["chat-emote-msg-ping"]
   chatTriggers:
     - ping
diff --git a/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_broken.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_broken.png
new file mode 100644
index 00000000000..3672962db8a
Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_broken.png differ
diff --git a/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_redtext.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_redtext.png
deleted file mode 100644
index 720e8ed5c41..00000000000
Binary files a/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_redtext.png and /dev/null differ
diff --git a/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_text.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_text.png
new file mode 100644
index 00000000000..bae8d3fe08d
Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_text.png differ
diff --git a/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/meta.json
index fd062fe270d..3af4d3cf0c7 100644
--- a/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/meta.json
+++ b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-  "version": 6,
+  "version": 7,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from Yogstation at https://github.com/yogstation13/Yogstation/commit/9c046aa5327c71f9e93e45a34283b3a4aff58bd1, resprite by discord:prazat911, ipc_screen_poxui, ipc_screen_absolute_poxui, ipc_screen_awesome, ipc_screen_best_friend, ipc_screen_bigsmile, ipc_screen_boredom, ipc_screen_clown, ipc_screen_creeper, ipc_screen_dealmaker, ipc_screen_mime, ipc_screen_monkey, ipc_screen_mr_gutsy, ipc_screen_nerd, ipc_screen_nya, ipc_screen_oko, ipc_screen_rock, ipc_screen_skull, ipc_screen_tenna created by prazat911 (discord), ipc_screen_cute_neutral, ipc_screen_cute_eyes, ipc_screen_cute_angry, ipc_screen_cute_suspicious, ipc_screen_cute_worried, ipc_screen_cute_smirking, ipc_screen_cute_cryed, ipc_screen_cute_laughing, ipc_screen_cute_questioningly, ipc_screen_cute_unsurprised, ipc_screen_monoeye_alt sprited by orange6775 (discord)",
   "size": {
@@ -107,7 +107,7 @@
         [0.4, 0.1, 0.1, 0.1, 0.1, 0.4, 0.1, 0.1, 0.1],
         [0.4, 0.1, 0.1, 0.1, 0.1, 0.4, 0.1, 0.1, 0.1],
         [0.4, 0.1, 0.1, 0.1, 0.1, 0.4, 0.1, 0.1, 0.1]]},
-    {"name": "ipc_screen_redtext", "directions": 4, "delays": [
+    {"name": "ipc_screen_text", "directions": 4, "delays": [
         [0.4, 0.1, 0.1, 0.1, 0.1],
         [0.4, 0.1, 0.1, 0.1, 0.1],
         [0.4, 0.1, 0.1, 0.1, 0.1],
@@ -277,6 +277,7 @@
         [0.2, 0.2]]},
     {"name": "ipc_screen_pacifist_1", "directions": 4},
     {"name": "ipc_screen_pacifist_2", "directions": 4},
-    {"name": "ipc_screen_monoeye_alt", "directions": 4}
+    {"name": "ipc_screen_monoeye_alt", "directions": 4},
+    {"name": "ipc_screen_broken", "directions": 4}
   ]
 }