From 4beb539c4eaa09068f48583e675d429969adb89a Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Fri, 24 Oct 2025 14:04:30 -0400
Subject: [PATCH 01/10] commit

---
 EXILED/Exiled.API/Features/Player.cs          | 47 ++++++++++++
 EXILED/Exiled.API/Structs/RoleData.cs         | 76 +++++++++++++++++++
 EXILED/Exiled.Events/Events.cs                |  8 +-
 .../Exiled.Events/Handlers/Internal/Round.cs  | 43 +++++++++++
 4 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 EXILED/Exiled.API/Structs/RoleData.cs

diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index cba7d0864d..07f7d20ad0 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -127,6 +127,7 @@ public Player(GameObject gameObject)
             DictionaryPool<string, object>.Pool.Return(SessionVariables);
             DictionaryPool<RoleTypeId, float>.Pool.Return(FriendlyFireMultiplier);
             DictionaryPool<string, Dictionary<RoleTypeId, float>>.Pool.Return(CustomRoleFriendlyFireMultiplier);
+            ListPool<Func<Player, RoleData>>.Pool.Return(FakeRoleGenerator);
         }
 
         /// <summary>
@@ -407,6 +408,11 @@ public float InfoViewRange
         /// </summary>
         public Dictionary<string, object> SessionVariables { get; } = DictionaryPool<string, object>.Pool.Get();
 
+        /// <summary>
+        /// Gets a dictionary that contains from this players POV, a dictionary containing other players and their faked roles with custom data.
+        /// </summary>
+        public Dictionary<Player, RoleData> FakeRoles { get; } = new();
+
         /// <summary>
         /// Gets a value indicating whether the player has Do Not Track (DNT) enabled. If this value is <see langword="true"/>, data about the player unrelated to server security shouldn't be stored.
         /// </summary>
@@ -603,6 +609,12 @@ internal set
             }
         }
 
+        /// <summary>
+        /// Gets a <see cref="List{T}"/> of <see cref="Func{T1, T2}"/> generating a <see cref="RoleData"/> to fake the others role whenever another player changes role.
+        /// </summary>
+        /// <remarks>See <see cref="SetAppearance(Func{Player,RoleData})"/> for usage.</remarks>
+        public List<Func<Player, RoleData>> FakeRoleGenerator { get; } = ListPool<Func<Player, RoleData>>.Pool.Get();
+
         /// <summary>
         /// Gets the role that player had before changing role.
         /// </summary>
@@ -1835,6 +1847,41 @@ public void TrySetCustomRoleFriendlyFire(string roleTypeId, Dictionary<RoleTypeI
         /// <returns> Whether the item was able to be added. </returns>
         public bool TryRemoveCustomeRoleFriendlyFire(string role) => CustomRoleFriendlyFireMultiplier.Remove(role);
 
+        /// <summary>
+        /// Adds a <see cref="Func{Player, RoleData}"/> from a <see cref="Player"/> to a <see cref="RoleTypeId"/> that is used every time a players role changes.
+        /// </summary>
+        /// <param name="generator">The function that determines if a players role will be faked (to a given viewer) after their role changes.</param>
+        /// <remarks>The first Func in <see cref="FakeRoleGenerator"/> that returns a RoleData that is not <see cref="RoleData.None"/> will be used for faking appearance.</remarks>
+        public void SetAppearance(Func<Player, RoleData> generator)
+        {
+            FakeRoleGenerator.Add(generator);
+        }
+
+        /// <summary>
+        /// Fakes this players role to other viewers.
+        /// </summary>
+        /// <param name="viewers">The players to affect.</param>
+        /// <param name="fakeRole">The fake role.</param>
+        public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole)
+        {
+            foreach (Player player in viewers)
+            {
+                player.SetAppearance(this, fakeRole);
+            }
+        }
+
+        /// <summary>
+        /// Fakes another players role to this player.
+        /// </summary>
+        /// <param name="player">The target.</param>
+        /// <param name="fakeRole">The fake role.</param>
+        /// <param name="unitId">The Unit ID of the player, if <paramref name="fakeRole"/> is an NTF role.</param>
+        public void SetAppearance(Player player, RoleTypeId fakeRole, byte unitId = 0)
+        {
+            FakeRoles[player] = new RoleData(fakeRole, unitId);
+            player.ChangeAppearance(fakeRole, new[] { this });
+        }
+
         /// <summary>
         /// Forces the player's client to play the weapon reload animation, bypassing server-side checks.
         /// </summary>
diff --git a/EXILED/Exiled.API/Structs/RoleData.cs b/EXILED/Exiled.API/Structs/RoleData.cs
new file mode 100644
index 0000000000..7497b6d0a3
--- /dev/null
+++ b/EXILED/Exiled.API/Structs/RoleData.cs
@@ -0,0 +1,76 @@
+// -----------------------------------------------------------------------
+// <copyright file="RoleData.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Structs
+{
+    using System;
+
+    using PlayerRoles;
+
+    /// <summary>
+    /// A struct representing all data regarding a fake role.
+    /// </summary>
+    public struct RoleData : IEquatable<RoleData>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RoleData"/> struct.
+        /// </summary>
+        /// <param name="role">The fake role.</param>
+        /// <param name="unitId">The fake UnitID, if <paramref name="role"/> is an NTF role.</param>
+        public RoleData(RoleTypeId role = RoleTypeId.None, byte unitId = 0)
+        {
+            Role = role;
+            UnitId = unitId;
+        }
+
+        /// <summary>
+        /// Gets the static <see cref="RoleData"/> representing no data.
+        /// </summary>
+        public static RoleData None { get; } = new(RoleTypeId.None);
+
+        /// <summary>
+        /// Gets or sets the fake role.
+        /// </summary>
+        public RoleTypeId Role { get; set; }
+
+        /// <summary>
+        /// Gets or sets the UnitID of the fake role, if <see cref="Role"/> is an NTF role.
+        /// </summary>
+        public byte UnitId { get; set; }
+
+        /// <summary>
+        /// Checks if 2 <see cref="RoleData"/> are equal.
+        /// </summary>
+        /// <param name="left">A <see cref="RoleData"/>.</param>
+        /// <param name="right">The other <see cref="RoleData"/>.</param>
+        /// <returns>Whether the parameters are equal.</returns>
+        public static bool operator ==(RoleData left, RoleData right) => left.Equals(right);
+
+        /// <summary>
+        /// Checks if 2 <see cref="RoleData"/> are not equal.
+        /// </summary>
+        /// <param name="left">A <see cref="RoleData"/>.</param>
+        /// <param name="right">The other <see cref="RoleData"/>.</param>
+        /// <returns>Whether the parameters are not equal.</returns>
+        public static bool operator !=(RoleData left, RoleData right) => !left.Equals(right);
+
+        /// <inheritdoc/>
+        public bool Equals(RoleData other) => Role == other.Role && UnitId == other.UnitId;
+
+        /// <inheritdoc/>
+        public override bool Equals(object obj) => obj is RoleData other && Equals(other);
+
+        /// <inheritdoc/>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return ((int)Role * 397) ^ UnitId.GetHashCode();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Events.cs b/EXILED/Exiled.Events/Events.cs
index 1645fe20a1..a1bdd040a2 100644
--- a/EXILED/Exiled.Events/Events.cs
+++ b/EXILED/Exiled.Events/Events.cs
@@ -18,9 +18,9 @@ namespace Exiled.Events
     using HarmonyLib;
     using InventorySystem.Items.Pickups;
     using InventorySystem.Items.Usables;
+    using PlayerRoles.FirstPersonControl.NetworkMessages;
     using PlayerRoles.Ragdolls;
     using PlayerRoles.RoleAssign;
-
     using Respawning;
     using UnityEngine.SceneManagement;
     using UserSettings.ServerSpecific;
@@ -68,6 +68,7 @@ public override void OnEnabled()
             Handlers.Server.RestartingRound += Handlers.Internal.Round.OnRestartingRound;
             Handlers.Server.RoundStarted += Handlers.Internal.Round.OnRoundStarted;
             Handlers.Player.ChangingRole += Handlers.Internal.Round.OnChangingRole;
+            Handlers.Player.Spawned += Handlers.Internal.Round.OnSpawned;
             Handlers.Player.SpawningRagdoll += Handlers.Internal.Round.OnSpawningRagdoll;
             Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
@@ -92,6 +93,8 @@ public override void OnEnabled()
             LabApi.Events.Handlers.PlayerEvents.ReloadingWeapon += Handlers.Player.OnReloadingWeapon;
             LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon += Handlers.Player.OnUnloadingWeapon;
 
+            FpcServerPositionDistributor.RoleSyncEvent += Handlers.Internal.Round.OnRoleSyncEvent;
+
             ServerConsole.ReloadServerName();
         }
 
@@ -110,6 +113,7 @@ public override void OnDisabled()
             Handlers.Server.RestartingRound -= Handlers.Internal.Round.OnRestartingRound;
             Handlers.Server.RoundStarted -= Handlers.Internal.Round.OnRoundStarted;
             Handlers.Player.ChangingRole -= Handlers.Internal.Round.OnChangingRole;
+            Handlers.Player.Spawned -= Handlers.Internal.Round.OnSpawned;
             Handlers.Player.SpawningRagdoll -= Handlers.Internal.Round.OnSpawningRagdoll;
             Handlers.Scp049.ActivatingSense -= Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified -= Handlers.Internal.Round.OnVerified;
@@ -129,6 +133,8 @@ public override void OnDisabled()
 
             LabApi.Events.Handlers.PlayerEvents.ReloadingWeapon -= Handlers.Player.OnReloadingWeapon;
             LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon -= Handlers.Player.OnUnloadingWeapon;
+
+            FpcServerPositionDistributor.RoleSyncEvent -= Handlers.Internal.Round.OnRoleSyncEvent;
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 3ce8660bbe..99050276b3 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Handlers.Internal
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -28,6 +29,7 @@ namespace Exiled.Events.Handlers.Internal
     using InventorySystem.Items.Firearms.Attachments.Components;
     using InventorySystem.Items.Usables;
     using InventorySystem.Items.Usables.Scp244.Hypothermia;
+    using Mirror;
     using PlayerRoles;
     using PlayerRoles.FirstPersonControl;
     using PlayerRoles.RoleAssign;
@@ -85,6 +87,23 @@ public static void OnChangingRole(ChangingRoleEventArgs ev)
                 ev.Player.Inventory.ServerDropEverything();
         }
 
+        /// <inheritdoc cref="Handlers.Player.OnSpawned(SpawnedEventArgs)" />
+        public static void OnSpawned(SpawnedEventArgs ev)
+        {
+            foreach (Player viewer in Player.Enumerable.Except(new[] { ev.Player }))
+            {
+                foreach (Func<Player, RoleData> generator in viewer.FakeRoleGenerator)
+                {
+                    RoleData data = generator(ev.Player);
+                    if (data.Role != RoleTypeId.None)
+                    {
+                        viewer.FakeRoles[ev.Player] = data;
+                        ev.Player.ChangeAppearance(data.Role, new[] { viewer }, false, data.UnitId);
+                    }
+                }
+            }
+        }
+
         /// <inheritdoc cref="Handlers.Player.OnSpawningRagdoll(SpawningRagdollEventArgs)" />
         public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
@@ -124,6 +143,30 @@ public static void OnVerified(VerifiedEventArgs ev)
             }
         }
 
+        /// <summary>
+        /// Makes fake role API work.
+        /// </summary>
+        /// <param name="viewerHub">The <see cref="ReferenceHub"/> of the viewer.</param>
+        /// <param name="ownerHub">The <see cref="ReferenceHub"/> of the player.</param>
+        /// <param name="actualRole">The actual <see cref="RoleTypeId"/>.</param>
+        /// <param name="writer">The pooled <see cref="NetworkWriter"/>.</param>
+        /// <returns>A role, fake if needed.</returns>
+        public static RoleTypeId OnRoleSyncEvent(ReferenceHub viewerHub, ReferenceHub ownerHub, RoleTypeId actualRole, NetworkWriter writer)
+        {
+            Player viewer = Player.Get(viewerHub);
+            Player owner = Player.Get(ownerHub);
+
+            if (viewer.FakeRoles.TryGetValue(owner, out RoleData data))
+            {
+                if (data.UnitId != 0)
+                    writer.WriteByte(data.UnitId);
+
+                return data.Role;
+            }
+
+            return actualRole;
+        }
+
         private static void GenerateAttachments()
         {
             foreach (FirearmType firearmType in EnumUtils<FirearmType>.Values)

From 395b43ce468c78960cba8792d6d4917d994ed4a6 Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:37:44 -0500
Subject: [PATCH 02/10] Some changes

---
 EXILED/Exiled.API/Features/Player.cs            |  6 +++---
 EXILED/Exiled.Events/Handlers/Internal/Round.cs | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index 9567ac6a51..a61d640a84 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -1866,11 +1866,12 @@ public void SetAppearance(Func<Player, RoleData> generator)
         /// </summary>
         /// <param name="viewers">The players to affect.</param>
         /// <param name="fakeRole">The fake role.</param>
-        public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole)
+        /// /// <param name="unitId">The Unit ID of the player, if <paramref name="fakeRole"/> is an NTF role.</param>
+        public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole, byte unitId = 0)
         {
             foreach (Player player in viewers)
             {
-                player.SetAppearance(this, fakeRole);
+                player.SetAppearance(this, fakeRole, unitId);
             }
         }
 
@@ -1883,7 +1884,6 @@ public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole)
         public void SetAppearance(Player player, RoleTypeId fakeRole, byte unitId = 0)
         {
             FakeRoles[player] = new RoleData(fakeRole, unitId);
-            player.ChangeAppearance(fakeRole, new[] { this });
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 99050276b3..4cedb7a21e 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -98,7 +98,6 @@ public static void OnSpawned(SpawnedEventArgs ev)
                     if (data.Role != RoleTypeId.None)
                     {
                         viewer.FakeRoles[ev.Player] = data;
-                        ev.Player.ChangeAppearance(data.Role, new[] { viewer }, false, data.UnitId);
                     }
                 }
             }
@@ -137,9 +136,21 @@ public static void OnVerified(VerifiedEventArgs ev)
             }
 
             // Fix bug that player that Join do not receive information about other players Scale
-            foreach (Player player in ReferenceHub.AllHubs.Select(Player.Get))
+            foreach (Player player in Player.Enumerable)
             {
                 player.SetFakeScale(player.Scale, new List<Player>() { ev.Player });
+
+                if (player != ev.Player)
+                {
+                    foreach (Func<Player, RoleData> generator in player.FakeRoleGenerator)
+                    {
+                        RoleData data = generator(ev.Player);
+                        if (data.Role != RoleTypeId.None)
+                        {
+                            ev.Player.FakeRoles[player] = data;
+                        }
+                    }
+                }
             }
         }
 

From 2e7f2d353b3b2b529519324ea3088cc0319d33b3 Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Mon, 5 Jan 2026 13:34:28 -0500
Subject: [PATCH 03/10] merge dev

---
 EXILED/EXILED.props                           |   2 +-
 EXILED/Exiled.API/Enums/CameraType.cs         |   5 +
 EXILED/Exiled.API/Enums/DoorType.cs           |   5 +
 EXILED/Exiled.API/Enums/EffectType.cs         |  57 ++--
 EXILED/Exiled.API/Enums/GlassType.cs          |   5 +
 EXILED/Exiled.API/Enums/PrefabType.cs         |  42 +++
 EXILED/Exiled.API/Enums/ProjectileType.cs     |   6 +-
 EXILED/Exiled.API/Enums/RoomType.cs           |   5 +
 EXILED/Exiled.API/Enums/Side.cs               |   5 +
 EXILED/Exiled.API/Exiled.API.csproj           |   1 +
 .../Extensions/DamageTypeExtensions.cs        |   7 +
 .../Extensions/EffectTypeExtension.cs         |   3 +
 .../Exiled.API/Extensions/MirrorExtensions.cs |  33 +--
 .../Exiled.API/Extensions/RoleExtensions.cs   |   9 +-
 EXILED/Exiled.API/Features/Camera.cs          |   5 +
 EXILED/Exiled.API/Features/Cassie.cs          | 116 +++++---
 .../DamageHandlers/CustomDamageHandler.cs     |  12 +-
 .../DamageHandlers/DamageHandlerBase.cs       |   7 +
 EXILED/Exiled.API/Features/Doors/Door.cs      |   1 +
 EXILED/Exiled.API/Features/Effect.cs          |   2 +-
 .../Features/Items/FirearmModules/Magazine.cs |   9 +-
 .../FirearmModules/Primary/Scp127Magazine.cs  |  80 +++++
 EXILED/Exiled.API/Features/Items/Item.cs      |  15 +-
 EXILED/Exiled.API/Features/Items/Jailbird.cs  |  26 +-
 .../Features/Items/Keycards/ChaosKeycard.cs   |   3 +-
 .../Exiled.API/Features/Items/Marshmallow.cs  | 102 +++++++
 EXILED/Exiled.API/Features/Items/Scp127.cs    | 274 ++++++++++++++++++
 EXILED/Exiled.API/Features/Lift.cs            |   7 +
 .../Features/Pickups/JailbirdPickup.cs        |  10 +-
 .../Features/Pickups/Scp1509Pickup.cs         |   2 +-
 EXILED/Exiled.API/Features/Player.cs          |  54 +++-
 EXILED/Exiled.API/Features/Recontainer.cs     |  16 +-
 EXILED/Exiled.API/Features/Roles/FpcRole.cs   |  24 ++
 .../Exiled.API/Features/Roles/Scp049Role.cs   |   3 +-
 .../Exiled.API/Features/Roles/Scp096Role.cs   |  18 +-
 .../Exiled.API/Features/Roles/Scp1507Role.cs  |   2 +-
 EXILED/Exiled.API/Features/Room.cs            |   1 +
 EXILED/Exiled.API/Features/Scp559.cs          |  24 +-
 EXILED/Exiled.API/Features/Server.cs          |  22 +-
 EXILED/Exiled.API/Features/Waves/TimedWave.cs |   4 +-
 EXILED/Exiled.API/Features/Window.cs          |   1 +
 .../API/Features/CustomItem.cs                |   9 -
 .../API/Features/CustomRole.cs                |   6 +
 EXILED/Exiled.CustomRoles/Commands/Get.cs     | 123 ++++++++
 EXILED/Exiled.CustomRoles/Commands/Give.cs    |   2 +-
 EXILED/Exiled.CustomRoles/Commands/Parent.cs  |   3 +-
 .../Exiled.CustomRoles.csproj                 |   2 +-
 EXILED/Exiled.Events/Commands/TpsCommand.cs   |   5 +-
 .../Cassie/SendingCassieMessageEventArgs.cs   | 144 +++++++--
 .../EventArgs/Interfaces/IMarshmallowEvent.cs |  22 ++
 .../EventArgs/Interfaces/IScp127Event.cs      |  20 ++
 .../EventArgs/Interfaces/IScp1507Event.cs     |   2 +-
 .../EventArgs/Interfaces/IScp559Event.cs      |   2 +-
 .../EventArgs/Item/CacklingEventArgs.cs       |  50 ++++
 .../EventArgs/Item/PunchingEventArgs.cs       |  50 ++++
 .../Map/AnnouncingScpTerminationEventArgs.cs  |  18 +-
 .../Player/ReceivingEffectEventArgs.cs        |  21 +-
 .../Scp1576TransmissionEndedEventArgs.cs      |  41 +++
 .../EventArgs/Player/UsedItemEventArgs.cs     |  14 +-
 .../Scp127/GainedExperienceEventArgs.cs       |  51 ++++
 .../Scp127/GainingExperienceEventArgs.cs      |  59 ++++
 .../EventArgs/Scp127/TalkedEventArgs.cs       |  52 ++++
 .../EventArgs/Scp127/TalkingEventArgs.cs      |  57 ++++
 .../Scp1507/AttackingDoorEventArgs.cs         |   2 +-
 .../EventArgs/Scp1507/ScreamingEventArgs.cs   |   2 +-
 .../Scp1507/SpawningFlamingosEventArgs.cs     |   2 +-
 .../EventArgs/Scp1507/UsingTapeEventArgs.cs   |   2 +-
 .../Scp2536/FoundPositionEventArgs.cs         |  40 +++
 .../Scp559/InteractingScp559EventArgs.cs      |   7 +-
 .../EventArgs/Scp559/SpawningEventArgs.cs     |   2 +-
 EXILED/Exiled.Events/Events.cs                |  12 +
 .../Exiled.Events/Handlers/Internal/Round.cs  |  15 +-
 EXILED/Exiled.Events/Handlers/Item.cs         |  22 ++
 EXILED/Exiled.Events/Handlers/Player.cs       |  11 +
 EXILED/Exiled.Events/Handlers/Scp127.cs       |  81 ++++++
 EXILED/Exiled.Events/Handlers/Scp1507.cs      |   2 +-
 EXILED/Exiled.Events/Handlers/Scp2536.cs      |  11 +
 EXILED/Exiled.Events/Handlers/Scp559.cs       |   2 +-
 .../Events/Cassie/SendingCassieMessage.cs     |  54 +---
 .../Patches/Events/Item/Cackling.cs           |  65 +++++
 .../Patches/Events/Item/Punching.cs           |  65 +++++
 .../Events/Map/AnnouncingChaosEntrance.cs     |  11 +-
 .../Events/Map/AnnouncingNtfEntrance.cs       |  25 +-
 .../Events/Map/AnnouncingNtfMiniEntrance.cs   |  12 +-
 .../Events/Map/AnnouncingScpTermination.cs    | 108 ++++---
 .../Events/Map/AnnouncingTeamEntrance.cs      |  68 -----
 .../Events/Map/SpawningRoomConnector.cs       |  13 +-
 .../Patches/Events/Player/Landing.cs          |  16 +-
 .../Events/Player/ReceivingStatusEffect.cs    |  12 +-
 .../Events/Player/Scp1576TransmissionEnded.cs |  59 ++++
 .../Events/Player/UsedItemByHolstering.cs     |  58 ++++
 .../Patches/Events/Scp079/Recontaining.cs     |   7 +-
 .../Patches/Events/Scp2536/FoundPosition.cs   |  86 ++++++
 .../Patches/Events/Scp2536/GrantingGift.cs    |  44 ++-
 .../Patches/Events/Scp559/Interacting.cs      |  15 +-
 .../Patches/Events/Scp559/Spawning.cs         |   2 +
 .../Events/Scp914/InteractingEvents.cs        |   8 +-
 .../Patches/Fixes/FixEffectOrder.cs           | 101 +++++++
 .../Patches/Fixes/FixMarshmallowManFF.cs      |  91 ++++++
 .../Patches/Fixes/FixNWFlashbangDuration.cs   |  30 ++
 .../Patches/Fixes/FixScp1507DestroyingDoor.cs |  52 ++++
 .../Patches/Fixes/Jailbird914CoarseFix.cs     |   2 +-
 .../Patches/Fixes/JailbirdHitRegFix.cs        |  61 ----
 .../Patches/Generic/IndividualFriendlyFire.cs |   7 +
 .../Patches/Generic/Scp127MaxHs.cs            |  32 ++
 EXILED/Exiled.Installer/Program.cs            |   2 +-
 EXILED/Exiled.Loader/AutoUpdateFiles.cs       |   2 +-
 EXILED/Exiled.Loader/ConfigManager.cs         |   5 +-
 EXILED/Exiled.Loader/Loader.cs                |   3 +
 EXILED/Exiled.Loader/Updater.cs               |   2 +-
 .../SCPSLRessources/NW_Documentation.md       |  91 ++++--
 111 files changed, 2676 insertions(+), 524 deletions(-)
 create mode 100644 EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
 create mode 100644 EXILED/Exiled.API/Features/Items/Marshmallow.cs
 create mode 100644 EXILED/Exiled.API/Features/Items/Scp127.cs
 create mode 100644 EXILED/Exiled.CustomRoles/Commands/Get.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/Handlers/Scp127.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs

diff --git a/EXILED/EXILED.props b/EXILED/EXILED.props
index f67ef6f8da..edc17d4fb2 100644
--- a/EXILED/EXILED.props
+++ b/EXILED/EXILED.props
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">9.10.1</Version>
+    <Version Condition="$(Version) == ''">9.12.2</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 
diff --git a/EXILED/Exiled.API/Enums/CameraType.cs b/EXILED/Exiled.API/Enums/CameraType.cs
index 535e7366ce..292da90b2d 100644
--- a/EXILED/Exiled.API/Enums/CameraType.cs
+++ b/EXILED/Exiled.API/Enums/CameraType.cs
@@ -159,6 +159,11 @@ public enum CameraType
         EzGateAElevators,
         EzGateBInterior,
         EzGateBSide,
+        EzGateAStairwell,
+        EzGateAUpper,
+        HczLoadingBay,
+        HczLoadingBayRamp,
+        HczLoadingBayStairwell,
         #endregion
     }
 }
diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs
index 87e0de99a5..5863d6e79a 100644
--- a/EXILED/Exiled.API/Enums/DoorType.cs
+++ b/EXILED/Exiled.API/Enums/DoorType.cs
@@ -369,5 +369,10 @@ public enum DoorType
         /// Represents the door in the <see cref="RoomType.EzGateA"/> Armory.
         /// </summary>
         GateAArmory,
+
+        /// <summary>
+        /// Represents the door in <see cref="RoomType.HczLoadingBay"/>.
+        /// </summary>
+        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/EffectType.cs b/EXILED/Exiled.API/Enums/EffectType.cs
index e70e273e77..9bed0519c9 100644
--- a/EXILED/Exiled.API/Enums/EffectType.cs
+++ b/EXILED/Exiled.API/Enums/EffectType.cs
@@ -216,7 +216,7 @@ public enum EffectType
         /// <summary>
         /// Makes you a marshmallow guy.
         /// </summary>
-        [Obsolete("Not functional in-game")]
+        // [Obsolete("Not functional in-game")]
         Marshmallow,
 
         /// <summary>
@@ -261,27 +261,27 @@ public enum EffectType
         Blurred,
 
         /// <summary>
-        /// Makes you a flamingo.
+        /// Makes you a flamingo <see cref="CustomPlayerEffects.BecomingFlamingo"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         BecomingFlamingo,
 
         /// <summary>
-        /// Makes you a Child after eating Cake.
+        /// Makes you a Child after eating Cake <see cref="Scp559Effect"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp559,
 
         /// <summary>
-        /// Scp956 found you.
+        /// Scp956 found you <see cref="global::Scp956Target"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp956Target,
 
         /// <summary>
-        /// you are snowed.
+        /// you are snowed <see cref="global::Snowed"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Snowed,
 
         /// <summary>
@@ -317,78 +317,93 @@ public enum EffectType
         /// <summary>
         /// <see cref="CustomPlayerEffects.Metal"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         Metal,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeCandy"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         OrangeCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeWitness"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         OrangeWitness,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Prismatic"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         Prismatic,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SlowMetabolism"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         SlowMetabolism,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Spicy"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         Spicy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarCrave"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween or Christmas.")]
         SugarCrave,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarHigh"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         SugarHigh,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarRush"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         SugarRush,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TemporaryBypass"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         TemporaryBypass,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TraumatizedByEvil"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         TraumatizedByEvil,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.WhiteCandy"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         WhiteCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Scp1509Resurrected"/>.
         /// </summary>
         Scp1509Resurrected,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.FocusedVision"/>.
+        /// </summary>
+        FocusedVision,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.AnomalousRegeneration"/>.
+        /// </summary>
+        AnomalousRegeneration,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.AnomalousTarget"/>.
+        /// </summary>
+        AnomalousTarget,
     }
 }
diff --git a/EXILED/Exiled.API/Enums/GlassType.cs b/EXILED/Exiled.API/Enums/GlassType.cs
index 85c068108f..fef4d59f44 100644
--- a/EXILED/Exiled.API/Enums/GlassType.cs
+++ b/EXILED/Exiled.API/Enums/GlassType.cs
@@ -84,5 +84,10 @@ public enum GlassType
         /// Represents the window in <see cref="RoomType.EzGateA"/>.
         /// </summary>
         GateAArmory,
+
+        /// <summary>
+        /// Represents the window in <see cref="RoomType.HczLoadingBay"/>
+        /// </summary>
+        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/PrefabType.cs b/EXILED/Exiled.API/Enums/PrefabType.cs
index 6a52ce7995..43936f1d80 100644
--- a/EXILED/Exiled.API/Enums/PrefabType.cs
+++ b/EXILED/Exiled.API/Enums/PrefabType.cs
@@ -417,5 +417,47 @@ public enum PrefabType
 
         [Prefab(213466224, "SCP-939 Ragdoll Halloween")]
         Scp939RagdollHalloween,
+
+        [Prefab(689741320, "SCP-559 Cake")]
+        Scp559Cake,
+
+        [Prefab(2657863153, "SCP-956")]
+        Scp956,
+
+        [Prefab(1205960739, "SCP-2536 Tree")]
+        Scp2536,
+
+        [Prefab(2102014206, "Snowpile")]
+        Snowpile,
+
+        [Prefab(3401975113, "Scp018Projectile Christmas")]
+        Scp018ProjectileChristmas,
+
+        [Prefab(3223468476, "SnowballProjectile")]
+        SnowballProjectile,
+
+        [Prefab(296717882, "CoalPickup")]
+        CoalPickup,
+
+        [Prefab(409273101, "TapePlayerPickup")]
+        Scp1507TapePickup,
+
+        [Prefab(3971391978, "Scp021JPickup")]
+        Scp021JPickup,
+
+        [Prefab(142820664, "CoalProjectile")]
+        CoalProjectile,
+
+        [Prefab(2405470903, "Scp2536Projectile")]
+        Scp2536Projectile,
+
+        [Prefab(1496232901, "SCP-173 Ragdoll Variant")]
+        Scp173RagdollChristmas,
+
+        [Prefab(6069361, "SnowPoop - TantrumObj")]
+        SnowTantrum,
+
+        [Prefab(3654754970, "SCP-1507 Ragdoll")]
+        Scp1507Ragdoll,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/ProjectileType.cs b/EXILED/Exiled.API/Enums/ProjectileType.cs
index a8072ed48e..2d95210924 100644
--- a/EXILED/Exiled.API/Enums/ProjectileType.cs
+++ b/EXILED/Exiled.API/Enums/ProjectileType.cs
@@ -51,21 +51,21 @@ public enum ProjectileType
         /// Coal.
         /// Used by <see cref="ItemType.Coal"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Coal,
 
         /// <summary>
         /// SpecialCoal.
         /// Used by <see cref="ItemType.SpecialCoal"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         SpecialCoal,
 
         /// <summary>
         /// Snowball.
         /// Used by <see cref="ItemType.Snowball"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas.")]
+        // [Obsolete("Only availaible for Christmas.")]
         Snowball,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/RoomType.cs b/EXILED/Exiled.API/Enums/RoomType.cs
index 0b7737c193..6dceeea6e2 100644
--- a/EXILED/Exiled.API/Enums/RoomType.cs
+++ b/EXILED/Exiled.API/Enums/RoomType.cs
@@ -353,5 +353,10 @@ public enum RoomType
         /// Heavy Containment Zone's straight hall room with lava.
         /// </summary>
         HczDss12 = HczIncineratorWayside,
+
+        /// <summary>
+        /// Heavy Containment Zone's T-intersection with a ramp in it.
+        /// </summary>
+        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/Side.cs b/EXILED/Exiled.API/Enums/Side.cs
index 5e9c063be7..5accace2f3 100644
--- a/EXILED/Exiled.API/Enums/Side.cs
+++ b/EXILED/Exiled.API/Enums/Side.cs
@@ -52,5 +52,10 @@ public enum Side
         /// No team. Same as <see cref="Team.Dead"/>.
         /// </summary>
         None,
+
+        /// <summary>
+        /// Contains <see cref="RoleTypeId.Flamingo"/> and <see cref="RoleTypeId.AlphaFlamingo"/>. Same as <see cref="Team.Flamingos"/>.
+        /// </summary>
+        Flamingos,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Exiled.API.csproj b/EXILED/Exiled.API/Exiled.API.csproj
index 31fe36e002..70f81bf0d1 100644
--- a/EXILED/Exiled.API/Exiled.API.csproj
+++ b/EXILED/Exiled.API/Exiled.API.csproj
@@ -34,6 +34,7 @@
         <Reference Include="Snake" HintPath="$(EXILED_REFERENCES)\Snake.dll" Private="false" />
         <Reference Include="Unity.TextMeshPro" HintPath="$(EXILED_REFERENCES)\Unity.TextMeshPro.dll" Private="false" />
         <Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
+        <Reference Include="UnityEngine.AnimationModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.AnimationModule.dll" Private="false" />
         <Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />
         <Reference Include="UnityEngine.ParticleSystemModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.ParticleSystemModule.dll" Private="false" />
         <Reference Include="UnityEngine.PhysicsModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.PhysicsModule.dll" Private="false" />
diff --git a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
index 95dfc33727..6fde63477d 100644
--- a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
@@ -204,6 +204,13 @@ public static DamageType GetDamageType(DamageHandlerBase damageHandlerBase)
                         Log.Warn($"{nameof(DamageTypeExtensions)}.{nameof(damageHandlerBase)}: No matching {nameof(DamageType)} for {nameof(UniversalDamageHandler)} with ID {translation.Id}, type will be reported as {DamageType.Unknown}. Report this to EXILED Devs.");
                         return DamageType.Unknown;
                     }
+
+                case AttackerDamageHandler attackerDamageHandler:
+                    {
+                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
+                            return DamageType.Marshmallow;
+                        return DamageType.Unknown;
+                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
index c44a32362d..088438e085 100644
--- a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
+++ b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
@@ -101,6 +101,9 @@ public static class EffectTypeExtension
             { EffectType.TraumatizedByEvil, typeof(TraumatizedByEvil) },
             { EffectType.WhiteCandy, typeof(WhiteCandy) },
             { EffectType.Scp1509Resurrected, typeof(Scp1509Resurrected) },
+            { EffectType.FocusedVision, typeof(FocusedVision) },
+            { EffectType.AnomalousRegeneration, typeof(AnomalousRegeneration) },
+            { EffectType.AnomalousTarget, typeof(AnomalousTarget) },
             #pragma warning restore CS0618
         });
 
diff --git a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
index 605e6466c0..3ba47fd9a8 100644
--- a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
@@ -17,6 +17,7 @@ namespace Exiled.API.Extensions
 
     using AdminToys;
     using AudioPooling;
+    using Cassie;
     using CustomPlayerEffects;
     using Exiled.API.Enums;
     using Exiled.API.Features.Items;
@@ -512,13 +513,12 @@ public static void ResyncKeycardPickup(CustomKeycardPickup customKeycard)
         /// <param name="isSubtitles">Same on <see cref="Cassie.Message(string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void PlayCassieAnnouncement(this Player player, string words, bool makeHold = false, bool makeNoise = true, bool isSubtitles = false)
         {
-            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
-            {
-                if (controller != null)
-                {
-                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), words, makeHold, makeNoise, isSubtitles);
-                }
-            }
+            CassieAnnouncement announcement = new(new CassieTtsPayload(words, isSubtitles, makeHold), 0, makeNoise ? 1 : 0);
+
+            // processes makeNoise
+            announcement.OnStartedPlaying();
+
+            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
         }
 
         /// <summary>
@@ -533,23 +533,12 @@ public static void PlayCassieAnnouncement(this Player player, string words, bool
         /// <param name="isSubtitles">Same on <see cref="Cassie.MessageTranslated(string, string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void MessageTranslated(this Player player, string words, string translation, string customSubtitles, bool makeHold = false, bool makeNoise = true, bool isSubtitles = true)
         {
-            StringBuilder announcement = StringBuilderPool.Pool.Get();
+            CassieAnnouncement announcement = new(new CassieTtsPayload(words, customSubtitles, makeHold), 0, makeNoise ? 1 : 0);
 
-            string[] cassies = words.Split('\n');
-            string[] translations = translation.Split('\n');
+            // processes makeNoise
+            announcement.OnStartedPlaying();
 
-            for (int i = 0; i < cassies.Length; i++)
-                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
-
-            string message = StringBuilderPool.Pool.ToStringReturn(announcement);
-
-            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
-            {
-                if (controller != null)
-                {
-                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), message, makeHold, makeNoise, isSubtitles, customSubtitles);
-                }
-            }
+            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.API/Extensions/RoleExtensions.cs b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
index 369910654a..db1a7c99a9 100644
--- a/EXILED/Exiled.API/Extensions/RoleExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
@@ -70,6 +70,7 @@ public static class RoleExtensions
             Team.FoundationForces or Team.Scientists => Side.Mtf,
             Team.ChaosInsurgency or Team.ClassD => Side.ChaosInsurgency,
             Team.OtherAlive => Side.Tutorial,
+            Team.Flamingos => Side.Flamingos,
             _ => Side.None,
         };
 
@@ -80,12 +81,13 @@ public static class RoleExtensions
         /// <returns><see cref="Team"/>.</returns>
         public static Team GetTeam(this RoleTypeId roleType) => roleType switch
         {
-            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman => Team.ChaosInsurgency,
+            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman or RoleTypeId.ChaosFlamingo => Team.ChaosInsurgency,
             RoleTypeId.Scientist => Team.Scientists,
             RoleTypeId.ClassD => Team.ClassD,
-            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 => Team.SCPs,
-            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist => Team.FoundationForces,
+            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 or RoleTypeId.ZombieFlamingo=> Team.SCPs,
+            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist or RoleTypeId.NtfFlamingo => Team.FoundationForces,
             RoleTypeId.Tutorial => Team.OtherAlive,
+            RoleTypeId.Flamingo or RoleTypeId.AlphaFlamingo => Team.Flamingos,
             _ => Team.Dead,
         };
 
@@ -131,6 +133,7 @@ public static bool TryGetRoleBase<T>(this RoleTypeId roleType, out T roleBase)
             Team.ClassD or Team.ChaosInsurgency => LeadingTeam.ChaosInsurgency,
             Team.FoundationForces or Team.Scientists => LeadingTeam.FacilityForces,
             Team.SCPs => LeadingTeam.Anomalies,
+            Team.Flamingos => LeadingTeam.Flamingo,
             _ => LeadingTeam.Draw,
         };
 
diff --git a/EXILED/Exiled.API/Features/Camera.cs b/EXILED/Exiled.API/Features/Camera.cs
index fca5cbbc73..fa17a77540 100644
--- a/EXILED/Exiled.API/Features/Camera.cs
+++ b/EXILED/Exiled.API/Features/Camera.cs
@@ -143,6 +143,11 @@ public class Camera : IWrapper<Scp079Camera>, IWorldSpace
             ["GATE A ELEVATORS"] = CameraType.EzGateAElevators,
             ["GATE B INTERIOR"] = CameraType.EzGateBInterior,
             ["GATE B SIDE"] = CameraType.EzGateBSide,
+            ["GATE A STAIRWELL"] = CameraType.EzGateAStairwell,
+            ["GATE A UPPER"] = CameraType.EzGateAUpper,
+            ["LOADING BAY"] = CameraType.HczLoadingBay,
+            ["HCZ LOADING RAMP"] = CameraType.HczLoadingBayRamp,
+            ["STAIRWELL"] = CameraType.HczLoadingBayStairwell,
 
             // CustomCamera
             ["EZ ARM CAMERA TOY"] = CameraType.EzArmCameraToy,
diff --git a/EXILED/Exiled.API/Features/Cassie.cs b/EXILED/Exiled.API/Features/Cassie.cs
index 0730f9a5a9..475e68ad4e 100644
--- a/EXILED/Exiled.API/Features/Cassie.cs
+++ b/EXILED/Exiled.API/Features/Cassie.cs
@@ -7,19 +7,19 @@
 
 namespace Exiled.API.Features
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
 
     using Exiled.API.Features.Pools;
-
+    using global::Cassie;
+    using global::Cassie.Interpreters;
     using MEC;
-
     using PlayerRoles;
-
     using PlayerStatsSystem;
-
     using Respawning;
+    using Respawning.NamingRules;
 
     using CustomFirearmHandler = DamageHandlers.FirearmDamageHandler;
     using CustomHandlerBase = DamageHandlers.DamageHandlerBase;
@@ -29,20 +29,15 @@ namespace Exiled.API.Features
     /// </summary>
     public static class Cassie
     {
-        /// <summary>
-        /// Gets the <see cref="NineTailedFoxAnnouncer"/> singleton.
-        /// </summary>
-        public static NineTailedFoxAnnouncer Announcer => NineTailedFoxAnnouncer.singleton;
-
         /// <summary>
         /// Gets a value indicating whether C.A.S.S.I.E is currently announcing. Does not include decontamination or Alpha Warhead Messages.
         /// </summary>
-        public static bool IsSpeaking => Announcer.queue.Count != 0;
+        public static bool IsSpeaking => CassieAnnouncementDispatcher.AllAnnouncements.Count != 0;
 
         /// <summary>
-        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="NineTailedFoxAnnouncer.VoiceLine"/> objects that C.A.S.S.I.E recognizes.
+        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="CassieAnnouncementDispatcher.AllAnnouncements"/> objects that C.A.S.S.I.E recognizes.
         /// </summary>
-        public static IReadOnlyCollection<NineTailedFoxAnnouncer.VoiceLine> VoiceLines => Announcer.voiceLines;
+        public static IReadOnlyCollection<CassieAnnouncement> VoiceLines => CassieAnnouncementDispatcher.AllAnnouncements;
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message.
@@ -52,7 +47,7 @@ public static class Cassie
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void Message(string message, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles);
+            new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message with a possibility to custom the subtitles.
@@ -64,14 +59,7 @@ public static void Message(string message, bool isHeld = false, bool isNoisy = t
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void MessageTranslated(string message, string translation, bool isHeld = false, bool isNoisy = true, bool isSubtitles = true)
         {
-            StringBuilder announcement = StringBuilderPool.Pool.Get();
-            string[] cassies = message.Split('\n');
-            string[] translations = translation.Split('\n');
-            for (int i = 0; i < cassies.Length; i++)
-                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
-
-            RespawnEffectsController.PlayCassieAnnouncement(announcement.ToString(), isHeld, isNoisy, isSubtitles);
-            StringBuilderPool.Pool.Return(announcement);
+            new CassieAnnouncement(new CassieTtsPayload(message, translation, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
         }
 
         /// <summary>
@@ -81,7 +69,7 @@ public static void MessageTranslated(string message, string translation, bool is
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void GlitchyMessage(string message, float glitchChance, float jamChance) =>
-            Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance);
+            new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue();
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message after a certain amount of seconds.
@@ -92,7 +80,7 @@ public static void GlitchyMessage(string message, float glitchChance, float jamC
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void DelayedMessage(string message, float delay, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            Timing.CallDelayed(delay, () => RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles));
+            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue());
 
         /// <summary>
         /// Reproduce a glitchy C.A.S.S.I.E announcement after a certain period of seconds.
@@ -102,17 +90,53 @@ public static void DelayedMessage(string message, float delay, bool isHeld = fal
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void DelayedGlitchyMessage(string message, float delay, float glitchChance, float jamChance) =>
-            Timing.CallDelayed(delay, () => Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance));
+            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue());
+
+        /// <summary>
+        /// Calculates the duration of a C.A.S.S.I.E message.
+        /// </summary>
+        /// <param name="message">The message, which duration will be calculated.</param>
+        /// <param name="obsolete1">An obsolete parameter.</param>
+        /// <param name="obsolete2">Another obsolete parameter.</param>
+        /// <returns>Duration (in seconds) of specified message.</returns>
+        [Obsolete("Please use CalculateDuration(string)", true)]
+        public static float CalculateDuration(string message, bool obsolete1, float obsolete2) => CalculateDuration(message);
 
         /// <summary>
         /// Calculates the duration of a C.A.S.S.I.E message.
         /// </summary>
         /// <param name="message">The message, which duration will be calculated.</param>
-        /// <param name="rawNumber">Determines if a number won't be converted to its full pronunciation.</param>
-        /// <param name="speed">The speed of the message.</param>
         /// <returns>Duration (in seconds) of specified message.</returns>
-        public static float CalculateDuration(string message, bool rawNumber = false, float speed = 1f)
-            => Announcer.CalculateDuration(message, rawNumber, speed);
+        public static float CalculateDuration(string message)
+        {
+            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
+            {
+                return 0;
+            }
+
+            float value = 0;
+            string[] lines = message.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+
+            CassiePlaybackModifiers modifiers = new();
+            StringBuilder builder = StringBuilderPool.Pool.Get();
+
+            for (int i = 0; i < lines.Length; i++)
+            {
+                foreach (CassieInterpreter interpreter in CassieTtsAnnouncer.Interpreters)
+                {
+                    bool halt;
+                    foreach (CassieInterpreter.Result result in interpreter.GetResults(cassieLineDatabase, ref modifiers, lines[i], builder, out halt))
+                    {
+                        value += (float)result.Modifiers.GetTimeUntilNextWord(result.Line);
+                    }
+
+                    if (halt)
+                        break;
+                }
+            }
+
+            return value;
+        }
 
         /// <summary>
         /// Converts a <see cref="Team"/> into a Cassie-Readable <c>CONTAINMENTUNIT</c>.
@@ -120,8 +144,16 @@ public static float CalculateDuration(string message, bool rawNumber = false, fl
         /// <param name="team"><see cref="Team"/>.</param>
         /// <param name="unitName">Unit Name.</param>
         /// <returns><see cref="string"/> Containment Unit text.</returns>
-        public static string ConvertTeam(Team team, string unitName)
-            => NineTailedFoxAnnouncer.ConvertTeam(team, unitName);
+        public static string ConvertTeam(Team team, string unitName) => team switch
+        {
+            Team.FoundationForces when NamingRulesManager.TryGetNamingRule(team, out UnitNamingRule unitNamingRule) => "CONTAINMENTUNIT " + unitNamingRule.TranslateToCassie(unitName),
+            Team.FoundationForces => "CONTAINMENTUNIT UNKNOWN",
+            Team.ChaosInsurgency => "BY CHAOSINSURGENCY",
+            Team.Scientists => "BY SCIENCE PERSONNEL",
+            Team.ClassD => "BY CLASSD PERSONNEL",
+            Team.Flamingos => "BY SCP 1 5 0 7",
+            _ => "UNKNOWN",
+        };
 
         /// <summary>
         /// Converts a number into a Cassie-Readable String.
@@ -129,7 +161,23 @@ public static string ConvertTeam(Team team, string unitName)
         /// <param name="num">Number to convert.</param>
         /// <returns>A CASSIE-readable <see cref="string"/> representing the number.</returns>
         public static string ConvertNumber(int num)
-            => NineTailedFoxAnnouncer.ConvertNumber(num);
+        {
+            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
+            {
+                return string.Empty;
+            }
+
+            NumberInterpreter numberInterpreter = (NumberInterpreter)CassieTtsAnnouncer.Interpreters.FirstOrDefault((CassieInterpreter x) => x is NumberInterpreter);
+            if (numberInterpreter == null)
+            {
+                return string.Empty;
+            }
+
+            CassiePlaybackModifiers cassiePlaybackModifiers = default;
+            StringBuilder stringBuilder = new();
+            numberInterpreter.GetResults(cassieLineDatabase, ref cassiePlaybackModifiers, num.ToString(), stringBuilder, out bool flag);
+            return stringBuilder.ToString();
+        }
 
         /// <summary>
         /// Announce a SCP Termination.
@@ -137,7 +185,7 @@ public static string ConvertNumber(int num)
         /// <param name="scp">SCP to announce termination of.</param>
         /// <param name="info">HitInformation.</param>
         public static void ScpTermination(Player scp, DamageHandlerBase info)
-            => NineTailedFoxAnnouncer.AnnounceScpTermination(scp.ReferenceHub, info);
+            => CassieScpTerminationAnnouncement.AnnounceScpTermination(scp.ReferenceHub, info);
 
         /// <summary>
         /// Announces the termination of a custom SCP name.
@@ -167,14 +215,14 @@ public static void CustomScpTermination(string scpName, CustomHandlerBase info)
         /// <summary>
         /// Clears the C.A.S.S.I.E queue.
         /// </summary>
-        public static void Clear() => RespawnEffectsController.ClearQueue();
+        public static void Clear() => CassieAnnouncementDispatcher.ClearAll();
 
         /// <summary>
         /// Gets a value indicating whether the given word is a valid C.A.S.S.I.E word.
         /// </summary>
         /// <param name="word">The word to check.</param>
         /// <returns><see langword="true"/> if the word is valid; otherwise, <see langword="false"/>.</returns>
-        public static bool IsValid(string word) => Announcer.voiceLines.Any(line => line.apiName.ToUpper() == word.ToUpper());
+        public static bool IsValid(string word) => CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase) ? cassieLineDatabase.AllLines.Any(line => line.ApiName.ToUpper() == word.ToUpper()) : false;
 
         /// <summary>
         /// Gets a value indicating whether the given sentence is all valid C.A.S.S.I.E word.
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
index 67b464474f..fde6e9e00a 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
@@ -39,11 +39,17 @@ public CustomDamageHandler(Player target, BaseHandler baseHandler)
             if (Attacker is not null)
             {
                 if (baseHandler is BaseScpDamageHandler)
+                {
                     CustomBase = new ScpDamageHandler(target, baseHandler);
-                else if (Attacker.CurrentItem is not null && Attacker.CurrentItem.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
-                    CustomBase = new FirearmDamageHandler(Attacker.CurrentItem, target, baseHandler);
+                }
                 else
-                    CustomBase = new DamageHandler(target, Attacker);
+                {
+                    Item item = Attacker.CurrentItem;
+                    if (item is not null && item.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
+                        CustomBase = new FirearmDamageHandler(item, target, baseHandler);
+                    else
+                        CustomBase = new DamageHandler(target, Attacker);
+                }
             }
             else
             {
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
index ec59d5ee5a..248e89452b 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
@@ -271,6 +271,13 @@ protected DamageType GetDamageType(BaseHandler damageHandler = null)
                         FirearmType.FRMG0 => DamageType.Frmg0,
                         _ => DamageType.Firearm
                     };
+
+                case PlayerStatsSystem.AttackerDamageHandler attackerDamageHandler:
+                    {
+                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
+                            return DamageType.Marshmallow;
+                        return DamageType.Unknown;
+                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Features/Doors/Door.cs b/EXILED/Exiled.API/Features/Doors/Door.cs
index 19718900a7..a8163f207c 100644
--- a/EXILED/Exiled.API/Features/Doors/Door.cs
+++ b/EXILED/Exiled.API/Features/Doors/Door.cs
@@ -624,6 +624,7 @@ private DoorType GetDoorType()
                         RoomType.HczEzCheckpointA => DoorType.CheckpointArmoryA,
                         RoomType.HczEzCheckpointB => DoorType.CheckpointArmoryB,
                         RoomType.EzGateA => DoorType.GateAArmory,
+                        RoomType.HczLoadingBay => DoorType.HczLoadingBay,
                         _ => DoorType.UnknownDoor,
                     },
                     "Unsecured Pryable GateDoor" => Room?.Type switch
diff --git a/EXILED/Exiled.API/Features/Effect.cs b/EXILED/Exiled.API/Features/Effect.cs
index f901966917..426b68dcdc 100644
--- a/EXILED/Exiled.API/Features/Effect.cs
+++ b/EXILED/Exiled.API/Features/Effect.cs
@@ -35,7 +35,7 @@ public Effect(StatusEffectBase statusEffectBase)
             if (!statusEffectBase.TryGetEffectType(out EffectType effect))
                 Log.Error($"EffectType not found please report to Exiled BugReport : {statusEffectBase}");
             Type = effect;
-            Duration = statusEffectBase.Duration;
+            Duration = statusEffectBase.TimeLeft;
             Intensity = statusEffectBase.Intensity;
             IsEnabled = statusEffectBase.IsEnabled;
         }
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
index 50a2538c64..8fb2688bb7 100644
--- a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
+++ b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
@@ -11,9 +11,8 @@ namespace Exiled.API.Features.Items.FirearmModules
 
     using Exiled.API.Features.Items.FirearmModules.Barrel;
     using Exiled.API.Features.Items.FirearmModules.Primary;
-
     using InventorySystem.Items.Firearms.Modules;
-
+    using InventorySystem.Items.Firearms.Modules.Scp127;
     using UnityEngine;
 
     /// <summary>
@@ -66,8 +65,12 @@ public static Magazine Get(IAmmoContainerModule module)
                 PumpActionModule pump => new PumpBarrelMagazine(pump),
                 IPrimaryAmmoContainerModule primary => primary switch
                 {
-                    MagazineModule magazine => new NormalMagazine(magazine),
                     CylinderAmmoModule cylinder => new CylinderMagazine(cylinder),
+                    MagazineModule magazine => magazine switch
+                    {
+                        Scp127MagazineModule scp127MagazineModule => new Scp127Magazine(scp127MagazineModule),
+                        _ => new NormalMagazine(magazine)
+                    },
                     _ => null,
                 },
                 _ => null,
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
new file mode 100644
index 0000000000..c3226169ea
--- /dev/null
+++ b/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
@@ -0,0 +1,80 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127Magazine.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Items.FirearmModules.Primary
+{
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Represents a normal magazine for SCP-127.
+    /// </summary>
+    public class Scp127Magazine : NormalMagazine
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp127Magazine"/> class.
+        /// </summary>
+        /// <param name="magazine"><inheritdoc cref="MagazineModule"/></param>
+        public Scp127Magazine(Scp127MagazineModule magazine)
+            : base(magazine)
+        {
+            MagazineModule = magazine;
+        }
+
+        /// <inheritdoc cref="NormalMagazine.MagazineModule"/>
+        public new Scp127MagazineModule MagazineModule { get; }
+
+        /// <summary>
+        /// Gets or sets the kill bonus.
+        /// </summary>
+        public int KillBonus
+        {
+            get => MagazineModule.KillBonus;
+            set => MagazineModule.KillBonus = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the rank up bonus.
+        /// </summary>
+        public int RankUpBonus
+        {
+            get => MagazineModule.RankUpBonus;
+            set => MagazineModule.RankUpBonus = value;
+        }
+
+        /// <summary>
+        /// Gets or sets all settings.
+        /// </summary>
+        public Scp127MagazineModule.RegenerationSettings[] RegenerationPerTier
+        {
+            get => MagazineModule._regenerationPerTier;
+            set => MagazineModule._regenerationPerTier = value;
+        }
+
+        /// <summary>
+        /// Gets the current setting.
+        /// </summary>
+        public Scp127MagazineModule.RegenerationSettings ActiveSetting => MagazineModule.ActiveSettings;
+
+        /// <summary>
+        /// Gets or sets a pause in bullets regeneration process.
+        /// </summary>
+        public float RemainingRegenPause
+        {
+            get => MagazineModule._remainingRegenPause;
+            set => MagazineModule._remainingRegenPause = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of bullets that should be regenerated.
+        /// </summary>
+        public float RegenProgress
+        {
+            get => MagazineModule._regenProgress;
+            set => MagazineModule._regenProgress = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Item.cs b/EXILED/Exiled.API/Features/Items/Item.cs
index f9d8a74a0d..89bb189c42 100644
--- a/EXILED/Exiled.API/Features/Items/Item.cs
+++ b/EXILED/Exiled.API/Features/Items/Item.cs
@@ -22,6 +22,7 @@ namespace Exiled.API.Features.Items
     using InventorySystem.Items.Firearms.Ammo;
     using InventorySystem.Items.Jailbird;
     using InventorySystem.Items.Keycards;
+    using InventorySystem.Items.MarshmallowMan;
     using InventorySystem.Items.MicroHID;
     using InventorySystem.Items.Pickups;
     using InventorySystem.Items.Radio;
@@ -218,7 +219,11 @@ public static Item Get(ItemBase itemBase)
 
             return itemBase switch
             {
-                InventorySystem.Items.Firearms.Firearm firearm => new Firearm(firearm),
+                InventorySystem.Items.Firearms.Firearm firearm => firearm.ItemTypeId switch
+                {
+                    ItemType.GunSCP127 => new Scp127(firearm),
+                    _ => new Firearm(firearm),
+                },
                 KeycardItem keycard => keycard switch
                 {
                     ChaosKeycardItem chaosKeycardItem => new ChaosKeycard(chaosKeycardItem),
@@ -256,6 +261,7 @@ public static Item Get(ItemBase itemBase)
                     _ => new Throwable(throwable),
                 },
                 Scp1509Item scp1509 => new Scp1509(scp1509),
+                MarshmallowItem marshmallow => new Marshmallow(marshmallow),
                 _ => new(itemBase),
             };
         }
@@ -318,7 +324,11 @@ public static T Get<T>(ushort serial)
         /// <returns>The <see cref="Item"/> created. This can be cast as a subclass.</returns>
         public static Item Create(ItemType type, Player owner = null) => type.GetTemplate() switch
         {
-            InventorySystem.Items.Firearms.Firearm => new Firearm(type),
+            InventorySystem.Items.Firearms.Firearm => type switch
+            {
+                ItemType.GunSCP127 => new Scp127(),
+                _ => new Firearm(type),
+            },
             KeycardItem keycard => keycard switch
             {
                 ChaosKeycardItem => new ChaosKeycard(type),
@@ -356,6 +366,7 @@ public static T Get<T>(ushort serial)
                 _ => new Throwable(type, owner),
             },
             Scp1509Item => new Scp1509(),
+            MarshmallowItem => new Marshmallow(type, owner),
             _ => new(type),
         };
 
diff --git a/EXILED/Exiled.API/Features/Items/Jailbird.cs b/EXILED/Exiled.API/Features/Items/Jailbird.cs
index b68a3473c2..4cc9a59c86 100644
--- a/EXILED/Exiled.API/Features/Items/Jailbird.cs
+++ b/EXILED/Exiled.API/Features/Items/Jailbird.cs
@@ -52,8 +52,8 @@ internal Jailbird()
         /// </summary>
         public float MeleeDamage
         {
-            get => Base._hitreg._damageMelee;
-            set => Base._hitreg._damageMelee = value;
+            get => Base.MeleeDamage;
+            set => Base.MeleeDamage = value;
         }
 
         /// <summary>
@@ -61,8 +61,8 @@ public float MeleeDamage
         /// </summary>
         public float ChargeDamage
         {
-            get => Base._hitreg._damageCharge;
-            set => Base._hitreg._damageCharge = value;
+            get => Base._chargeDamage;
+            set => Base._chargeDamage = value;
         }
 
         /// <summary>
@@ -70,8 +70,8 @@ public float ChargeDamage
         /// </summary>
         public float FlashDuration
         {
-            get => Base._hitreg._flashedDuration;
-            set => Base._hitreg._flashedDuration = value;
+            get => Base._flashedDuration;
+            set => Base._flashedDuration = value;
         }
 
         /// <summary>
@@ -79,17 +79,17 @@ public float FlashDuration
         /// </summary>
         public float ConcussionDuration
         {
-            get => Base._hitreg._concussionDuration;
-            set => Base._hitreg._concussionDuration = value;
+            get => Base._concussionDuration;
+            set => Base._concussionDuration = value;
         }
 
         /// <summary>
-        /// Gets or sets the radius of the Jailbird's hit register.
+        /// Gets or sets the radius of the Jailbird's hit radius.
         /// </summary>
         public float Radius
         {
-            get => Base._hitreg._hitregRadius;
-            set => Base._hitreg._hitregRadius = value;
+            get => Base._hitregRadius;
+            set => Base._hitregRadius = value;
         }
 
         /// <summary>
@@ -97,10 +97,10 @@ public float Radius
         /// </summary>
         public float TotalDamageDealt
         {
-            get => Base._hitreg.TotalMeleeDamageDealt;
+            get => Base.TotalMeleeDamageDealt;
             set
             {
-                Base._hitreg.TotalMeleeDamageDealt = value;
+                Base.TotalMeleeDamageDealt = value;
                 Base._deterioration.RecheckUsage();
             }
         }
diff --git a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
index 8d8bdad39d..bab50d19ce 100644
--- a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
+++ b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
@@ -43,7 +43,8 @@ internal ChaosKeycard(ItemType type)
         /// <summary>
         /// Gets the <see cref="InventorySystem.Items.Keycards.Snake.SnakeEngine"/> this encapsulates.
         /// </summary>
-        public SnakeEngine SnakeEngine => Base._localEngine;
+        /// <remarks>Can be null, but shouldn't be during usage.</remarks>
+        public SnakeEngine SnakeEngine => ChaosKeycardItem.SnakeSessions.TryGetValue(Serial, out SnakeEngine engine) ? engine : null;
 
         /// <summary>
         /// Returns the Keycard in a human readable format.
diff --git a/EXILED/Exiled.API/Features/Items/Marshmallow.cs b/EXILED/Exiled.API/Features/Items/Marshmallow.cs
new file mode 100644
index 0000000000..349fe342fb
--- /dev/null
+++ b/EXILED/Exiled.API/Features/Items/Marshmallow.cs
@@ -0,0 +1,102 @@
+// -----------------------------------------------------------------------
+// <copyright file="Marshmallow.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Items
+{
+    using CustomPlayerEffects;
+    using Exiled.API.Interfaces;
+    using InventorySystem.Items.MarshmallowMan;
+    using PlayerStatsSystem;
+    using UnityEngine;
+
+    /// <summary>
+    /// A wrapper class for <see cref="MarshmallowItem"/>.
+    /// </summary>
+    public class Marshmallow : Item, IWrapper<MarshmallowItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
+        /// </summary>
+        /// <param name="itemBase">The base <see cref="MarshmallowItem"/> class.</param>
+        public Marshmallow(MarshmallowItem itemBase)
+            : base(itemBase)
+        {
+            Base = itemBase;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
+        /// </summary>
+        /// <param name="type">The <see cref="ItemType"/> of the marshmallow item.</param>
+        /// <param name="owner">The owner of the marshmallow item. Leave <see langword="null"/> for no owner.</param>
+        internal Marshmallow(ItemType type, Player owner = null)
+            : base((MarshmallowItem)(owner ?? Server.Host).Inventory.CreateItemInstance(new(type, 0), false))
+        {
+        }
+
+        /// <summary>
+        /// Gets the <see cref="MarshmallowItem"/> that this class is encapsulating.
+        /// </summary>
+        public new MarshmallowItem Base { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this marshmallow man is evil.
+        /// </summary>
+        /// <remarks>See <see cref="MakeEvil"/> in regards to making a marshmallow evil.</remarks>
+        public bool Evil => Base.EvilMode;
+
+        /// <summary>
+        /// Gets or sets the <see cref="AhpStat.AhpProcess"/> of the marshmallow man that would be used if he was evil.
+        /// </summary>
+        public AhpStat.AhpProcess EvilAhpProcess
+        {
+            get => Base.EvilAHPProcess;
+            set
+            {
+                if (Evil && value is null)
+                    return;
+
+                Base.EvilAHPProcess = value;
+            }
+        }
+
+        /// <summary>
+        /// Cackles for the owner even if they are not evil.
+        /// </summary>
+        /// <param name="cooldown">How long until the player can cackle again (negative values do not affect current cooldown).</param>
+        /// <param name="duration">How long players near the marshmallow man get effected by <see cref="TraumatizedByEvil"/>.</param>
+        public void Cackle(double cooldown = -1, float duration = 5)
+        {
+            if (cooldown >= 0)
+                Base._cackleCooldown.Trigger(cooldown);
+
+            Base.ServerSendPublicRpc(writer =>
+            {
+                writer.WriteByte(4);
+                Base._cackleCooldown.WriteCooldown(writer);
+            });
+
+            foreach (Player player in Player.List)
+            {
+                if (Vector3.Distance(player.Position, Owner.Position) <= 5F && player.CurrentItem is not Marshmallow { Evil: true })
+                    player.EnableEffect<TraumatizedByEvil>(duration);
+            }
+        }
+
+        /// <summary>
+        /// Makes the owner of this marshmallow evil. You CANNOT undo this without resetting the player.
+        /// </summary>
+        /// <param name="evilProcess">The <see cref="AhpStat.AhpProcess"/> of the new evil player.</param>
+        public void MakeEvil(AhpStat.AhpProcess evilProcess = null)
+        {
+            if (Evil)
+                return;
+
+            Base.ReleaseEvil(evilProcess ?? EvilAhpProcess ?? Owner.GetModule<AhpStat>().ServerAddProcess(450F, 450F, 0F, 1F, 0F, true));
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Scp127.cs b/EXILED/Exiled.API/Features/Items/Scp127.cs
new file mode 100644
index 0000000000..2c71fbe4bb
--- /dev/null
+++ b/EXILED/Exiled.API/Features/Items/Scp127.cs
@@ -0,0 +1,274 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Items
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using InventorySystem.Items.Firearms.Modules;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+    using UnityEngine;
+
+    /// <summary>
+    /// Represents SCP-127.
+    /// </summary>
+    public class Scp127 : Firearm
+    {
+        #pragma warning disable SA1401
+        /// <summary>
+        /// Custom amount of max HS.
+        /// </summary>
+        internal float? CustomHsMax;
+        #pragma warning restore SA1401
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp127"/> class.
+        /// </summary>
+        /// <param name="itemBase"><inheritdoc cref="Firearm.Base"/></param>
+        public Scp127(InventorySystem.Items.Firearms.Firearm itemBase)
+            : base(itemBase)
+        {
+            foreach (ModuleBase module in Base.Modules)
+            {
+                switch (module)
+                {
+                    case Scp127HumeModule humeModule:
+                        HumeModule = humeModule;
+                        break;
+                    case Scp127TierManagerModule tierManagerModule:
+                        TierManagerModule = tierManagerModule;
+                        break;
+                    case Scp127VoiceLineManagerModule voiceLineManagerModule:
+                        VoiceLineManagerModule = voiceLineManagerModule;
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp127"/> class.
+        /// </summary>
+        internal Scp127()
+            : this((InventorySystem.Items.Firearms.Firearm)Server.Host.Inventory.CreateItemInstance(new(ItemType.GunSCP127, 0), false))
+        {
+        }
+
+        /// <summary>
+        /// Gets a collection of all active HS sessions.
+        /// </summary>
+        public static List<Scp127HumeModule.HumeShieldSession> ActiveHumeShieldSessions => Scp127HumeModule.ServerActiveSessions;
+
+        /// <summary>
+        /// Gets the <see cref="Scp127HumeModule"/> instance.
+        /// </summary>
+        public Scp127HumeModule HumeModule { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Scp127TierManagerModule"/> instance.
+        /// </summary>
+        public Scp127TierManagerModule TierManagerModule { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Scp127VoiceLineManagerModule"/> instance.
+        /// </summary>
+        public Scp127VoiceLineManagerModule VoiceLineManagerModule { get; }
+
+        /// <summary>
+        /// Gets or sets the maximum amount of HS.
+        /// </summary>
+        /// <remarks>If setter is used, after tier chance this value won't be edited automatically.</remarks>
+        public float HsMax
+        {
+            get => CustomHsMax ?? HumeModule.HsMax;
+            set => CustomHsMax = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a shield regeneration rate.
+        /// </summary>
+        public float ShieldRegenRate
+        {
+            get => HumeModule.ShieldRegenRate;
+            set => HumeModule.ShieldRegenRate = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a shield decay time.
+        /// </summary>
+        public float ShieldDecayRate
+        {
+            get => HumeModule.ShieldDecayRate;
+            set => HumeModule.ShieldDecayRate = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a pause before HS starts regeneration after damage being taken.
+        /// </summary>
+        public float ShieldOnDamagePause
+        {
+            get => HumeModule.ShieldOnDamagePause;
+            set => HumeModule.ShieldOnDamagePause = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a delay before HS starts dropping after unequipment.
+        /// </summary>
+        public float UnequipDecayDelay
+        {
+            get => HumeModule.UnequipDecayDelay;
+            set => HumeModule.UnequipDecayDelay = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a HumeShield regeneration.
+        /// </summary>
+        public float HsRegeneration
+        {
+            get => HumeModule.HsRegeneration;
+            set => HumeModule.HsRegeneration = value;
+        }
+
+        /// <summary>
+        /// Gets or sets an experience bonus for kill.
+        /// </summary>
+        public float KillBonus
+        {
+            get => TierManagerModule.KillBonus;
+            set => TierManagerModule.KillBonus = value;
+        }
+
+        /// <summary>
+        /// Gets or sets an amount of passive experience increase.
+        /// </summary>
+        public float PassiveExpAmount
+        {
+            get => TierManagerModule.PassiveExpAmount;
+            set => TierManagerModule.PassiveExpAmount = value;
+        }
+
+        /// <summary>
+        /// Gets or sets an interval of passive experience increase.
+        /// </summary>
+        public float PassiveExpInterval
+        {
+            get => TierManagerModule.PassiveExpInterval;
+            set => TierManagerModule.PassiveExpInterval = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a collection of all tier thresholds.
+        /// </summary>
+        public Scp127TierManagerModule.TierThreshold[] TierThresholds
+        {
+            get => TierManagerModule.Thresholds;
+            set => TierManagerModule.Thresholds = value;
+        }
+
+        /// <summary>
+        /// Gets or sets current tier.
+        /// </summary>
+        public Scp127Tier CurrentTier
+        {
+            get => TierManagerModule.CurTier;
+            set => TierManagerModule.CurTier = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the current experience amount.
+        /// </summary>
+        public float Experience
+        {
+            get => TierManagerModule.ServerExp;
+            set => TierManagerModule.ServerExp = value;
+        }
+
+        /// <summary>
+        /// Gets the instance record.
+        /// </summary>
+        public Scp127TierManagerModule.InstanceRecord InstanceRecord => Scp127TierManagerModule.GetRecord(Serial);
+
+        /// <summary>
+        /// Gets the Owner stats.
+        /// </summary>
+        public Scp127TierManagerModule.OwnerStats OwnerStats => Scp127TierManagerModule.GetStats(Base);
+
+        /// <summary>
+        /// Gets or sets all Voice Triggers.
+        /// </summary>
+        public Scp127VoiceTriggerBase[] VoiceTriggers
+        {
+            get => VoiceLineManagerModule._foundTriggers;
+            set => VoiceLineManagerModule._foundTriggers = value;
+        }
+
+        /// <summary>
+        /// Gets a collection of players that are friends with this SCP-127.
+        /// </summary>
+        public IEnumerable<Player> Friends
+        {
+            get
+            {
+                if (!Scp127VoiceLineManagerModule.FriendshipMemory.TryGetValue(Serial, out HashSet<uint> uintSet))
+                    return null;
+
+                return uintSet.Select(Player.Get);
+            }
+        }
+
+        /// <summary>
+        /// Increases experience.
+        /// </summary>
+        /// <param name="amount">Amount to add.</param>
+        public void IncreaseExperience(float amount) => TierManagerModule.ServerIncreaseExp(Base, amount);
+
+        /// <summary>
+        /// Sets owner stats.
+        /// </summary>
+        /// <param name="exp">New experience amount.</param>
+        public void SetOwnerStats(float exp) => TierManagerModule.ServerSetStats(exp);
+
+        /// <summary>
+        /// Sends tier stats.
+        /// </summary>
+        /// <param name="tier">New tier.</param>
+        /// <param name="progress">New progress.</param>
+        public void SendTierStats(Scp127Tier tier, byte progress) => TierManagerModule.ServerSendStats(Serial, Owner.ReferenceHub, tier, progress);
+
+        /// <summary>
+        /// Tries to play voice line.
+        /// </summary>
+        /// <param name="voiceLine">Voice line to play.</param>
+        /// <param name="priority">Priority of the play.</param>
+        /// <returns><c>true</c> if voice line has been played successfully. Otherwise, <c>false</c>.</returns>
+        public bool TryPlayVoiceLine(Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority priority = Scp127VoiceTriggerBase.VoiceLinePriority.Normal)
+        {
+            if (!VoiceLineManagerModule.TryFindVoiceLine(voiceLine, out Scp127VoiceTriggerBase triggerBase, out AudioClip audioClip))
+                return false;
+
+            VoiceLineManagerModule.ServerSendVoiceLine(triggerBase, null, audioClip, (byte)priority);
+            return true;
+        }
+
+        /// <summary>
+        /// Checks if this instance of SCP-127 and <paramref name="player"/> have friendship.
+        /// </summary>
+        /// <param name="player">Target to check.</param>
+        /// <returns><c>true</c> if this instance of SCP-127 and <paramref name="player"/> have friendship. Otherwise, <c>false</c>.</returns>
+        public bool HasFriendship(Player player) => Scp127VoiceLineManagerModule.HasFriendship(Serial, player.ReferenceHub);
+
+        /// <summary>
+        /// Adds player as a friend.
+        /// </summary>
+        /// <param name="player">Target to be added.</param>
+        public void AddFriend(Player player)
+        {
+            HashSet<uint> uints = Scp127VoiceLineManagerModule.FriendshipMemory.GetOrAddNew(Serial);
+            uints.Add(player.NetId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Lift.cs b/EXILED/Exiled.API/Features/Lift.cs
index 469a33bd22..d191cd6764 100644
--- a/EXILED/Exiled.API/Features/Lift.cs
+++ b/EXILED/Exiled.API/Features/Lift.cs
@@ -47,6 +47,7 @@ public class Lift : IWrapper<ElevatorChamber>, IWorldSpace
         internal Lift(ElevatorChamber elevator)
         {
             Base = elevator;
+            ElevatorAutoReturn = elevator.GetComponent<ElevatorAutoReturn>();
             ElevatorChamberToLift.Add(elevator, this);
 
             internalDoorsList.AddRange(Elevator.AllElevatorDoors[Group]);
@@ -73,6 +74,12 @@ internal Lift(ElevatorChamber elevator)
         /// </summary>
         public ElevatorChamber Base { get; }
 
+        /// <summary>
+        /// Gets the base <see cref="ElevatorAutoReturn"/>.
+        /// </summary>
+        /// <remarks>Would be null for any elevator that do not used <see cref="Interactables.Interobjects.ElevatorAutoReturn"/>.</remarks>
+        public ElevatorAutoReturn ElevatorAutoReturn { get; }
+
         /// <summary>
         /// Gets a value of the internal doors list.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
index 0494d2e966..eaaf77cb7a 100644
--- a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
@@ -123,11 +123,11 @@ protected override void InitializeProperties(ItemBase itemBase)
             base.InitializeProperties(itemBase);
             if (itemBase is JailbirdItem jailbirdItem)
             {
-                MeleeDamage = jailbirdItem._hitreg._damageMelee;
-                ChargeDamage = jailbirdItem._hitreg._damageCharge;
-                FlashDuration = jailbirdItem._hitreg._flashedDuration;
-                ConcussionDuration = jailbirdItem._hitreg._concussionDuration;
-                Radius = jailbirdItem._hitreg._hitregRadius;
+                MeleeDamage = jailbirdItem.MeleeDamage;
+                ChargeDamage = jailbirdItem._chargeDamage;
+                FlashDuration = jailbirdItem._flashedDuration;
+                ConcussionDuration = jailbirdItem._concussionDuration;
+                Radius = Radius;
             }
         }
     }
diff --git a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
index b11c1cb0e9..935bc636ca 100644
--- a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
@@ -15,7 +15,7 @@ namespace Exiled.API.Features.Pickups
     using BaseScp1509 = InventorySystem.Items.Scp1509.Scp1509Pickup;
 
     /// <summary>
-    /// A wrapper class for a Radio pickup.
+    /// A wrapper class for a Scp1509 pickup.
     /// </summary>
     public class Scp1509Pickup : Pickup, IWrapper<BaseScp1509>
     {
diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index a61d640a84..956fcf7f23 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -648,7 +648,7 @@ public ScpSpawnPreferences.SpawnPreferences ScpPreferences
         /// <summary>
         /// Gets a value indicating whether the player is reloading a weapon.
         /// </summary>
-        public bool IsReloading => CurrentItem is Firearm firearm && !firearm.IsReloading;
+        public bool IsReloading => CurrentItem is Firearm firearm && firearm.IsReloading;
 
         /// <summary>
         /// Gets a value indicating whether the player is aiming with a weapon.
@@ -1982,10 +1982,24 @@ public void SetRank(string name, UserGroup group)
                 ReferenceHub.serverRoles.SetGroup(group, false, false);
             }
 
-            if (ServerStatic.PermissionsHandler.Members.ContainsKey(UserId))
+            ServerStatic.PermissionsHandler.Members[UserId] = name;
+        }
+
+        /// <summary>
+        /// If the rank(group) exists in the remote admin config, it will assign it to the player.
+        /// </summary>
+        /// <param name="name">The rank name to be set.</param>
+        /// <returns><see langword="true"/> if the rank(group) was found and successfully assigned, <see langword="false"/> otherwise.</returns>
+        public bool TrySetRank(string name)
+        {
+            if (ServerStatic.PermissionsHandler.Groups.TryGetValue(name, out UserGroup userGroup))
+            {
+                ReferenceHub.serverRoles.SetGroup(userGroup, false, false);
                 ServerStatic.PermissionsHandler.Members[UserId] = name;
-            else
-                ServerStatic.PermissionsHandler.Members.Add(UserId, name);
+                return true;
+            }
+
+            return false;
         }
 
         /// <summary>
@@ -2029,6 +2043,21 @@ public void Broadcast(Broadcast broadcast, bool shouldClearPrevious = false)
                 Broadcast(broadcast.Duration, broadcast.Content, broadcast.Type, shouldClearPrevious);
         }
 
+        /// <summary>
+        /// Send an <see cref="global::Cassie.CassieAnnouncement"/> to the player.
+        /// </summary>
+        /// <param name="cassieAnnouncement">The <see cref="global::Cassie.CassieAnnouncement"/> to be broadcasted.</param>
+        /// <returns><see langword="0"/> if Cassie failed to play it or it's play nothing, otherwise it's return the duration of the annoucement.</returns>
+        public float CassieAnnouncement(global::Cassie.CassieAnnouncement cassieAnnouncement)
+        {
+            global::Cassie.CassieAnnouncementDispatcher.CurrentAnnouncement.OnStartedPlaying();
+            global::Cassie.CassieTtsPayload payload = cassieAnnouncement.Payload;
+            if (!global::Cassie.CassieTtsAnnouncer.TryPlay(payload, out float totalduration))
+                return 0;
+            payload.SendToHubsConditionally(x => x == ReferenceHub);
+            return totalduration;
+        }
+
         /// <summary>
         /// Drops an item from the player's inventory.
         /// </summary>
@@ -2061,10 +2090,12 @@ public void DropItem(Item item, bool isThrown = false)
         /// <returns>Dropped item's <see cref="Pickup"/>.</returns>
         public Pickup DropHeldItem()
         {
-            if (CurrentItem is null)
+            Item item = CurrentItem;
+
+            if (item is null)
                 return null;
 
-            return DropItem(CurrentItem);
+            return DropItem(item);
         }
 
         /// <summary>
@@ -3449,10 +3480,7 @@ public void SyncEffect(Effect effect)
         {
             if (effect.IsEnabled)
             {
-                EnableEffect(effect.Type, effect.Duration, effect.AddDurationIfActive);
-
-                if (effect.Intensity > 0)
-                    ChangeEffectIntensity(effect.Type, effect.Intensity, effect.Duration);
+                EnableEffect(effect.Type, effect.Intensity, effect.Duration, effect.AddDurationIfActive);
             }
         }
 
@@ -3580,8 +3608,7 @@ public void ChangeEffectIntensity<T>(byte intensity, float duration = 0)
         {
             if (ReferenceHub.playerEffectsController.TryGetEffect(out T statusEffect))
             {
-                statusEffect.Intensity = intensity;
-                statusEffect.ServerChangeDuration(duration, true);
+                statusEffect.ServerSetState(intensity, duration, false);
             }
         }
 
@@ -3595,8 +3622,7 @@ public void ChangeEffectIntensity(EffectType type, byte intensity, float duratio
         {
             if (TryGetEffect(type, out StatusEffectBase statusEffect))
             {
-                statusEffect.Intensity = intensity;
-                statusEffect.ServerChangeDuration(duration, false);
+                statusEffect.ServerSetState(intensity, duration, false);
             }
         }
 
diff --git a/EXILED/Exiled.API/Features/Recontainer.cs b/EXILED/Exiled.API/Features/Recontainer.cs
index 17f59c97d5..dbc31a35bf 100644
--- a/EXILED/Exiled.API/Features/Recontainer.cs
+++ b/EXILED/Exiled.API/Features/Recontainer.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.API.Features
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -33,7 +34,8 @@ public static class Recontainer
         /// <summary>
         /// Gets a value indicating whether the C.A.S.S.I.E is currently busy.
         /// </summary>
-        public static bool IsCassieBusy => Base.CassieBusy;
+        [Obsolete("Use Cassie.IsSpeaking instead")]
+        public static bool IsCassieBusy => Cassie.IsSpeaking;
 
         /// <summary>
         /// Gets a value about how many generator have been activated.
@@ -61,11 +63,8 @@ public static bool IsContainmentZoneLocked
         /// <summary>
         /// Gets or sets the delay to wait before overcharging.
         /// </summary>
-        public static float OverchargeDelay
-        {
-            get => Base._activationDelay;
-            set => Base._activationDelay = value;
-        }
+        [Obsolete("Will be removed in Exiled 10, patch the Cassie079RecontainAnnouncement ctor if you need this functionality")]
+        public static float OverchargeDelay { get; set; }
 
         /// <summary>
         /// Gets or sets the lockdown duration.
@@ -188,7 +187,7 @@ public static bool IsContainmentSequenceSuccessful
         /// </summary>
         /// <param name="announcement">The announcement to play.</param>
         /// <param name="glitchyMultiplier">The glitchy multiplier.</param>
-        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, glitchyMultiplier);
+        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, false, false, null);
 
         /// <summary>
         /// Begins the overcharge procedure.
@@ -199,7 +198,6 @@ public static void BeginOvercharge(bool endOvercharge = true)
             Base.BeginOvercharge();
             if (endOvercharge)
             {
-                Base._delayStopwatch.Stop();
                 Base._unlockStopwatch.Start();
             }
         }
@@ -228,7 +226,7 @@ public static void BeginOvercharge(bool endOvercharge = true)
         /// <summary>
         /// Begins the recontainment procedure.
         /// </summary>
-        public static void Recontain() => Base.Recontain();
+        public static void Recontain() => Base.Recontain(false);
 
         /// <summary>
         /// Refreshes the activator.
diff --git a/EXILED/Exiled.API/Features/Roles/FpcRole.cs b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
index 2b0d75cf00..9a1156833e 100644
--- a/EXILED/Exiled.API/Features/Roles/FpcRole.cs
+++ b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
@@ -300,6 +300,30 @@ public BasicRagdoll Ragdoll
         /// </summary>
         public SpectatableModuleBase SpectatableModuleBase => FirstPersonController.SpectatorModule;
 
+        /// <summary>
+        /// Tries to get the <see cref="Transform"/> of a specified <see cref="HumanBodyBones"/> bone.
+        /// </summary>
+        /// <param name="bone">The bone to get the <see cref="Transform"/> of.</param>
+        /// <param name="boneTransform">
+        /// When this method returns, contains the <see cref="Transform"/> of the specified bone, if found;
+        /// otherwise, <c>null</c>.
+        /// </param>
+        /// <returns><c>true</c> if the bone transform was found; otherwise, <c>false</c>.</returns>
+        public bool TryGetBoneTransform(HumanBodyBones bone, out Transform boneTransform)
+        {
+            boneTransform = null;
+
+            if (Model is not AnimatedCharacterModel animatedModel)
+                return false;
+
+            Animator animator = animatedModel.Animator;
+            if (animator == null || animator.avatar == null || !animator.avatar.isValid || !animator.avatar.isHuman)
+                return false;
+
+            boneTransform = animator.GetBoneTransform(bone);
+            return boneTransform != null;
+        }
+
         /// <summary>
         /// Resets the <see cref="Player"/>'s stamina.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
index 1c015e2ff0..6283226eb4 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
@@ -271,8 +271,7 @@ public void Attack(Player player)
             else
             {
                 cardiacArrest.SetAttacker(AttackAbility.Owner);
-                cardiacArrest.Intensity = 1;
-                cardiacArrest.ServerChangeDuration(AttackAbility._statusEffectDuration, false);
+                cardiacArrest.ServerSetState(1, AttackAbility._statusEffectDuration, false);
             }
 
             SenseAbility.OnServerHit(AttackAbility._target);
diff --git a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
index a59e699ac9..6e78b6c662 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
@@ -16,6 +16,8 @@ namespace Exiled.API.Features.Roles
     using PlayerRoles.PlayableScps.Scp096;
     using PlayerRoles.Subroutines;
 
+    using UnityEngine;
+
     using Scp096GameRole = PlayerRoles.PlayableScps.Scp096.Scp096Role;
 
     /// <summary>
@@ -139,6 +141,20 @@ internal Scp096Role(Scp096GameRole baseRole)
         /// </summary>
         public bool AttackPossible => AttackAbility.AttackPossible;
 
+        /// <summary>
+        /// Gets the head transform of SCP-096's character model.
+        /// </summary>
+        public Transform HeadTransform
+        {
+            get
+            {
+                if (Model is not Scp096CharacterModel scp96AnimatedCharacterModel)
+                    return null;
+
+                return scp96AnimatedCharacterModel.Head;
+            }
+        }
+
         /// <summary>
         /// Gets or sets the Charge Ability Cooldown.
         /// </summary>
@@ -306,4 +322,4 @@ public void Charge(float cooldown = 1f)
         /// <returns>The Spawn Chance.</returns>
         public float GetSpawnChance(List<RoleTypeId> alreadySpawned) => Base.GetSpawnChance(alreadySpawned);
     }
-}
\ No newline at end of file
+}
diff --git a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
index a4c9ba78cf..170bda116a 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
@@ -20,7 +20,7 @@ namespace Exiled.API.Features.Roles
     /// <summary>
     /// Defines a role that represents SCP-1507.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp1507Role : FpcRole, ISubroutinedScpRole, IHumeShieldRole, ISpawnableScp
     {
         /// <summary>
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
index a81a24173f..846a76509c 100644
--- a/EXILED/Exiled.API/Features/Room.cs
+++ b/EXILED/Exiled.API/Features/Room.cs
@@ -506,6 +506,7 @@ private static RoomType FindType(GameObject gameObject)
                 "HCZ_ChkpB" => RoomType.HczElevatorB,
                 "HCZ_127" => RoomType.Hcz127,
                 "HCZ_ServerRoom" => RoomType.HczServerRoom,
+                "HCZ_Intersection_Ramp" => RoomType.HczLoadingBay,
                 "EZ_GateA" => RoomType.EzGateA,
                 "EZ_GateB" => RoomType.EzGateB,
                 "EZ_ThreeWay" => RoomType.EzTCross,
diff --git a/EXILED/Exiled.API/Features/Scp559.cs b/EXILED/Exiled.API/Features/Scp559.cs
index 08fc899047..d05702b351 100644
--- a/EXILED/Exiled.API/Features/Scp559.cs
+++ b/EXILED/Exiled.API/Features/Scp559.cs
@@ -18,7 +18,7 @@ namespace Exiled.API.Features
     /// <summary>
     /// Represents a cake.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp559 : IWrapper<Scp559Cake>, IPosition
     {
         /// <summary>
@@ -50,20 +50,34 @@ public Scp559(Scp559Cake cakeBase)
         /// <summary>
         /// Gets a <see cref="Dictionary{TKey,TValue}"/> with spawnpoint in rooms.
         /// </summary>
-        public static Dictionary<RoomName, Vector4> SpawnPositions => Scp559Cake.Spawnpoints;
+        public static Dictionary<RoomName, Vector4> SpawnPositions { get; } = Scp559Spawnpoint.InstancesPerRoom.ToDictionary(kvp => kvp.Key.Name, kvp =>
+        {
+            Transform roomTransform = kvp.Key.transform;
+            Transform spawnTransform = kvp.Value.transform;
+
+            Vector3 localPos = roomTransform.InverseTransformPoint(spawnTransform.position);
+
+            return new Vector4(localPos.x, localPos.y, localPos.z, spawnTransform.eulerAngles.y);
+        });
 
         /// <summary>
         /// Gets the list of all available spawnpoints.
         /// </summary>
-        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossiblePositions;
+        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossibleSpawnpoints.Select(spawnpoint =>
+        {
+            Transform t = spawnpoint.transform;
+            return new Vector4(t.position.x, t.position.y, t.position.z, t.eulerAngles.y);
+        }).ToList();
 
         /// <summary>
         /// Gets or sets offset for spawning near pedestals.
         /// </summary>
         public static Vector3 PedestalOffset
         {
-            get => Scp559Cake.PedestalOffset;
-            set => Scp559Cake.PedestalOffset.Set(value.x, value.y, value.z);
+            get => new(0, -Scp559Spawnpoint.PedestalHeight, 0);
+
+            [Obsolete("Setter no longer works")]
+            set { }
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.API/Features/Server.cs b/EXILED/Exiled.API/Features/Server.cs
index 96b8311fdf..825cfb3566 100644
--- a/EXILED/Exiled.API/Features/Server.cs
+++ b/EXILED/Exiled.API/Features/Server.cs
@@ -111,7 +111,27 @@ public static string Name
         /// <summary>
         /// Gets the actual ticks per second of the server.
         /// </summary>
-        public static double Tps => Math.Round(1f / Time.smoothDeltaTime);
+        public static double Tps
+        {
+            get
+            {
+                double delta = Time.deltaTime;
+
+                if (delta <= 0)
+                    return MaxTps;
+
+                double tps = 1d / delta;
+
+                tps = Math.Min(tps, MaxTps);
+
+                return tps;
+            }
+        }
+
+        /// <summary>
+        /// Gets the average ticks per second of the server.
+        /// </summary>
+        public static double SmoothTps => Math.Round(1f / Time.smoothDeltaTime);
 
         /// <summary>
         /// Gets or sets the max ticks per second of the server.
diff --git a/EXILED/Exiled.API/Features/Waves/TimedWave.cs b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
index 8856727c58..6e9a5c55bf 100644
--- a/EXILED/Exiled.API/Features/Waves/TimedWave.cs
+++ b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
@@ -193,13 +193,13 @@ public static List<TimedWave> GetTimedWaves()
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
-        public void PlayAnnouncement() => Announcement?.PlayAnnouncement(new());
+        public void PlayAnnouncement() => Announcement?.PlayAnnouncement([], Base as IAnnouncedWave);
 
         /// <summary>
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
         /// <param name="players">The list of Player to spawn.</param>
-        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList());
+        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList(), Base as IAnnouncedWave);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Window.cs b/EXILED/Exiled.API/Features/Window.cs
index e5a1624e0d..2d327ff0c4 100644
--- a/EXILED/Exiled.API/Features/Window.cs
+++ b/EXILED/Exiled.API/Features/Window.cs
@@ -231,6 +231,7 @@ public void DamageWindow(float amount, DamageHandlerBase handler)
                 RoomType.HczEzCheckpointB => GlassType.HczEzCheckpointB,
                 RoomType.EzGateA when Base.name[7] == '5' => GlassType.GateAArmory,
                 RoomType.EzGateA => GlassType.GateAPit,
+                RoomType.HczLoadingBay => GlassType.HczLoadingBay,
                 _ => GlassType.Unknown,
             },
             "Window" => Room?.Type switch
diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
index fa39569e0a..182f47155e 100644
--- a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
@@ -1013,15 +1013,6 @@ private void OnInternalOwnerHandcuffing(HandcuffingEventArgs ev)
                     continue;
 
                 OnOwnerHandcuffing(new OwnerHandcuffingEventArgs(item, ev));
-
-                if (!ev.IsAllowed)
-                    continue;
-
-                ev.Target.RemoveItem(item);
-
-                TrackedSerials.Remove(item.Serial);
-
-                Spawn(ev.Target, item, ev.Target);
             }
         }
 
diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index f29e2d525c..afce01ccdf 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -790,6 +790,12 @@ public bool TryAddFriendlyFire(Dictionary<RoleTypeId, float> ffRules, bool overw
             return true;
         }
 
+        /// <summary>
+        /// Returns the CustomRole in a human-readable format.
+        /// </summary>
+        /// <returns>A string containing CustomRole-related data.</returns>
+        public override string ToString() => $"{Name} ({Id})";
+
         /// <summary>
         /// Tries to register this role.
         /// </summary>
diff --git a/EXILED/Exiled.CustomRoles/Commands/Get.cs b/EXILED/Exiled.CustomRoles/Commands/Get.cs
new file mode 100644
index 0000000000..7d96d5f6b4
--- /dev/null
+++ b/EXILED/Exiled.CustomRoles/Commands/Get.cs
@@ -0,0 +1,123 @@
+// -----------------------------------------------------------------------
+// <copyright file="Get.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.CustomRoles.Commands
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Linq;
+    using System.Text;
+
+    using CommandSystem;
+    using Exiled.API.Extensions;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.CustomRoles.API;
+    using Exiled.CustomRoles.API.Features;
+    using Exiled.Permissions.Extensions;
+    using HarmonyLib;
+
+    /// <summary>
+    /// The command to get specified player(s) current custom roles.
+    /// </summary>
+    internal sealed class Get : ICommand
+    {
+        private Get()
+        {
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Get"/> command instance.
+        /// </summary>
+        public static Get Instance { get; } = new();
+
+        /// <inheritdoc/>
+        public string Command => "get";
+
+        /// <inheritdoc/>
+        public string[] Aliases { get; } = Array.Empty<string>();
+
+        /// <inheritdoc/>
+        public string Description => "Gets the specified player(s)' current custom role(s).";
+
+        /// <inheritdoc/>
+        public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
+        {
+            if (!sender.CheckPermission("customroles.get"))
+            {
+                response = "Permission Denied, required: customroles.get";
+                return false;
+            }
+
+            List<Player> players = ListPool<Player>.Pool.Get();
+
+            if (arguments.Count > 0)
+            {
+                string identifier = string.Join(" ", arguments);
+
+                switch (identifier.ToLower())
+                {
+                    case "*":
+                    case "all":
+                        players.AddRange(Player.List);
+                        break;
+                    default:
+                        players.AddRange(Player.GetProcessedData(arguments));
+                        break;
+                }
+
+                if (players.IsEmpty())
+                {
+                    if (arguments.Count > 0 || !Player.TryGet(sender, out Player player))
+                    {
+                        response = $"Player not found: {identifier}";
+                        return false;
+                    }
+
+                    players.Add(player);
+                }
+            }
+            else
+            {
+                response = "get <Nickname/PlayerID/UserID/all/*>";
+                return false;
+            }
+
+            StringBuilder builder = StringBuilderPool.Pool.Get();
+
+            builder.AppendLine();
+            builder.AppendLine("====================== Custom Roles ======================");
+
+            foreach (Player target in players)
+            {
+                ReadOnlyCollection<CustomRole> roles = target.GetCustomRoles();
+                builder.Append((target.DisplayNickname + (target.HasCustomName ? $" ({target.Nickname})" : string.Empty)).PadRight(30 + (target.HasCustomName ? 23 : 0)));
+                builder.Append(" ");
+                builder.Append($"({target.Id})".PadRight(5));
+                if (roles.IsEmpty())
+                {
+                    builder.AppendLine(" | No Custom Role");
+                }
+                else
+                {
+                    // builder.Append($" | [{string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>"))}]");
+                    builder.Append(" | [");
+                    builder.Append(string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>")));
+                    builder.AppendLine("]");
+                }
+            }
+
+            builder.AppendLine("==========================================================");
+
+            ListPool<Player>.Pool.Return(players);
+
+            response = StringBuilderPool.Pool.ToStringReturn(builder);
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.CustomRoles/Commands/Give.cs b/EXILED/Exiled.CustomRoles/Commands/Give.cs
index 2f74b46498..9666bff990 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Give.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Give.cs
@@ -83,7 +83,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
 
                 string identifier = string.Join(" ", arguments.Skip(1));
 
-                switch (identifier)
+                switch (identifier.ToLower())
                 {
                     case "*":
                     case "all":
diff --git a/EXILED/Exiled.CustomRoles/Commands/Parent.cs b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
index f64facabec..fd42b5e497 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Parent.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
@@ -41,12 +41,13 @@ public override void LoadGeneratedCommands()
             RegisterCommand(Give.Instance);
             RegisterCommand(Info.Instance);
             RegisterCommand(List.List.Instance);
+            RegisterCommand(Get.Instance);
         }
 
         /// <inheritdoc/>
         protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            response = "Invalid subcommand! Available: give, info, list";
+            response = "Invalid subcommand! Available: give, info, list, get";
             return false;
         }
     }
diff --git a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
index 78b2030580..cd1a8b4769 100644
--- a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
+++ b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
@@ -49,4 +49,4 @@
         <PostBuildEvent>if [[ ! -z "$EXILED_DEV_REFERENCES" ]]; then cp "$(OutputPath)$(AssemblyName).dll" "$EXILED_DEV_REFERENCES/Plugins/"; fi</PostBuildEvent>
     </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Commands/TpsCommand.cs b/EXILED/Exiled.Events/Commands/TpsCommand.cs
index 722de3b61e..14c0def05e 100644
--- a/EXILED/Exiled.Events/Commands/TpsCommand.cs
+++ b/EXILED/Exiled.Events/Commands/TpsCommand.cs
@@ -15,7 +15,6 @@ namespace Exiled.Events.Commands
     /// <summary>
     /// Command for showing current server TPS.
     /// </summary>
-    [CommandHandler(typeof(RemoteAdminCommandHandler))]
     [CommandHandler(typeof(GameConsoleCommandHandler))]
     public class TpsCommand : ICommand
     {
@@ -31,7 +30,7 @@ public class TpsCommand : ICommand
         /// <inheritdoc />
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            double diff = Server.Tps / Server.MaxTps;
+            double diff = Server.SmoothTps / Server.MaxTps;
             string color = diff switch
             {
                 > 0.9 => "green",
@@ -39,7 +38,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 _ => "red"
             };
 
-            response = $"<color={color}>{Server.Tps}/{Server.MaxTps}</color>";
+            response = $"<color={color}>{Server.SmoothTps}/{Server.MaxTps}</color>";
             return true;
         }
     }
diff --git a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
index a8b986c171..abd2f4877f 100644
--- a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
@@ -7,39 +7,70 @@
 
 namespace Exiled.Events.EventArgs.Cassie
 {
+    using System;
+    using System.Text;
+
+    using Exiled.API.Features.Pools;
+    using global::Cassie;
     using Interfaces;
+    using Subtitles;
 
     /// <summary>
     /// Contains all the information after sending a C.A.S.S.I.E. message.
     /// </summary>
     public class SendingCassieMessageEventArgs : IDeniableEvent
     {
+        private readonly CassieAnnouncement announcement;
+        private readonly CassieTtsPayload payload;
+
+        private string customSubtitles;
+        private float glitchScale;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SendingCassieMessageEventArgs" /> class.
         /// </summary>
-        /// <param name="words">
-        /// <inheritdoc cref="Words" />
-        /// </param>
-        /// <param name="makeHold">
-        /// <inheritdoc cref="MakeHold" />
-        /// </param>
-        /// <param name="makeNoise">
-        /// <inheritdoc cref="MakeNoise" />
+        /// <param name="annc">The announcement to populate all properties from.</param>
+        /// <param name="isAllowed">
+        /// <inheritdoc cref="IsAllowed"/>
         /// </param>
-        /// <param name="customAnnouncement">
-        /// <inheritdoc cref="IsCustomAnnouncement" />
-        /// </param>
-        /// <param name="customSubtitles">
-        /// <inheritdoc cref="CustomSubtitles" />
-        /// </param>
-        /// <param name="isAllowed">Indicates whether the event can be executed.</param>
-        public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise, bool customAnnouncement, string customSubtitles, bool isAllowed = true)
+        public SendingCassieMessageEventArgs(CassieAnnouncement annc, bool isAllowed = true)
         {
-            Words = words;
-            CustomSubtitles = customSubtitles;
-            MakeHold = makeHold;
-            MakeNoise = makeNoise;
-            IsCustomAnnouncement = customAnnouncement;
+            announcement = annc;
+            payload = annc.Payload;
+
+            Words = payload.Content;
+            switch (payload.SubtitleSource)
+            {
+                case CassieTtsPayload.SubtitleMode.None:
+                case CassieTtsPayload.SubtitleMode.Automatic:
+                    CustomSubtitles = string.Empty;
+                    break;
+                case CassieTtsPayload.SubtitleMode.Custom:
+                    CustomSubtitles = payload._customSubtitle;
+                    break;
+                case CassieTtsPayload.SubtitleMode.FromTranslation:
+                    StringBuilder builder = StringBuilderPool.Pool.Get();
+                    SubtitleController controller = SubtitleController.Singleton;
+
+                    foreach (SubtitlePart part in payload._subtitleMessage.SubtitleParts)
+                    {
+                        Subtitle subtitle = controller.Subtitles[part.Subtitle];
+                        builder.Append(controller.GetTranslation(subtitle));
+                    }
+
+                    CustomSubtitles = StringBuilderPool.Pool.ToStringReturn(builder);
+
+                    break;
+                default:
+                    CustomSubtitles = string.Empty;
+                    break;
+            }
+
+            MakeHold = payload.PlayBackground;
+            GlitchScale = annc.GlitchScale;
+            MakeNoise = annc.GlitchScale is not 0;
+            SubtitleSource = payload.SubtitleSource;
+
             IsAllowed = isAllowed;
         }
 
@@ -51,13 +82,38 @@ public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise
         /// <summary>
         /// Gets or sets the message subtitles.
         /// </summary>
-        public string CustomSubtitles { get; set; }
+        public string CustomSubtitles
+        {
+            get => customSubtitles;
+            set
+            {
+                if (customSubtitles != value)
+                    SubtitleSource = CassieTtsPayload.SubtitleMode.Custom;
+
+                customSubtitles = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether the message should be held.
         /// </summary>
         public bool MakeHold { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value controlling how glitchy this CASSIE message is.
+        /// </summary>
+        public float GlitchScale
+        {
+            get => glitchScale;
+            set
+            {
+                if (!MakeNoise && value is not 0)
+                    MakeNoise = true;
+
+                glitchScale = value;
+            }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether the message should make noise.
         /// </summary>
@@ -69,8 +125,50 @@ public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise
         public bool IsAllowed { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the message can be sent.
+        /// Gets or sets a value indicating whether the event can be executed.
         /// </summary>
+        [Obsolete("Useless and will be removed in Exiled 10.")]
         public bool IsCustomAnnouncement { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating where the subtitles for this message came from.
+        /// </summary>
+        public CassieTtsPayload.SubtitleMode SubtitleSource { get; set; }
+
+        /// <summary>
+        /// Gets a <see cref="CassieAnnouncement"/> consisting of all properties in this event.
+        /// </summary>
+        public CassieAnnouncement Announcement
+        {
+            get
+            {
+                CassieTtsPayload newPayload;
+
+                // I love readonly fields :)
+                if (SubtitleSource is CassieTtsPayload.SubtitleMode.FromTranslation)
+                {
+                    newPayload = new CassieTtsPayload(Words, MakeHold, payload._subtitleMessage.SubtitleParts);
+                }
+                else
+                {
+                    if (SubtitleSource is CassieTtsPayload.SubtitleMode.Automatic)
+                        newPayload = new CassieTtsPayload(Words, true, MakeHold);
+                    else
+                        newPayload = new CassieTtsPayload(Words, CustomSubtitles, MakeHold);
+                }
+
+                return announcement switch
+                {
+                    CassieScpTerminationAnnouncement =>
+
+                        // this is disabled via patch b/c termination messages are not modifiable at the stage the SendCassieMessage patch is in.
+                        throw new InvalidOperationException("SendCassieMessage was called for a SCP termination message!"),
+
+                    CassieWaveAnnouncement waveAnnc => new CassieWaveAnnouncement(waveAnnc.Wave, newPayload),
+                    Cassie079RecontainAnnouncement recontainAnnc => new Cassie079RecontainAnnouncement(recontainAnnc._callback, false, newPayload),
+                    _ => new CassieAnnouncement(newPayload, 0, GlitchScale / (API.Features.Warhead.IsDetonated ? 2F : 1F) * (MakeNoise ? 1F : 0F)),
+                };
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
new file mode 100644
index 0000000000..fdd41cef5b
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
@@ -0,0 +1,22 @@
+// -----------------------------------------------------------------------
+// <copyright file="IMarshmallowEvent.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Interfaces
+{
+    using Exiled.API.Features.Items;
+
+    /// <summary>
+    /// Represents all events related to the marshmallow man.
+    /// </summary>
+    public interface IMarshmallowEvent : IItemEvent
+    {
+        /// <summary>
+        /// Gets the marshmallow item related to this event.
+        /// </summary>
+        public Marshmallow Marshmallow { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
new file mode 100644
index 0000000000..616ad8f3e5
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
@@ -0,0 +1,20 @@
+// -----------------------------------------------------------------------
+// <copyright file="IScp127Event.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Interfaces
+{
+    /// <summary>
+    /// Represents all events related to SCP-127.
+    /// </summary>
+    public interface IScp127Event : IItemEvent
+    {
+        /// <summary>
+        /// Gets the SCP-127 instance, related to this event.
+        /// </summary>
+        public API.Features.Items.Scp127 Scp127 { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
index 1d6dcf3add..acb2463878 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
@@ -14,7 +14,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Event args used for all <see cref="Scp1507Role"/> related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp1507Event : IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
index d8a5537257..fc62383340 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
@@ -12,7 +12,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Defines the base contract for all <see cref="Scp559Cake"/> related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp559Event : IExiledEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
new file mode 100644
index 0000000000..8e491ee0b1
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
@@ -0,0 +1,50 @@
+// -----------------------------------------------------------------------
+// <copyright file="CacklingEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Item
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.MarshmallowMan;
+
+    /// <summary>
+    /// Contains all information before a marshmallow man punches.
+    /// </summary>
+    public class CacklingEventArgs : IMarshmallowEvent, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CacklingEventArgs"/> class.
+        /// </summary>
+        /// <param name="marshmallow">The marshmallow item of the player cackling.</param>
+        /// <param name="isAllowed">Whether the player is allowed to cackle.</param>
+        public CacklingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
+        {
+            Marshmallow = Item.Get<Marshmallow>(marshmallow);
+            Player = Marshmallow.Owner;
+            IsAllowed = isAllowed;
+        }
+
+        /// <summary>
+        /// Gets the player cackling.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <inheritdoc />
+        public API.Features.Items.Item Item => Marshmallow;
+
+        /// <summary>
+        /// Gets the marshmallow item of the player cackling.
+        /// </summary>
+        public Marshmallow Marshmallow { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the player is allowed to cackle.
+        /// </summary>
+        public bool IsAllowed { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
new file mode 100644
index 0000000000..d2d927d95a
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
@@ -0,0 +1,50 @@
+// -----------------------------------------------------------------------
+// <copyright file="PunchingEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Item
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.MarshmallowMan;
+
+    /// <summary>
+    /// Contains all information before a marshmallow man punches.
+    /// </summary>
+    public class PunchingEventArgs : IMarshmallowEvent, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PunchingEventArgs"/> class.
+        /// </summary>
+        /// <param name="marshmallow">The marshmallow item of the player attacking.</param>
+        /// <param name="isAllowed">Whether the player is allowed to punch.</param>
+        public PunchingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
+        {
+            Marshmallow = Item.Get<Marshmallow>(marshmallow);
+            Player = Marshmallow.Owner;
+            IsAllowed = isAllowed;
+        }
+
+        /// <summary>
+        /// Gets the player punching.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <inheritdoc />
+        public Item Item => Marshmallow;
+
+        /// <summary>
+        /// Gets the marshmallow item of the player punching.
+        /// </summary>
+        public Marshmallow Marshmallow { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the punch is allowed.
+        /// </summary>
+        public bool IsAllowed { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
index 4c43eb1df8..d8d38cc474 100644
--- a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
@@ -7,15 +7,13 @@
 
 namespace Exiled.Events.EventArgs.Map
 {
+    using System;
+
     using API.Features;
     using API.Features.DamageHandlers;
     using API.Features.Roles;
-
     using Interfaces;
 
-    using CustomAttackerHandler = API.Features.DamageHandlers.AttackerDamageHandler;
-    using DamageHandlerBase = PlayerStatsSystem.DamageHandlerBase;
-
     /// <summary>
     /// Contains all information before C.A.S.S.I.E announces an SCP termination.
     /// </summary>
@@ -27,16 +25,14 @@ public class AnnouncingScpTerminationEventArgs : IAttackerEvent, IDeniableEvent
         /// <param name="scp">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="damageHandlerBase">
-        /// <inheritdoc cref="DamageHandler" />
+        /// <param name="terminationCause">
+        /// <inheritdoc cref="TerminationCause"/>
         /// </param>
-        public AnnouncingScpTerminationEventArgs(Player scp, DamageHandlerBase damageHandlerBase)
+        public AnnouncingScpTerminationEventArgs(Player scp, string terminationCause)
         {
             Player = scp;
             Role = scp.Role;
-            DamageHandler = new CustomDamageHandler(scp, damageHandlerBase);
-            Attacker = DamageHandler.BaseIs(out CustomAttackerHandler customAttackerHandler) ? customAttackerHandler.Attacker : null;
-            TerminationCause = damageHandlerBase.CassieDeathAnnouncement.Announcement;
+            TerminationCause = terminationCause;
             IsAllowed = true;
         }
 
@@ -58,11 +54,13 @@ public AnnouncingScpTerminationEventArgs(Player scp, DamageHandlerBase damageHan
         /// <summary>
         /// Gets the player who killed the SCP.
         /// </summary>
+        [Obsolete("Attacker can no longer be acquired for this event. This will be readded in a different event.")]
         public Player Attacker { get; }
 
         /// <summary>
         /// Gets or sets the <see cref="CustomDamageHandler" />.
         /// </summary>
+        [Obsolete("DamageHandler can no longer be acquired for this event. This will be readded in a different event.")]
         public CustomDamageHandler DamageHandler { get; set; }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
index 168a0f578e..038a3e16c4 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
@@ -18,8 +18,6 @@ namespace Exiled.Events.EventArgs.Player
     /// </summary>
     public class ReceivingEffectEventArgs : IPlayerEvent, IDeniableEvent
     {
-        private byte intensity;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ReceivingEffectEventArgs" /> class.
         /// </summary>
@@ -32,9 +30,9 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         {
             Player = player;
             Effect = effect;
-            this.intensity = intensity;
+            Intensity = intensity;
             CurrentIntensity = currentIntensity;
-            Duration = duration;
+            Duration = intensity is 0 ? 0 : duration;
         }
 
         /// <summary>
@@ -53,20 +51,9 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         public float Duration { get; set; } = 0;
 
         /// <summary>
-        /// Gets or sets the value of the new intensity of the effect. Setting this to <c>0</c> is the same as setting IsAllowed to
-        /// <see langword="false" />.
+        /// Gets or sets the value of the new intensity of the effect.
         /// </summary>
-        public byte Intensity
-        {
-            get => intensity;
-            set
-            {
-                intensity = value;
-
-                if (intensity == 0)
-                    IsAllowed = false;
-            }
-        }
+        public byte Intensity { get; set; }
 
         /// <summary>
         /// Gets the value of the intensity of this effect on the player.
diff --git a/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
new file mode 100644
index 0000000000..6dce01109c
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
@@ -0,0 +1,41 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp1576TransmissionEndedEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Player
+{
+    using API.Features;
+    using API.Features.Items;
+    using Interfaces;
+    using InventorySystem.Items.Usables.Scp1576;
+
+    /// <summary>
+    /// Contains all information after a SCP-1576 transmission has ended.
+    /// </summary>
+    public class Scp1576TransmissionEndedEventArgs : IPlayerEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp1576TransmissionEndedEventArgs"/> class.
+        /// </summary>
+        /// <param name="player"><inheritdoc cref="Player"/></param>
+        /// <param name="scp1576Item"><inheritdoc cref="Scp1576"/></param>
+        public Scp1576TransmissionEndedEventArgs(Player player, Scp1576Item scp1576Item)
+        {
+            Player = player;
+            Scp1576 = Item.Get<Scp1576>(scp1576Item);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Exiled.API.Features.Player"/> that the transmission ended for.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Exiled.API.Features.Items.Scp1576"/> instance.
+        /// </summary>
+        public Exiled.API.Features.Items.Scp1576 Scp1576 { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
index e25e9fd728..c6aeed7ffb 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
@@ -28,10 +28,14 @@ public class UsedItemEventArgs : IPlayerEvent, IUsableEvent
         /// <param name="item">
         /// <inheritdoc cref="Item" />
         /// </param>
-        public UsedItemEventArgs(ReferenceHub player, UsableItem item)
+        /// <param name="causedByHolstering">
+        /// <inheritdoc cref="CausedByHolstering"/>
+        /// </param>
+        public UsedItemEventArgs(ReferenceHub player, UsableItem item, bool causedByHolstering)
         {
             Player = Player.Get(player);
-            Usable = Item.Get(item) is Usable usable ? usable : null;
+            Usable = Item.Get(item) as Usable;
+            CausedByHolstering = causedByHolstering;
         }
 
         /// <summary>
@@ -46,5 +50,11 @@ public UsedItemEventArgs(ReferenceHub player, UsableItem item)
         /// Gets the player who used the item.
         /// </summary>
         public Player Player { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this event was triggered by a player switching items (true) or by waiting after using the item (false).
+        /// </summary>
+        /// <remarks>Use this value if you wish to keep the bug where you could switch items quickly to skip this event.</remarks>
+        public bool CausedByHolstering { get; }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
new file mode 100644
index 0000000000..533ccbb5ce
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
@@ -0,0 +1,51 @@
+// -----------------------------------------------------------------------
+// <copyright file="GainedExperienceEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information before SCP-127 gains experience.
+    /// </summary>
+    public class GainedExperienceEventArgs : IScp127Event
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GainedExperienceEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="experience"><inheritdoc cref="Experience"/></param>
+        public GainedExperienceEventArgs(Scp127 scp127, float experience)
+        {
+            Scp127 = scp127;
+            Experience = experience;
+            Tier = Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
+        }
+
+        /// <inheritdoc />
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc />
+        public Item Item => Scp127;
+
+        /// <inheritdoc />
+        public Scp127 Scp127 { get; }
+
+        /// <summary>
+        /// Gets the experience that SCP-127 has gained.
+        /// </summary>
+        public float Experience { get; }
+
+        /// <summary>
+        /// Gets the tier.
+        /// </summary>
+        public Scp127Tier Tier { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
new file mode 100644
index 0000000000..6a1d7b738b
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
@@ -0,0 +1,59 @@
+// -----------------------------------------------------------------------
+// <copyright file="GainingExperienceEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information before SCP-127 gains experience.
+    /// </summary>
+    public class GainingExperienceEventArgs : IScp127Event, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GainingExperienceEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="experience"><inheritdoc cref="Experience"/></param>
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public GainingExperienceEventArgs(Scp127 scp127, float experience, bool isAllowed = true)
+        {
+            Scp127 = scp127;
+            Experience = experience;
+            IsAllowed = isAllowed;
+        }
+
+        /// <inheritdoc />
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc />
+        public Item Item => Scp127;
+
+        /// <inheritdoc />
+        public Scp127 Scp127 { get; }
+
+        /// <inheritdoc />
+        public bool IsAllowed { get; set; }
+
+        /// <summary>
+        /// Gets or sets the gaining experience.
+        /// </summary>
+        public float Experience { get; set; }
+
+        /// <summary>
+        /// Gets or sets the new tier.
+        /// </summary>
+        public Scp127Tier Tier
+        {
+            get => Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
+            set => Experience = Scp127.TierManagerModule.GetExpForTier(value) - Scp127.Experience;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
new file mode 100644
index 0000000000..10810403d5
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
@@ -0,0 +1,52 @@
+// -----------------------------------------------------------------------
+// <copyright file="TalkedEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information after SCP-127 voice line is played.
+    /// </summary>
+    public class TalkedEventArgs : IScp127Event
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TalkedEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
+        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
+        public TalkedEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority)
+        {
+            Scp127 = scp127;
+            VoiceLine = voiceLine;
+            Priority = voiceLinePriority;
+        }
+
+        /// <inheritdoc/>
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc/>
+        public Item Item => Scp127;
+
+        /// <inheritdoc/>
+        public Scp127 Scp127 { get; }
+
+        /// <summary>
+        /// Gets a voice line which is played.
+        /// </summary>
+        public Scp127VoiceLinesTranslation VoiceLine { get; }
+
+        /// <summary>
+        /// Gets a priority for this play.
+        /// </summary>
+        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
new file mode 100644
index 0000000000..b8934566a8
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
@@ -0,0 +1,57 @@
+// -----------------------------------------------------------------------
+// <copyright file="TalkingEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information before SCP-127 voice line is played.
+    /// </summary>
+    public class TalkingEventArgs : IScp127Event, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TalkingEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
+        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public TalkingEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority, bool isAllowed = true)
+        {
+            Scp127 = scp127;
+            VoiceLine = voiceLine;
+            Priority = voiceLinePriority;
+            IsAllowed = isAllowed;
+        }
+
+        /// <inheritdoc/>
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc/>
+        public Item Item => Scp127;
+
+        /// <inheritdoc/>
+        public Scp127 Scp127 { get; }
+
+        /// <inheritdoc/>
+        public bool IsAllowed { get; set; }
+
+        /// <summary>
+        /// Gets or sets a voice line which is played.
+        /// </summary>
+        public Scp127VoiceLinesTranslation VoiceLine { get; set; }
+
+        /// <summary>
+        /// Gets or sets a priority for this play.
+        /// </summary>
+        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
index c58330e252..c6ea947e55 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
@@ -18,7 +18,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 attacks door.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class AttackingDoorEventArgs : IScp1507Event, IDeniableEvent, IDoorEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
index ae5ebb8450..7ab56f98e2 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class ScreamingEventArgs : IScp1507Event, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
index 376eba5abf..5cc50f9352 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
@@ -19,7 +19,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before flamingos get spawned.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningFlamingosEventArgs : IDeniableEvent, IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
index 0121d02d95..10b713052e 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class UsingTapeEventArgs : IPlayerEvent, IItemEvent, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
new file mode 100644
index 0000000000..d4935e6c92
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
@@ -0,0 +1,40 @@
+// -----------------------------------------------------------------------
+// <copyright file="FoundPositionEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp2536
+{
+    using Christmas.Scp2536;
+    using Exiled.API.Features;
+    using Exiled.Events.EventArgs.Interfaces;
+
+    /// <summary>
+    /// Contains all information after SCP-2536 chooses target for spawning.
+    /// </summary>
+    public class FoundPositionEventArgs : IPlayerEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FoundPositionEventArgs"/> class.
+        /// </summary>
+        /// <param name="player"><inheritdoc cref="Player"/></param>
+        /// <param name="spawnpoint"><inheritdoc cref="Spawnpoint"/></param>
+        public FoundPositionEventArgs(Player player, Scp2536Spawnpoint spawnpoint)
+        {
+            Player = player;
+            Spawnpoint = spawnpoint;
+        }
+
+        /// <summary>
+        /// Gets the player near whom SCP-2536 will spawn.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <summary>
+        /// Gets or sets the spawn point where SCP will spawn.
+        /// </summary>
+        public Scp2536Spawnpoint Spawnpoint { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
index b8b99f9ac9..1a4a7408dc 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
@@ -15,7 +15,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before a player interacts with SCP-559.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerEvent
     {
         /// <summary>
@@ -23,12 +23,11 @@ public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerE
         /// </summary>
         /// <param name="scp559"><inheritdoc cref="Scp559"/></param>
         /// <param name="player"><inheritdoc cref="Player"/></param>
-        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
-        public InteractingScp559EventArgs(Scp559 scp559, Player player, bool isAllowed = true)
+        public InteractingScp559EventArgs(Scp559 scp559, Player player)
         {
             Player = player;
             Scp559 = scp559;
-            IsAllowed = isAllowed;
+            IsAllowed = scp559.RemainingSlices > 0 && PlayerRoles.PlayerRolesUtils.IsHuman(player.Role.Type);
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
index 6e3a81f06a..c83baddd2c 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before SCP-559 spawns.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningEventArgs : IDeniableEvent, IScp559Event
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Events.cs b/EXILED/Exiled.Events/Events.cs
index a1bdd040a2..adae6e21a8 100644
--- a/EXILED/Exiled.Events/Events.cs
+++ b/EXILED/Exiled.Events/Events.cs
@@ -21,6 +21,7 @@ namespace Exiled.Events
     using PlayerRoles.FirstPersonControl.NetworkMessages;
     using PlayerRoles.Ragdolls;
     using PlayerRoles.RoleAssign;
+
     using Respawning;
     using UnityEngine.SceneManagement;
     using UserSettings.ServerSpecific;
@@ -73,6 +74,7 @@ public override void OnEnabled()
             Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
             Handlers.Map.ChangedIntoGrenade += Handlers.Internal.ExplodingGrenade.OnChangedIntoGrenade;
+            Handlers.Warhead.Detonated += Handlers.Internal.Round.OnWarheadDetonated;
 
             RoleAssigner.OnPlayersSpawned += Handlers.Server.OnAllPlayersSpawned;
             CharacterClassManager.OnRoundStarted += Handlers.Server.OnRoundStarted;
@@ -95,6 +97,11 @@ public override void OnEnabled()
 
             FpcServerPositionDistributor.RoleSyncEvent += Handlers.Internal.Round.OnRoleSyncEvent;
 
+            LabApi.Events.Handlers.Scp127Events.Talking += Handlers.Scp127.OnTalking;
+            LabApi.Events.Handlers.Scp127Events.Talked += Handlers.Scp127.OnTalked;
+            LabApi.Events.Handlers.Scp127Events.GainingExperience += Handlers.Scp127.OnGainingExperience;
+            LabApi.Events.Handlers.Scp127Events.GainExperience += Handlers.Scp127.OnGainedExperience;
+
             ServerConsole.ReloadServerName();
         }
 
@@ -135,6 +142,11 @@ public override void OnDisabled()
             LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon -= Handlers.Player.OnUnloadingWeapon;
 
             FpcServerPositionDistributor.RoleSyncEvent -= Handlers.Internal.Round.OnRoleSyncEvent;
+
+            LabApi.Events.Handlers.Scp127Events.Talking -= Handlers.Scp127.OnTalking;
+            LabApi.Events.Handlers.Scp127Events.Talked -= Handlers.Scp127.OnTalked;
+            LabApi.Events.Handlers.Scp127Events.GainingExperience -= Handlers.Scp127.OnGainingExperience;
+            LabApi.Events.Handlers.Scp127Events.GainExperience -= Handlers.Scp127.OnGainedExperience;
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 4cedb7a21e..ff2833b79b 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -29,6 +29,7 @@ namespace Exiled.Events.Handlers.Internal
     using InventorySystem.Items.Firearms.Attachments.Components;
     using InventorySystem.Items.Usables;
     using InventorySystem.Items.Usables.Scp244.Hypothermia;
+    using InventorySystem.Items.Usables.Scp330;
     using Mirror;
     using PlayerRoles;
     using PlayerRoles.FirstPersonControl;
@@ -43,7 +44,7 @@ namespace Exiled.Events.Handlers.Internal
     internal static class Round
     {
         /// <inheritdoc cref="Handlers.Player.OnUsedItem" />
-        public static void OnServerOnUsingCompleted(ReferenceHub hub, UsableItem usable) => Handlers.Player.OnUsedItem(new (hub, usable));
+        public static void OnServerOnUsingCompleted(ReferenceHub hub, UsableItem usable) => Handlers.Player.OnUsedItem(new (hub, usable, false));
 
         /// <inheritdoc cref="Handlers.Server.OnWaitingForPlayers" />
         public static void OnWaitingForPlayers()
@@ -108,6 +109,9 @@ public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
             if (ev.Role.IsDead() || !ev.Role.IsFpcRole())
                 ev.IsAllowed = false;
+
+            if (ev.DamageHandlerBase is Exiled.Events.Patches.Fixes.FixMarshmallowManFF fixMarshamllowManFf)
+                ev.DamageHandlerBase = fixMarshamllowManFf.MarshmallowItem.NewDamageHandler;
         }
 
         /// <inheritdoc cref="Scp049.OnActivatingSense(ActivatingSenseEventArgs)" />
@@ -136,7 +140,7 @@ public static void OnVerified(VerifiedEventArgs ev)
             }
 
             // Fix bug that player that Join do not receive information about other players Scale
-            foreach (Player player in Player.Enumerable)
+            foreach (Player player in ReferenceHub.AllHubs.Select(Player.Get))
             {
                 player.SetFakeScale(player.Scale, new List<Player>() { ev.Player });
 
@@ -178,6 +182,13 @@ public static RoleTypeId OnRoleSyncEvent(ReferenceHub viewerHub, ReferenceHub ow
             return actualRole;
         }
 
+        /// <inheritdoc cref="Handlers.Warhead.OnDetonated()"/>
+        public static void OnWarheadDetonated()
+        {
+            // fix for black candy
+            CandyBlack.Outcomes.RemoveAll(outcome => outcome is TeleportOutcome);
+        }
+
         private static void GenerateAttachments()
         {
             foreach (FirearmType firearmType in EnumUtils<FirearmType>.Values)
diff --git a/EXILED/Exiled.Events/Handlers/Item.cs b/EXILED/Exiled.Events/Handlers/Item.cs
index 9ac83aafd3..b1ca257f09 100644
--- a/EXILED/Exiled.Events/Handlers/Item.cs
+++ b/EXILED/Exiled.Events/Handlers/Item.cs
@@ -89,6 +89,16 @@ public static class Item
         /// </summary>
         public static Event<JailbirdChangedWearStateEventArgs> JailbirdChangedWearState { get; set; } = new();
 
+        /// <summary>
+        /// Invoked before a marshmallow man punches.
+        /// </summary>
+        public static Event<PunchingEventArgs> Punching { get; set; } = new();
+
+        /// <summary>
+        /// Invoked before a marshmallow man cackles.
+        /// </summary>
+        public static Event<CacklingEventArgs> Cackling { get; set; } = new();
+
         /// <summary>
         /// Called before the Jailbird's <see cref="InventorySystem.Items.Jailbird.JailbirdWearState"/> is changed.
         /// </summary>
@@ -173,5 +183,17 @@ public static class Item
         /// </summary>
         /// <param name="ev">The <see cref="InspectedItemEventArgs"/> instance.</param>
         public static void OnInspectedItem(InspectedItemEventArgs ev) => InspectedItem.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called before a marshmallow man punches.
+        /// </summary>
+        /// <param name="ev">The <see cref="PunchingEventArgs"/> instance.</param>
+        public static void OnPunching(PunchingEventArgs ev) => Punching.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called before a marshmallow man cackles.
+        /// </summary>
+        /// <param name="ev">The <see cref="CacklingEventArgs"/> instance.</param>
+        public static void OnCackling(CacklingEventArgs ev) => Cackling.InvokeSafely(ev);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs
index 97e6137003..998b54f813 100644
--- a/EXILED/Exiled.Events/Handlers/Player.cs
+++ b/EXILED/Exiled.Events/Handlers/Player.cs
@@ -621,6 +621,11 @@ public class Player
         /// </summary>
         public static Event<InteractingEmergencyButtonEventArgs> InteractingEmergencyButton { get; set; } = new();
 
+        /// <summary>
+        /// Invoked after transmission has ended.
+        /// </summary>
+        public static Event<Scp1576TransmissionEndedEventArgs> Scp1576TransmissionEnded { get; set; } = new();
+
         /// <summary>
         /// Called before a player's emotion changed.
         /// </summary>
@@ -1356,5 +1361,11 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item
         /// </summary>
         /// <param name="ev">The <see cref="InteractingEmergencyButtonEventArgs"/> instance.</param>
         public static void OnInteractingEmergencyButton(InteractingEmergencyButtonEventArgs ev) => InteractingEmergencyButton.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called after a 1576 transmisiion has ended.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp1576TransmissionEndedEventArgs"/> instance.</param>
+        public static void OnScp1576TransmissionEnded(Scp1576TransmissionEndedEventArgs ev) => Scp1576TransmissionEnded.InvokeSafely(ev);
     }
 }
diff --git a/EXILED/Exiled.Events/Handlers/Scp127.cs b/EXILED/Exiled.Events/Handlers/Scp127.cs
new file mode 100644
index 0000000000..b3f86534d3
--- /dev/null
+++ b/EXILED/Exiled.Events/Handlers/Scp127.cs
@@ -0,0 +1,81 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Handlers
+{
+    using Exiled.Events.EventArgs.Scp127;
+    using Exiled.Events.Features;
+    using LabApi.Events.Arguments.Scp127Events;
+
+#pragma warning disable SA1623
+    /// <summary>
+    /// SCP-127 event handlers.
+    /// </summary>
+    public static class Scp127
+    {
+        /// <summary>
+        /// Invoked before SCP-127 voice line is played.
+        /// </summary>
+        public static Event<TalkingEventArgs> Talking { get; set; } = new();
+
+        /// <summary>
+        /// Invoked after SCP-127 voice line is played.
+        /// </summary>
+        public static Event<TalkedEventArgs> Talked { get; set; } = new();
+
+        /// <summary>
+        /// Invoked before SCP-127 gains experience.
+        /// </summary>
+        public static Event<GainingExperienceEventArgs> GainingExperience { get; set; } = new();
+
+        /// <summary>
+        /// Invoked after SCP-127 gains experience.
+        /// </summary>
+        public static Event<GainedExperienceEventArgs> GainedExperience { get; set; } = new();
+
+        /// <summary>
+        /// Called before SCP-127 voice line is played.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127TalkingEventArgs"/> instance.</param>
+        public static void OnTalking(Scp127TalkingEventArgs ev)
+        {
+            TalkingEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority, ev.IsAllowed);
+            Talking.InvokeSafely(eventArgs);
+
+            ev.Priority = eventArgs.Priority;
+            ev.VoiceLine = eventArgs.VoiceLine;
+            ev.IsAllowed = eventArgs.IsAllowed;
+        }
+
+        /// <summary>
+        /// Called after SCP-127 voice line is played.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127TalkedEventArgs"/> instance.</param>
+        public static void OnTalked(Scp127TalkedEventArgs ev)
+            => Talked.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority));
+
+        /// <summary>
+        /// Called before SCP-127 gains experience.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127GainingExperienceEventArgs"/> instance.</param>
+        public static void OnGainingExperience(Scp127GainingExperienceEventArgs ev)
+        {
+            GainingExperienceEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain, ev.IsAllowed);
+            GainingExperience.InvokeSafely(eventArgs);
+
+            ev.ExperienceGain = eventArgs.Experience;
+            ev.IsAllowed = eventArgs.IsAllowed;
+        }
+
+        /// <summary>
+        /// Called after SCP-127 gains experience.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127GainExperienceEventArgs"/> instance.</param>
+        public static void OnGainedExperience(Scp127GainExperienceEventArgs ev) =>
+            GainedExperience.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain));
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Scp1507.cs b/EXILED/Exiled.Events/Handlers/Scp1507.cs
index 63e4536d2c..f36b16d633 100644
--- a/EXILED/Exiled.Events/Handlers/Scp1507.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp1507.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// SCP-1507 related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp1507
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp2536.cs b/EXILED/Exiled.Events/Handlers/Scp2536.cs
index 3f7dfd1c58..8c0d272583 100644
--- a/EXILED/Exiled.Events/Handlers/Scp2536.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp2536.cs
@@ -21,6 +21,11 @@ public static class Scp2536
         /// </summary>
         public static Event<FindingPositionEventArgs> FindingPosition { get; set; } = new();
 
+        /// <summary>
+        /// Invoked once SCP-2536 has found a spawn location.
+        /// </summary>
+        public static Event<FoundPositionEventArgs> FoundPosition { get; set; } = new();
+
         /// <summary>
         /// Invoked before SCP-2536 gives a gift to a player.
         /// </summary>
@@ -37,6 +42,12 @@ public static class Scp2536
         /// <param name="ev">The <see cref="FindingPositionEventArgs"/> instance.</param>
         public static void OnFindingPosition(FindingPositionEventArgs ev) => FindingPosition.InvokeSafely(ev);
 
+        /// <summary>
+        /// Called after SCP-2536 chooses a target.
+        /// </summary>
+        /// <param name="ev">The <see cref="FoundPositionEventArgs"/> instance.</param>
+        public static void OnFoundPosition(FoundPositionEventArgs ev) => FoundPosition.InvokeSafely(ev);
+
         /// <summary>
         /// Called before SCP-2536 gives a gift to a player.
         /// </summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp559.cs b/EXILED/Exiled.Events/Handlers/Scp559.cs
index b17f520c9d..70d5387520 100644
--- a/EXILED/Exiled.Events/Handlers/Scp559.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp559.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// All SCP-559 related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp559
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
index 0cb378ac02..1e7b55e3a8 100644
--- a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
@@ -8,87 +8,61 @@
 namespace Exiled.Events.Patches.Events.Cassie
 {
     using System.Collections.Generic;
+    using System.Linq;
     using System.Reflection.Emit;
 
     using API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Cassie;
-
+    using global::Cassie;
     using Handlers;
-
     using HarmonyLib;
     using Respawning;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="RespawnEffectsController.PlayCassieAnnouncement(string, bool, bool, bool, string)" />.
+    /// Patches <see cref="global::Cassie.CassieAnnouncementDispatcher.PlayNewAnnouncement(CassieAnnouncement)" />.
     /// Adds the <see cref="Cassie.SendingCassieMessage" /> event.
     /// </summary>
     [EventPatch(typeof(Cassie), nameof(Cassie.SendingCassieMessage))]
-    [HarmonyPatch(typeof(RespawnEffectsController), nameof(RespawnEffectsController.PlayCassieAnnouncement))]
+    [HarmonyPatch(typeof(CassieAnnouncementDispatcher), nameof(CassieAnnouncementDispatcher.PlayNewAnnouncement))]
     internal static class SendingCassieMessage
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
+            Label skipLabel = generator.DefineLabel();
             Label returnLabel = generator.DefineLabel();
 
+            newInstructions[0].WithLabels(skipLabel);
+
             newInstructions.InsertRange(
                 0,
                 new CodeInstruction[]
                 {
-                    // words
                     new(OpCodes.Ldarg_0),
+                    new(OpCodes.Isinst, typeof(CassieScpTerminationAnnouncement)),
+                    new(OpCodes.Brtrue_S, skipLabel),
 
-                    // makeHold
-                    new(OpCodes.Ldarg_1),
-
-                    // makeNoise
-                    new(OpCodes.Ldarg_2),
-
-                    // customAnnouncement
-                    new(OpCodes.Ldarg_3),
-
-                    // customSubtitles
-                    new(OpCodes.Ldarg_S, 4),
+                    new(OpCodes.Ldarg_0),
 
                     // isAllowed
                     new(OpCodes.Ldc_I4_1),
 
-                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(string, bool, bool, bool, string, bool);
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs))[0]),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
+                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(CassieAnnouncement, bool);
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs)).Single(ctor => ctor.GetParameters().Length == 2)),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),
 
                     // Cassie.OnSendingCassieMessage(ev);
                     new(OpCodes.Call, Method(typeof(Cassie), nameof(Cassie.OnSendingCassieMessage))),
 
-                    // words = ev.Words
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Words))),
+                    // annc = ev.Announcement
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Announcement))),
                     new(OpCodes.Starg_S, 0),
 
-                    // makeHold = ev.MakeHold
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeHold))),
-                    new(OpCodes.Starg_S, 1),
-
-                    // makeNoise = ev.MakeNoise
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeNoise))),
-                    new(OpCodes.Starg_S, 2),
-
-                    // customAnnouncement = ev.IsCustomAnnouncement
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsCustomAnnouncement))),
-                    new(OpCodes.Starg_S, 3),
-
-                    // customSubtitles = ev.CustomSubtitles
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.CustomSubtitles))),
-                    new(OpCodes.Starg_S, 4),
-
                     // if (!IsAllowed)
                     //   return;
                     new(OpCodes.Callvirt, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsAllowed))),
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs b/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
new file mode 100644
index 0000000000..fec7811ecf
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
@@ -0,0 +1,65 @@
+// -----------------------------------------------------------------------
+// <copyright file="Cackling.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Item
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Item;
+    using HarmonyLib;
+    using InventorySystem.Items.MarshmallowMan;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
+    /// Adds the <see cref="Handlers.Item.Cackling" /> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Cackling))]
+    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCackle))]
+    public class Cackling
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label retLabel = generator.DefineLabel();
+
+            int offset = 1;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // this;
+                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // ev = new CacklingEventArgs(MarshmallowItem, bool);
+                new(OpCodes.Newobj, Constructor(typeof(CacklingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnCackling))),
+
+                // if (!ev.IsAllowed) return
+                new(OpCodes.Callvirt, PropertyGetter(typeof(CacklingEventArgs), nameof(CacklingEventArgs.IsAllowed))),
+                new(OpCodes.Brfalse_S, retLabel),
+            });
+
+            newInstructions[newInstructions.Count - 1].WithLabels(retLabel);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs b/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
new file mode 100644
index 0000000000..15c74b57b1
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
@@ -0,0 +1,65 @@
+// -----------------------------------------------------------------------
+// <copyright file="Punching.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Item
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Item;
+    using HarmonyLib;
+    using InventorySystem.Items.MarshmallowMan;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
+    /// Adds the <see cref="Handlers.Item.Punching" /> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Punching))]
+    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCmd))]
+    public class Punching
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label retLabel = generator.DefineLabel();
+
+            int offset = 1;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
+
+            newInstructions[^1].WithLabels(retLabel);
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // this;
+                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // ev = new PunchingEventArgs(MarshmallowItem, bool);
+                new(OpCodes.Newobj, Constructor(typeof(PunchingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnPunching))),
+
+                // if (!ev.IsAllowed) return
+                new(OpCodes.Callvirt, PropertyGetter(typeof(PunchingEventArgs), nameof(PunchingEventArgs.IsAllowed))),
+                new(OpCodes.Brfalse_S, retLabel),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
index 0d53ebeefb..3033a0327d 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
+    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -17,11 +18,12 @@ namespace Exiled.Events.Patches.Events.Map
     using Exiled.Events.EventArgs.Map;
     using HarmonyLib;
     using Respawning.Announcements;
+    using Subtitles;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncementString"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncementString"/>
+    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncement"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncement"/>
     /// to add <see cref="Handlers.Map.AnnouncingChaosEntrance"/> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
@@ -30,8 +32,8 @@ internal static class AnnouncingChaosEntrance
     {
         private static IEnumerable<MethodBase> TargetMethods()
         {
-            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncementString));
-            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncementString));
+            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncement));
+            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncement));
         }
 
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instruction, ILGenerator generator)
@@ -70,6 +72,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldarg_1),
                 new(OpCodes.Callvirt, Method(typeof(StringBuilder), nameof(StringBuilder.Clear))),
                 new(OpCodes.Pop),
+                new(OpCodes.Ldarg_3),
+                new(OpCodes.Call, Method(typeof(Array), nameof(Array.Empty), new Type[] { }, new[] { typeof(SubtitlePart) })),
+                new(OpCodes.Stind_Ref),
                 new(OpCodes.Ret),
 
                 new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel),
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
index bf59ef0103..75cf10177c 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
+    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -23,11 +24,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncementString" />
+    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncement" />
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncementString))]
+    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncement))]
     internal static class AnnouncingNtfEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -39,8 +40,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = 1;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_3) + offset;
+            int offset = 2;
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie)))) + offset;
 
             newInstructions.InsertRange(
                 index,
@@ -50,10 +51,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_2),
+                    new(OpCodes.Ldloc_3),
 
-                    // string[] unitInformation = unitNameClear.Split('-');
-                    new(OpCodes.Ldloc_1),
+                    // string[] unitInformation = lastGeneratedName.Split('-');
+                    new(OpCodes.Ldloc_2),
                     new(OpCodes.Ldstr, "<[^>]*?>"),
                     new(OpCodes.Ldsfld, Field(typeof(string), nameof(string.Empty))),
                     new(OpCodes.Call, Method(typeof(Regex), nameof(Regex.Replace), new System.Type[] { typeof(string), typeof(string), typeof(string) })),
@@ -63,9 +64,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldc_I4_0),
                     new(OpCodes.Ldc_I4_S, 45),
                     new(OpCodes.Stelem_I2),
-                    new(OpCodes.Call, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
+                    new(OpCodes.Callvirt, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
 
-                    // AnnouncingNtfEntranceEventArgs ev = new(scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
+                    // AnnouncingNtfEntranceEventArgs ev = new(this, scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
                     //
                     // Map.OnAnnouncingNtfEntrance(ev);
                     new(OpCodes.Dup),
@@ -98,14 +99,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Box, typeof(int)),
                     new(OpCodes.Call, Method(typeof(string), nameof(string.Format), new[] { typeof(string), typeof(object), typeof(object) })),
                     new(OpCodes.Dup),
-                    new(OpCodes.Stloc_1),
-                    new(OpCodes.Callvirt, Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie))),
                     new(OpCodes.Stloc_2),
+                    new(OpCodes.Callvirt, Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie))),
+                    new(OpCodes.Stloc_3),
 
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_2),
+                    new(OpCodes.Stloc_3),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
index 8bb3389fdd..018362acde 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
@@ -20,11 +20,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncementString"/>
+    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncement"/>
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncementString))]
+    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncement))]
     internal static class AnnouncingNtfMiniEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -35,15 +35,17 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_1) + 1;
+
             newInstructions.InsertRange(
-                0,
+                index,
                 new CodeInstruction[]
                 {
                     // WaveAnnouncementBase
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Ldloc_1),
 
                     // null
                     new(OpCodes.Ldnull),
@@ -66,7 +68,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_0),
+                    new(OpCodes.Stloc_1),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
index 71363142ff..5064239e03 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
@@ -7,78 +7,102 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
+    using System;
+    using System.Collections;
     using System.Collections.Generic;
-    using System.Reflection;
     using System.Reflection.Emit;
 
-    using API.Features.DamageHandlers;
     using API.Features.Pools;
+    using Exiled.API.Features;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Map;
     using Exiled.Events.Handlers;
-
+    using Footprinting;
+    using global::Cassie;
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
 
+    using Map = Exiled.Events.Handlers.Map;
     using Player = API.Features.Player;
 
     /// <summary>
     /// Patches
-    /// <see cref="NineTailedFoxAnnouncer.AnnounceScpTermination(ReferenceHub, PlayerStatsSystem.DamageHandlerBase)" />.
+    /// <see cref="CassieScpTerminationAnnouncement.OnStartedPlaying()" />.
     /// Adds the <see cref="Map.AnnouncingScpTermination" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingScpTermination))]
-    [HarmonyPatch(typeof(NineTailedFoxAnnouncer), nameof(NineTailedFoxAnnouncer.AnnounceScpTermination))]
+    [HarmonyPatch(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.OnStartedPlaying))]
     internal static class AnnouncingScpTermination
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            LocalBuilder ev = generator.DeclareLocal(typeof(AnnouncingScpTerminationEventArgs));
+            LocalBuilder cause = generator.DeclareLocal(typeof(string));
+            LocalBuilder enumerator = generator.DeclareLocal(typeof(IEnumerator<Footprint>));
+
+            ExceptionBlock beginTry = new(ExceptionBlockType.BeginExceptionBlock);
+            ExceptionBlock beginFinally = new(ExceptionBlockType.BeginFinallyBlock);
+            ExceptionBlock endFinally = new(ExceptionBlockType.EndExceptionBlock);
 
             Label ret = generator.DefineLabel();
+            Label entryLabel = generator.DefineLabel();
+            Label loopLabel = generator.DefineLabel();
+            Label leaveLabel = generator.DefineLabel();
+            Label endFinallyLabel = generator.DefineLabel();
+
+            int offset = -1;
+            int index = newInstructions.FindIndex(i => i.LoadsField(Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts)))) + offset;
+
+            newInstructions.RemoveRange(index, 2);
+            newInstructions.Insert(index, new CodeInstruction(OpCodes.Ldloc_S, cause));
 
-            int offset = -4;
-            int index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.CassieQueuingScpTerminationEventArgs))[0]) + offset;
+            newInstructions[0].WithLabels(leaveLabel);
 
             newInstructions.InsertRange(
-                index,
+                0,
                 new[]
-                {
-                    // Player.Get(scp)
-                    new CodeInstruction(OpCodes.Ldarg_0),
-                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
-
-                    // hit
-                    new(OpCodes.Ldarg_1),
-
-                    // AnnouncingScpTerminationEventArgs ev = new(Player, DamageHandlerBase)
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(AnnouncingScpTerminationEventArgs))[0]),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Stloc_S, ev.LocalIndex),
-
-                    // Map.OnAnnouncingScpTermination(ev)
-                    new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
-
-                    // if (!ev.IsAllowed)
-                    //    return;
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.IsAllowed))),
-                    new(OpCodes.Brfalse_S, ret),
-
-                    // hit = ev.DamageHandler.Base
-                    new(OpCodes.Ldloc_S, ev.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.DamageHandler))),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(CustomDamageHandler), nameof(CustomDamageHandler.Base))),
-                    new(OpCodes.Starg, 1),
-
-                    // announcement = ev.TerminationCause
-                    new(OpCodes.Ldloc_S, ev.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
-                    new(OpCodes.Stloc_0),
-                });
+            {
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Ldfld, Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts))),
+                new(OpCodes.Stloc_S, cause),
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.Victims))),
+                new(OpCodes.Callvirt, Method(typeof(IEnumerable<Footprint>), nameof(IEnumerable<Footprint>.GetEnumerator))),
+                new(OpCodes.Stloc_S, enumerator),
+
+                // start of try
+                new CodeInstruction(OpCodes.Br_S, entryLabel).WithBlocks(beginTry),
+
+                // start of loop
+                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(loopLabel),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(IEnumerator<Footprint>), nameof(IEnumerator<Footprint>.Current))),
+                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(Footprint) })),
+                new(OpCodes.Ldloc_S, cause),
+                new(OpCodes.Newobj, Constructor(typeof(AnnouncingScpTerminationEventArgs), new[] { typeof(Player), typeof(string) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
+                new(OpCodes.Stloc_S, cause),
+
+                // entry point
+                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(entryLabel),
+                new(OpCodes.Callvirt, Method(typeof(IEnumerator), nameof(IEnumerator.MoveNext))),
+                new(OpCodes.Brtrue_S, loopLabel),
+
+                // end of loop
+                new(OpCodes.Leave, leaveLabel),
+
+                // begin finally
+                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithBlocks(beginFinally),
+                new(OpCodes.Brfalse, endFinallyLabel),
+                new(OpCodes.Ldloc_S, enumerator),
+                new(OpCodes.Callvirt, Method(typeof(IDisposable), nameof(IDisposable.Dispose))),
+
+                // end of finally
+                new CodeInstruction(OpCodes.Endfinally).WithLabels(endFinallyLabel).WithBlocks(endFinally),
+            });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
deleted file mode 100644
index 7193f8d17f..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="AnnouncingTeamEntrance.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Map
-{
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Reflection.Emit;
-    using System.Text;
-
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Map;
-    using HarmonyLib;
-    using Respawning.Announcements;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="WaveAnnouncementBase.PlayAnnouncement"/> to prevent cassie from playing empty string.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingNtfEntrance))]
-    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
-    [HarmonyPatch(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.PlayAnnouncement))]
-    internal static class AnnouncingTeamEntrance
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label returnLabel = generator.DefineLabel();
-
-            // the instruction that sends subtitles is called before stringReturn is created (and thus checked) so we need to move it so that empty (or disallowed) message's subtitles are not sent.
-            // this removes the Ldarg_0 and the CallVirt
-            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.SendSubtitles))));
-            CodeInstruction sendSubtitlesInstruction = newInstructions[index];
-            newInstructions.RemoveRange(index - 2, 3);
-
-            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldsfld);
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // if (stringReturn == "")
-                //     return;
-                new(OpCodes.Ldloc_S, 4),
-                new(OpCodes.Ldstr, string.Empty),
-                new(OpCodes.Ceq),
-                new(OpCodes.Brtrue_S, returnLabel),
-
-                // send subtitles before cassie message, but after our check.
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Ldarg_1),
-                sendSubtitlesInstruction,
-            });
-
-            newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
index b379bdec1a..4af8bd4e11 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
@@ -89,14 +89,13 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))));
-            List<Label> label = newInstructions[index].labels;
-
-            newInstructions.RemoveAt(index);
-
-            int offset = -1;
-            index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.MapGeneratedEventArgs))[0]) + offset;
-            newInstructions.Insert(index, new CodeInstruction(OpCodes.Call, Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))).WithLabels(label));
+            List<Label> labels = newInstructions[index].ExtractLabels();
+            List<CodeInstruction> codeInstructionsCopy = newInstructions.GetRange(index, 4);
+            newInstructions.RemoveRange(index, 4);
+            newInstructions[index].labels.AddRange(labels);
 
+            index = newInstructions.FindIndex(x => x.OperandIs(Field(typeof(SeedSynchronizer), nameof(SeedSynchronizer.MapGenerated))));
+            newInstructions.InsertRange(index, codeInstructionsCopy);
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
index 6f70c4b8b0..ac28cd901a 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
@@ -14,36 +14,34 @@ namespace Exiled.Events.Patches.Events.Player
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Player;
     using Exiled.Events.Handlers;
-
     using HarmonyLib;
-
+    using PlayerRoles.FirstPersonControl;
     using PlayerRoles.FirstPersonControl.Thirdperson;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="AnimatedCharacterModel.OnGrounded" />
+    /// Patches <see cref="FirstPersonMovementModule.IsGrounded" />
     /// Adds the <see cref="Player.Landing" /> event.
     /// </summary>
     [EventPatch(typeof(Player), nameof(Player.Landing))]
-    [HarmonyPatch(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.OnGrounded))]
+    [HarmonyPatch(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.IsGrounded), MethodType.Setter)]
     internal static class Landing
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            const int offset = -1;
-            int index = newInstructions.FindIndex(
-                instruction => instruction.Calls(Method(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.PlayFootstep)))) + offset;
+            const int offset = 2;
+            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Ldarg_1) + offset;
 
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
-                    // Player.Get(base.OwnerHub)
+                    // Player.Get(this.Hub)
                     new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(CharacterModel), nameof(CharacterModel.OwnerHub))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.Hub))),
                     new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // LandingEventArgs ev = new(Player)
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
index 9d22a80b67..707743a243 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
@@ -23,9 +23,9 @@ namespace Exiled.Events.Patches.Events.Player
 
     /// <summary>
     /// Patches the <see cref="StatusEffectBase.Intensity"/> method.
-    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event.
+    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event and fix NW Duration not being correctly set to 0 when effect is Reset.
     /// </summary>
-    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
+    // [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
     [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ForceIntensity))]
     internal static class ReceivingStatusEffect
     {
@@ -74,9 +74,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._intensity))),
 
-                    // this.Duration
+                    // this._timeLeft
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
+                    new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
 
                     // ReceivingEventArgs ev = new(Player, StatusEffectBase, byte, byte, float)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ReceivingEffectEventArgs))[0]),
@@ -95,11 +95,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Intensity))),
                     new(OpCodes.Starg_S, 1),
 
-                    // this.Duration = ev.Duration
+                    // this._timeLeft = ev.Duration
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Duration))),
-                    new(OpCodes.Callvirt, PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
+                    new(OpCodes.Stfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
                 });
 
             newInstructions[newInstructions.Count - 1].WithLabels(returnLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs b/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
new file mode 100644
index 0000000000..2f81bec7c7
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
@@ -0,0 +1,59 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp1576TransmissionEnded.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Player
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Player;
+    using HarmonyLib;
+    using InventorySystem.Items.Usables.Scp1576;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Scp1576Item.ServerStopTransmitting"/> to add <see cref="Handlers.Player.Scp1576TransmissionEnded"/> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.Scp1576TransmissionEnded))]
+    [HarmonyPatch(typeof(InventorySystem.Items.Usables.Scp1576.Scp1576Item), nameof(Scp1576Item.ServerStopTransmitting))]
+    public class Scp1576TransmissionEnded
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+                List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+                int index = newInstructions.Count - 1;
+
+                newInstructions.InsertRange(
+                    index,
+                    new[]
+                    {
+                        // Player.Get(base.Owner)
+                        new CodeInstruction(OpCodes.Ldarg_0),
+                        new CodeInstruction(OpCodes.Callvirt, PropertyGetter(typeof(Scp1576Item), nameof(Scp1576Item.Owner))),
+                        new CodeInstruction(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
+
+                        // this
+                        new CodeInstruction(OpCodes.Ldarg_0),
+
+                        // Scp1576TransmissionEndedEventArgs ev = new(Player, this)
+                        new CodeInstruction(OpCodes.Newobj, GetDeclaredConstructors(typeof(Scp1576TransmissionEndedEventArgs))[0]),
+
+                        // OnScp1576TransmissionEnded(ev)
+                        new CodeInstruction(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnScp1576TransmissionEnded))),
+                    });
+
+                for (int i = 0; i < newInstructions.Count; i++)
+                    yield return newInstructions[i];
+
+                ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs b/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
new file mode 100644
index 0000000000..d83af6e966
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
@@ -0,0 +1,58 @@
+// -----------------------------------------------------------------------
+// <copyright file="UsedItemByHolstering.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Player
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Player;
+    using HarmonyLib;
+    using InventorySystem.Items.Usables;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Consumable.OnHolstered" />.
+    /// Adds an alternative trigger of the <see cref="Handlers.Player.UsedItem" /> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.UsedItem))]
+    [HarmonyPatch(typeof(Consumable), nameof(Consumable.OnHolstered))]
+    public class UsedItemByHolstering
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            // after ServerRemoveSelf, which lines up with before the ret
+            newInstructions.InsertRange(newInstructions.Count - 1, new CodeInstruction[]
+            {
+                // this.Owner
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(Consumable), nameof(Consumable.Owner))),
+
+                // this (Consumable inherits UsableItem)
+                new(OpCodes.Ldarg_0),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // OnUsedItem(new UsedItemEventArgs(ReferenceHub, UsableItem, bool));
+                new(OpCodes.Newobj, Constructor(typeof(UsedItemEventArgs), new[] { typeof(ReferenceHub), typeof(UsableItem), typeof(bool) })),
+                new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnUsedItem))),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
index d2efcd3fd3..680bbbf0dd 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
@@ -31,17 +31,18 @@ internal class Recontaining
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
-            int index = 0;
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             LocalBuilder ev = generator.DeclareLocal(typeof(RecontainingEventArgs));
 
             Label returnLabel = generator.DefineLabel();
 
-            newInstructions.InsertRange(index, new CodeInstruction[]
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + 1;
+
+            newInstructions.InsertRange(index, new[]
             {
                 // RecontainingEventArgs ev = new(this._activatorGlass)
-                new(OpCodes.Ldarg_0),
+                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
                 new(OpCodes.Ldfld, Field(typeof(Scp079Recontainer), nameof(Scp079Recontainer._activatorGlass))),
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RecontainingEventArgs))[0]),
                 new(OpCodes.Stloc_S, ev.LocalIndex),
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
new file mode 100644
index 0000000000..dd942042fb
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
@@ -0,0 +1,86 @@
+// -----------------------------------------------------------------------
+// <copyright file="FoundPosition.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Scp2536
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Christmas.Scp2536;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Scp2536;
+    using HarmonyLib;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Scp2536Controller.ServerFindTarget"/>
+    /// to add <see cref="Handlers.Scp2536.FoundPosition"/> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.FoundPosition))]
+    [HarmonyPatch(typeof(Scp2536Controller), nameof(Scp2536Controller.ServerFindTarget))]
+    public class FoundPosition
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label retLabel = generator.DefineLabel();
+
+            int index = newInstructions.Count - 1;
+
+            newInstructions[index].WithLabels(retLabel);
+
+            newInstructions.InsertRange(index, new CodeInstruction[]
+            {
+                // dupe the result (true / false if found)
+                new(OpCodes.Dup),
+
+                // return w result if failed
+                new(OpCodes.Brfalse_S, retLabel),
+                new(OpCodes.Pop),
+
+                // load ADDRESS of parameter "out Scp2536Spawnpoint spawnpoint" onto stack (so not actual value but address)
+                // this is used at end of transpiler
+                new(OpCodes.Ldarg_2),
+
+                // load address of parameter "out ReferenceHub target"
+                new(OpCodes.Ldarg_1),
+
+                // load value at address
+                new(OpCodes.Ldind_Ref),
+
+                // player = Player.Get(target);
+                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                // load address of parameter "out Scp2536Spawnpoint spawnpoint"
+                new(OpCodes.Ldarg_2),
+
+                // load value at address
+                new(OpCodes.Ldind_Ref),
+
+                // ev = new FoundPositionEventArgs(player, spawnpoint);
+                new(OpCodes.Newobj, Constructor(typeof(FoundPositionEventArgs), new[] { typeof(Player), typeof(Scp2536Spawnpoint) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnFoundPosition))),
+
+                // spawnpoint = ev.Spawnpoint;
+                new(OpCodes.Callvirt, PropertyGetter(typeof(FoundPositionEventArgs), nameof(FoundPositionEventArgs.Spawnpoint))),
+
+                // this uses the address already on stack (see 3rd comment) with the value from the event args
+                new(OpCodes.Stind_Ref),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
index 9389addfa5..855523f1e3 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
@@ -11,6 +11,7 @@ namespace Exiled.Events.Patches.Events.Scp2536
     using System.Reflection.Emit;
 
     using Christmas.Scp2536;
+    using Christmas.Scp2536.Gifts;
     using Exiled.API.Features;
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
@@ -34,6 +35,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label retLabel = generator.DefineLabel();
 
             LocalBuilder ev = generator.DeclareLocal(typeof(GrantingGiftEventArgs));
+            LocalBuilder naughty = generator.DeclareLocal(typeof(Naughty));
 
             int offset = -1;
             int index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp2536GiftBase), nameof(Scp2536GiftBase.ObtainedBy)))) + offset;
@@ -45,7 +47,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                 // gift
-                new(OpCodes.Ldloc_1),
+                new(OpCodes.Ldloc_2),
 
                 // true
                 new(OpCodes.Ldc_I4_1),
@@ -67,7 +69,45 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // gift = ev.Gift;
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
-                new(OpCodes.Stloc_1),
+                new(OpCodes.Stloc_2),
+            });
+
+            offset = 1;
+            index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(Scp2536GiftController), nameof(Scp2536GiftController.ServerGetGift), null, new[] { typeof(Naughty) }))) + offset;
+
+            newInstructions.InsertRange(index, new CodeInstruction[]
+            {
+                // naughty is already on the stack
+                // naughty = this.ServerGetGift<Naught>();
+                new(OpCodes.Stloc_S, naughty),
+
+                // Player.Get(hub);
+                new(OpCodes.Ldarg_1),
+                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                // naughty
+                new(OpCodes.Ldloc_S, naughty),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // GrantingGiftEventArgs ev = new(Player, Scp2536GiftBase, true);
+                new(OpCodes.Newobj, GetDeclaredConstructors(typeof(GrantingGiftEventArgs))[0]),
+                new(OpCodes.Dup),
+                new(OpCodes.Dup),
+                new(OpCodes.Stloc_S, ev.LocalIndex),
+
+                // Handlers.Scp2536.OnGrantingGift(ev);
+                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnGrantingGift))),
+
+                // if (!ev.IsAllowed)
+                //   goto retLabel;
+                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.IsAllowed))),
+                new(OpCodes.Brfalse_S, retLabel),
+
+                // load naughty onto stack
+                new(OpCodes.Ldloc_S, ev.LocalIndex),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
             });
 
             newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
index 1c0f3442e3..dcf788f079 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
@@ -30,9 +30,13 @@ internal class Interacting
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Brfalse_S);
 
-            int offset = 1;
-            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ret) + offset;
+            newInstructions.RemoveRange(index, 6);
+            newInstructions[index].opcode = OpCodes.Brtrue_S;
+            int offset = -2;
+
+            index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp559Cake), nameof(Scp559Cake._remainingSlices)))) + offset;
 
             Label retLabel = generator.DefineLabel();
 
@@ -48,10 +52,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                    // true
-                    new(OpCodes.Ldc_I4_1),
-
-                    // InteractingScp559EventArgs ev = new(Scp559, Player, true);
+                    // InteractingScp559EventArgs ev = new(Scp559, Player);
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingScp559EventArgs))[0]),
                     new(OpCodes.Dup),
 
@@ -68,6 +69,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
index 8027c34ad9..cd52be3cc0 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
@@ -76,6 +76,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
index c042b65f9e..defc59b9b6 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
@@ -14,9 +14,7 @@ namespace Exiled.Events.Patches.Events.Scp914
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp914;
-
     using global::Scp914;
-
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
@@ -39,8 +37,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = 1;
-            int index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Stloc_1) + offset;
+            int offset = -3;
+            int index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914KnobChangingEventArgs))[0])) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
@@ -75,7 +73,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             });
 
             offset = -3;
-            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Newobj) + offset;
+            index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914ActivatingEventArgs))[0])) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs b/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
new file mode 100644
index 0000000000..6ea4a5ac08
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
@@ -0,0 +1,101 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixEffectOrder.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection;
+    using System.Reflection.Emit;
+
+    using API.Features.Pools;
+    using CustomPlayerEffects;
+    using Exiled.API.Features;
+    using HarmonyLib;
+    using InventorySystem.Items.Usables.Scp330;
+    using PlayerRoles.PlayableScps.Scp049;
+
+    using static HarmonyLib.AccessTools;
+
+#pragma warning disable SA1402 // File may only contain a single type
+
+    /// <summary>
+    /// Patches <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
+    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
+    /// </summary>
+    [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState))]
+    internal class FixEffectOrder
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            // Find the setter call index
+            int offset = -2;
+            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity)))) + offset;
+
+            // Extract: ldarg.0, ldarg.1, call set_Intensity
+            List<CodeInstruction> intensityBlock = newInstructions.GetRange(intensityCallIndex, 3);
+
+            // Remove it from original location
+            newInstructions.RemoveRange(intensityCallIndex, 3);
+            newInstructions[intensityCallIndex].WithLabels(intensityBlock[0].ExtractLabels());
+
+            // Find ServerChangeDuration call
+            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
+
+            // Insert AFTER ServerChangeDuration
+            newInstructions.InsertRange(serverChangeIndex + 1, intensityBlock);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+
+    /// <summary>
+    /// Patches Method that should use <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
+    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
+    /// </summary>
+    [HarmonyPatch]
+    internal class FixEffectOrder2
+    {
+        private static IEnumerable<MethodBase> TargetMethods()
+        {
+            yield return Method(typeof(CandyYellow), nameof(CandyYellow.ServerApplyEffects));
+            yield return Method(typeof(Scp049AttackAbility), nameof(Scp049AttackAbility.ServerProcessCmd));
+            yield return Method(typeof(SugarCrave), nameof(SugarCrave.Disabled));
+        }
+
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity))));
+
+            int offset = 6;
+            if (newInstructions[intensityCallIndex - offset].opcode == OpCodes.Dup)
+            {
+                // specific to Yellow candy that get it's Instance from a OpCodes.Dup
+                newInstructions.RemoveAt(intensityCallIndex);
+                newInstructions.RemoveAt(intensityCallIndex - offset);
+            }
+            else
+            {
+                newInstructions.RemoveRange(intensityCallIndex, 2);
+            }
+
+            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
+
+            newInstructions[serverChangeIndex] = new CodeInstruction(OpCodes.Callvirt, Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState)));
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs b/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
new file mode 100644
index 0000000000..51dab211b3
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
@@ -0,0 +1,91 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixMarshmallowManFF.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using CustomPlayerEffects;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Footprinting;
+    using HarmonyLib;
+    using InventorySystem.Items.MarshmallowMan;
+    using InventorySystem.Items.Pickups;
+    using InventorySystem.Items.ThrowableProjectiles;
+    using Mirror;
+    using PlayerRoles;
+    using PlayerRoles.FirstPersonControl;
+    using PlayerStatsSystem;
+    using Respawning.NamingRules;
+    using Subtitles;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches the <see cref="MarshmallowItem.ServerAttack"/> delegate.
+    /// </summary>
+    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerAttack))]
+    internal class FixMarshmallowManFF : AttackerDamageHandler
+    {
+#pragma warning disable SA1600 // Elements should be documented
+        public FixMarshmallowManFF(MarshmallowItem marshmallowItem, bool isEvilMode)
+        {
+            MarshmallowItem = marshmallowItem;
+            Attacker = new(marshmallowItem.Owner);
+            Damage = marshmallowItem._attackDamage;
+            ForceFullFriendlyFire = isEvilMode;
+        }
+
+        public MarshmallowItem MarshmallowItem { get; set; }
+
+        public override Footprint Attacker { get; set; }
+
+        public override bool AllowSelfDamage { get; } = false;
+
+        public override float Damage { get; set; }
+
+        public override string RagdollInspectText { get; } = DeathTranslations.MarshmallowMan.RagdollTranslation;
+
+        public override CassieAnnouncement CassieDeathAnnouncement { get; } = new()
+        {
+            Announcement = "TERMINATED BY MARSHMALLOW MAN",
+            SubtitleParts =
+            [
+                new SubtitlePart(SubtitleType.TerminatedByMarshmallowMan, null),
+            ],
+        };
+
+        public override string DeathScreenText { get; } = DeathTranslations.MarshmallowMan.DeathscreenTranslation;
+
+        public override string ServerLogsText => "Stabbed with Marshmallow Item by " + Attacker.Nickname;
+#pragma warning restore SA1600 // Elements should be documented
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.NewDamageHandler))));
+
+            // replace the getter for NewDamageHandler with ctor of FixMarshmallowManFF
+            newInstructions.RemoveAt(index);
+            newInstructions.InsertRange(index, new List<CodeInstruction>
+            {
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.EvilMode))),
+                new(OpCodes.Newobj, Constructor(typeof(FixMarshmallowManFF), new[] { typeof(MarshmallowItem), typeof(bool) })),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs b/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
new file mode 100644
index 0000000000..fde6bfd51a
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
@@ -0,0 +1,30 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixNWFlashbangDuration.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using CustomPlayerEffects;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Player;
+    using HarmonyLib;
+    using InventorySystem;
+
+    /// <summary>
+    /// Patches <see cref="Flashed.IntensityChanged"/> to fix NW overwritting value multiple time.
+    /// </summary>
+    [HarmonyPatch(typeof(Flashed), nameof(Flashed.IntensityChanged))]
+    internal class FixNWFlashbangDuration
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            yield return new CodeInstruction(OpCodes.Ret);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs b/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
new file mode 100644
index 0000000000..c40037f4b9
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
@@ -0,0 +1,52 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixScp1507DestroyingDoor.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using API.Features.Pools;
+    using Footprinting;
+    using HarmonyLib;
+    using Interactables.Interobjects.DoorUtils;
+    using PlayerRoles.PlayableScps.Scp1507;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Scp1507AttackAbility.TryAttackDoor()"/> delegate.
+    /// Fix than NW don't set the footprint argument <see cref="IDamageableDoor.ServerDamage(float, DoorDamageType, Footprint)"/>.
+    /// </summary>
+    [HarmonyPatch(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.TryAttackDoor))]
+    internal class FixScp1507DestroyingDoor
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int offset = -1;
+            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Initobj) + offset;
+
+            newInstructions.RemoveRange(index, 3);
+
+            newInstructions.InsertRange(
+                index,
+                new CodeInstruction[]
+                {
+                    new(OpCodes.Ldarg_0),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.Owner))),
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(Footprint))[0]),
+                });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
index 1f6a8ee431..17bdf5e142 100644
--- a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
+++ b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
@@ -22,7 +22,7 @@ namespace Exiled.Events.Patches.Fixes
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem, JailbirdHitreg)" />.
+    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem)" />.
     /// Bug reported to NW (https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/88).
     /// </summary>
     [HarmonyPatch(typeof(JailbirdDeteriorationTracker), nameof(JailbirdDeteriorationTracker.Setup))]
diff --git a/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs b/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
deleted file mode 100644
index 46151c7577..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="JailbirdHitRegFix.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using API.Features.Pools;
-
-    using HarmonyLib;
-    using InventorySystem.Items.Jailbird;
-    using Mirror;
-    using Utils.Networking;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="JailbirdHitreg.ServerAttack(bool, NetworkReader)" />.
-    /// </summary>
-    [HarmonyPatch(typeof(JailbirdHitreg), nameof(JailbirdHitreg.ServerAttack))]
-    internal static class JailbirdHitRegFix
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(ReferenceHubReaderWriter), nameof(ReferenceHubReaderWriter.TryReadReferenceHub)))) - 2;
-
-            int breakIndex = newInstructions.FindIndex(i => i.Calls(Method(typeof(JailbirdHitreg), nameof(JailbirdHitreg.DetectDestructibles)))) - 1;
-            Label breakLabel = generator.DefineLabel();
-            newInstructions[breakIndex].WithLabels(breakLabel);
-
-            List<Label> loopBeginingLabels = newInstructions[index].ExtractLabels();
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // reader.Remaining
-                new CodeInstruction(OpCodes.Ldarg_2),
-                new CodeInstruction(OpCodes.Call, PropertyGetter(typeof(NetworkReader), nameof(NetworkReader.Remaining))),
-
-                // if (reader.Remaining == 0)
-                //     break;
-                new CodeInstruction(OpCodes.Ldc_I4_0),
-                new CodeInstruction(OpCodes.Ceq),
-                new CodeInstruction(OpCodes.Brtrue, breakLabel),
-            });
-
-            newInstructions[index].WithLabels(loopBeginingLabels);
-
-            foreach (CodeInstruction instruction in newInstructions)
-                yield return instruction;
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
index bafb4a2847..574c0d856a 100644
--- a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
+++ b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
@@ -16,6 +16,7 @@ namespace Exiled.Events.Patches.Generic
 
     using API.Features;
     using API.Features.Pools;
+    using Exiled.API.Features.Items;
 
     using Footprinting;
 
@@ -125,6 +126,12 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref
                     return true;
                 }
 
+                if (victim.CurrentItem is Marshmallow { Evil: true })
+                {
+                    Log.Debug("CheckFriendlyFirePlayerRules, NW Fix victim not getting hit");
+                    return true;
+                }
+
                 Log.Debug($"CheckFriendlyFirePlayerRules, Attacker role {attacker.Role} and Victim {victim.Role}");
 
                 // Check victim's UniqueRole for custom FF multiplier
diff --git a/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs b/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
new file mode 100644
index 0000000000..c98d2d57c2
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
@@ -0,0 +1,32 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127MaxHs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Generic
+{
+    using Exiled.API.Features.Items;
+    using HarmonyLib;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+#pragma warning disable SA1313
+    /// <summary>
+    /// Patches <see cref="Scp127HumeModule.HsMax"/> to implement <see cref="Scp127.HsMax"/> setter.
+    /// </summary>
+    [HarmonyPatch(typeof(Scp127HumeModule), nameof(Scp127HumeModule.HsMax), MethodType.Getter)]
+    internal class Scp127MaxHs
+    {
+        private static void Postfix(Scp127HumeModule __instance, ref float __result)
+        {
+            Scp127 item = Item.Get<Scp127>(__instance.ItemSerial);
+
+            if (item == null || !item.CustomHsMax.HasValue)
+                return;
+
+            __result = item.CustomHsMax.Value;
+            return;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Installer/Program.cs b/EXILED/Exiled.Installer/Program.cs
index 1924fc369d..6ea75b0df0 100644
--- a/EXILED/Exiled.Installer/Program.cs
+++ b/EXILED/Exiled.Installer/Program.cs
@@ -172,7 +172,7 @@ private static async Task<IEnumerable<Release>> GetReleases()
                     r => Version.TryParse(r.TagName, out Version version)
                          && version > VersionLimit);
 
-            return releases.OrderByDescending(r => r.CreatedAt.Ticks);
+            return releases.OrderByDescending(r => r.PublishedAt);
         }
 
         private static string FormatRelease(Release r)
diff --git a/EXILED/Exiled.Loader/AutoUpdateFiles.cs b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
index a4e454cb3a..3ad56c5c95 100644
--- a/EXILED/Exiled.Loader/AutoUpdateFiles.cs
+++ b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
@@ -17,6 +17,6 @@ public static class AutoUpdateFiles
         /// <summary>
         /// Gets which SCP: SL version generated Exiled.
         /// </summary>
-        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 1);
+        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 4);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Loader/ConfigManager.cs b/EXILED/Exiled.Loader/ConfigManager.cs
index f04835e61c..706924ee45 100644
--- a/EXILED/Exiled.Loader/ConfigManager.cs
+++ b/EXILED/Exiled.Loader/ConfigManager.cs
@@ -446,7 +446,10 @@ public static bool LoadLabAPIProperties(LabPlugin plugin)
             ISerializer serializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Serializer;
             IDeserializer deserializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Deserializer;
 
-            string configPath = Path.Combine(Paths.IndividualConfigs, plugin.Name, $"{Server.Port}-properties.yml");
+            string directory = Path.Combine(Paths.IndividualConfigs, plugin.Name);
+            string configPath = Path.Combine(directory, $"{Server.Port}-properties.yml");
+
+            Directory.CreateDirectory(directory);
 
             if (!File.Exists(configPath))
             {
diff --git a/EXILED/Exiled.Loader/Loader.cs b/EXILED/Exiled.Loader/Loader.cs
index b8a8883fa3..1a30436669 100644
--- a/EXILED/Exiled.Loader/Loader.cs
+++ b/EXILED/Exiled.Loader/Loader.cs
@@ -635,7 +635,10 @@ private static void LoadPluginsFromDirectory(string dir = null)
                     continue;
 
                 if (PluginLoader.EnabledPlugins.Any(p => p.Name == plugin.Name) || Plugins.Any(p => p.Name == plugin.Name) || LabAPIPlugins.Keys.Any(p => p.Name == plugin.Name))
+                {
+                    Log.Info("Skipping loading duplicate LabAPI plugin " + plugin.Name);
                     continue;
+                }
 
                 Log.Info("Successfully loaded LabAPI plugin " + plugin.Name);
                 LabAPIPlugins.Add(plugin, attempt);
diff --git a/EXILED/Exiled.Loader/Updater.cs b/EXILED/Exiled.Loader/Updater.cs
index 672c17063a..a2a3863597 100644
--- a/EXILED/Exiled.Loader/Updater.cs
+++ b/EXILED/Exiled.Loader/Updater.cs
@@ -229,7 +229,7 @@ private void Update(HttpClient client, NewVersion newVersion)
                     FileName = installerPath,
                     UseShellExecute = false,
                     CreateNoWindow = true,
-                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{config.ExiledDirectoryPath}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
+                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{Path.Combine(config.ExiledDirectoryPath, "..")}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     StandardErrorEncoding = ProcessEncoding,
diff --git a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
index f797797370..faeda9462e 100644
--- a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
+++ b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
@@ -17,7 +17,7 @@
 title: NW Documentation
 ---
 
-Last Update (14.2.0.1)
+Last Update (14.2.0.4)
 
 ### Index
 
@@ -56,6 +56,7 @@ Last Update (14.2.0.1)
 - [CallType](#calltype)
 - [CandyKindID](#candykindid)
 - [CassieAnnouncementType](#cassieannouncementtype)
+- [CassieClipCategory](#cassieclipcategory)
 - [Category](#category)
 - [CentralAuthPreauthFlags](#centralauthpreauthflags)
 - [ChallengeState](#challengestate)
@@ -89,7 +90,6 @@ Last Update (14.2.0.1)
 - [DecalPoolType](#decalpooltype)
 - [DecontaminationStatus](#decontaminationstatus)
 - [DeliveryMethod](#deliverymethod)
-- [DetectionStatus](#detectionstatus)
 - [DiodeType](#diodetype)
 - [DisconnectReason](#disconnectreason)
 - [DisconnectResult](#disconnectresult)
@@ -206,6 +206,7 @@ Last Update (14.2.0.1)
 - [NatAddressType](#nataddresstype)
 - [NetLogLevel](#netloglevel)
 - [NetworkProtocolType](#networkprotocoltype)
+- [NextAction](#nextaction)
 - [NextRoundAction](#nextroundaction)
 - [NotificationSound](#notificationsound)
 - [NtpLeapIndicator](#ntpleapindicator)
@@ -220,6 +221,7 @@ Last Update (14.2.0.1)
 - [OtherAudioSetting](#otheraudiosetting)
 - [OtherCondition](#othercondition)
 - [OutputCodes](#outputcodes)
+- [OverwatchSettings](#overwatchsettings)
 - [PacketProperty](#packetproperty)
 - [PanelColliderId](#panelcolliderid)
 - [ParameterMixingMode](#parametermixingmode)
@@ -317,6 +319,7 @@ Last Update (14.2.0.1)
 - [SteamLobbyPrivacy](#steamlobbyprivacy)
 - [StorageLocation](#storagelocation)
 - [StructureType](#structuretype)
+- [SubtitleMode](#subtitlemode)
 - [SubtitleType](#subtitletype)
 - [SyncData](#syncdata)
 - [SyncDataFlags](#syncdataflags)
@@ -958,6 +961,18 @@ Last Update (14.2.0.1)
 
 </details>
 
+### CassieClipCategory
+
+<details><summary><b>Cassie.CassieClipCategory</b></summary>
+
+```
+ [0] = Word
+ [1] = Glitch
+ [2] = Other
+```
+
+</details>
+
 ### Category
 
 <details><summary><b>PlayerRoles.PlayableScps.Scp079.Scp079KeyAbilityBase+Category</b></summary>
@@ -1451,18 +1466,6 @@ Last Update (14.2.0.1)
 
 </details>
 
-### DetectionStatus
-
-<details><summary><b>InventorySystem.Items.Firearms.Modules.Scp127.Scp127CassieBasedVoiceTriggerBase+DetectionStatus</b></summary>
-
-```
- [0] = Idle
- [1] = WaitingForTrigger
- [2] = AnnouncementStartedPlaying
-```
-
-</details>
-
 ### DiodeType
 
 <details><summary><b>AlphaWarheadNukesitePanel+DiodeType</b></summary>
@@ -2412,7 +2415,7 @@ Last Update (14.2.0.1)
 
 ### HitResult
 
-<details><summary><b>InventorySystem.Items.Scp1509.Scp1509Hitreg+HitResult</b></summary>
+<details><summary><b>InventorySystem.Items.Autosync.MeleeAutoSync+HitResult</b></summary>
 
 ```
  [0] = HitPlayer
@@ -2769,6 +2772,7 @@ Last Update (14.2.0.1)
  [66] = KeycardCustomMetalCase
  [67] = MarshmallowItem
  [68] = SCP1509
+ [69] = Scp021J
  [-1] = None
 ```
 
@@ -3294,6 +3298,17 @@ Last Update (14.2.0.1)
 
 </details>
 
+### NextAction
+
+<details><summary><b>Cassie.Interpreters.CassieInterpreter+NextAction</b></summary>
+
+```
+ [0] = Continue
+ [1] = Halt
+```
+
+</details>
+
 ### NextRoundAction
 
 <details><summary><b>ServerStatic+NextRoundAction</b></summary>
@@ -3500,6 +3515,18 @@ Last Update (14.2.0.1)
 
 </details>
 
+### OverwatchSettings
+
+<details><summary><b>PlayerRoles.Spectating.OverwatchSettings</b></summary>
+
+```
+ [0] = PlayerInfoToggle
+ [1] = HitRegisterToggle
+ [2] = DebugLines
+```
+
+</details>
+
 ### PacketProperty
 
 <details><summary><b>LiteNetLib.PacketProperty</b></summary>
@@ -4054,6 +4081,8 @@ Last Update (14.2.0.1)
  [25] = Flamingo
  [26] = AlphaFlamingo
  [27] = ZombieFlamingo
+ [28] = NtfFlamingo
+ [29] = ChaosFlamingo
  [-1] = None
 ```
 
@@ -4117,6 +4146,7 @@ Last Update (14.2.0.1)
  [38] = Hcz127
  [39] = HczAcroamaticAbatement
  [40] = HczWaysideIncinerator
+ [41] = HczRampTunnel
 ```
 
 </details>
@@ -4181,7 +4211,9 @@ Last Update (14.2.0.1)
  [0] = TargetResync
  [1] = TargetKilled
  [2] = AttackInterrupted
- [3] = OutOfRange
+ [3] = AttackCancelled
+ [4] = OutOfRange
+ [5] = StrangleTimer
 ```
 
 </details>
@@ -5200,6 +5232,19 @@ Last Update (14.2.0.1)
 
 </details>
 
+### SubtitleMode
+
+<details><summary><b>Cassie.CassieTtsPayload+SubtitleMode</b></summary>
+
+```
+ [0] = None
+ [1] = Automatic
+ [2] = Custom
+ [3] = FromTranslation
+```
+
+</details>
+
 ### SubtitleType
 
 <details><summary><b>Subtitles.SubtitleType</b></summary>
@@ -5434,6 +5479,7 @@ Last Update (14.2.0.1)
  [8] = Tokens
  [11] = All
  [16] = Spawn
+ [32] = Max
 ```
 
 </details>
@@ -5498,6 +5544,8 @@ Last Update (14.2.0.1)
  [3] = Two
  [4] = Three
  [5] = Four
+ [6] = Five
+ [7] = Six
 ```
 
 </details>
@@ -5676,6 +5724,7 @@ Last Update (14.2.0.1)
  [5] = Scp127Voice
  [6] = Scp3114Voice
  [7] = ChaseThemes
+ [8] = SoundEffectsWhileSpectating
 ```
 
 </details>
@@ -5784,9 +5833,11 @@ Last Update (14.2.0.1)
 | 22  | Filmmaker      | Dead             | None             | Draw            |
 | 23  | Scp3114        | SCPs             | Scp              | Anomalies       |
 | 24  | Destroyed      | Dead             | None             | Draw            |
-| 25  | Flamingo       | Dead             | None             | Draw            |
-| 26  | AlphaFlamingo  | Dead             | None             | Draw            |
-| 27  | ZombieFlamingo | Dead             | None             | Draw            |
+| 25  | Flamingo       | Flamingos        | Flamingos        | Flamingo        |
+| 26  | AlphaFlamingo  | Flamingos        | Flamingos        | Flamingo        |
+| 27  | ZombieFlamingo | SCPs             | Scp              | Anomalies       |
+| 28  | NtfFlamingo    | FoundationForces | Mtf              | FacilityForces  |
+| 29  | ChaosFlamingo  | ChaosInsurgency  | ChaosInsurgency  | ChaosInsurgency |
 ```
 
 </details>
@@ -5797,7 +5848,7 @@ Last Update (14.2.0.1)
 
 <details><summary> <b>Damage Handlers</b></summary>
 
-```md title="Latest Updated: 14.2.0.1"
+```md title="Latest Updated: 14.2.0.4"
 All available DamageHandlers
 
 + Symbol ':' literally means "inherits from"

From 2ef23f02e035cc109f9f0a3d8ef5bd4847e961a1 Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Mon, 5 Jan 2026 13:37:05 -0500
Subject: [PATCH 04/10] Revert "merge dev"

This reverts commit 2e7f2d353b3b2b529519324ea3088cc0319d33b3.
---
 EXILED/EXILED.props                           |   2 +-
 EXILED/Exiled.API/Enums/CameraType.cs         |   5 -
 EXILED/Exiled.API/Enums/DoorType.cs           |   5 -
 EXILED/Exiled.API/Enums/EffectType.cs         |  57 ++--
 EXILED/Exiled.API/Enums/GlassType.cs          |   5 -
 EXILED/Exiled.API/Enums/PrefabType.cs         |  42 ---
 EXILED/Exiled.API/Enums/ProjectileType.cs     |   6 +-
 EXILED/Exiled.API/Enums/RoomType.cs           |   5 -
 EXILED/Exiled.API/Enums/Side.cs               |   5 -
 EXILED/Exiled.API/Exiled.API.csproj           |   1 -
 .../Extensions/DamageTypeExtensions.cs        |   7 -
 .../Extensions/EffectTypeExtension.cs         |   3 -
 .../Exiled.API/Extensions/MirrorExtensions.cs |  33 ++-
 .../Exiled.API/Extensions/RoleExtensions.cs   |   9 +-
 EXILED/Exiled.API/Features/Camera.cs          |   5 -
 EXILED/Exiled.API/Features/Cassie.cs          | 116 +++-----
 .../DamageHandlers/CustomDamageHandler.cs     |  12 +-
 .../DamageHandlers/DamageHandlerBase.cs       |   7 -
 EXILED/Exiled.API/Features/Doors/Door.cs      |   1 -
 EXILED/Exiled.API/Features/Effect.cs          |   2 +-
 .../Features/Items/FirearmModules/Magazine.cs |   9 +-
 .../FirearmModules/Primary/Scp127Magazine.cs  |  80 -----
 EXILED/Exiled.API/Features/Items/Item.cs      |  15 +-
 EXILED/Exiled.API/Features/Items/Jailbird.cs  |  26 +-
 .../Features/Items/Keycards/ChaosKeycard.cs   |   3 +-
 .../Exiled.API/Features/Items/Marshmallow.cs  | 102 -------
 EXILED/Exiled.API/Features/Items/Scp127.cs    | 274 ------------------
 EXILED/Exiled.API/Features/Lift.cs            |   7 -
 .../Features/Pickups/JailbirdPickup.cs        |  10 +-
 .../Features/Pickups/Scp1509Pickup.cs         |   2 +-
 EXILED/Exiled.API/Features/Player.cs          |  54 +---
 EXILED/Exiled.API/Features/Recontainer.cs     |  16 +-
 EXILED/Exiled.API/Features/Roles/FpcRole.cs   |  24 --
 .../Exiled.API/Features/Roles/Scp049Role.cs   |   3 +-
 .../Exiled.API/Features/Roles/Scp096Role.cs   |  18 +-
 .../Exiled.API/Features/Roles/Scp1507Role.cs  |   2 +-
 EXILED/Exiled.API/Features/Room.cs            |   1 -
 EXILED/Exiled.API/Features/Scp559.cs          |  24 +-
 EXILED/Exiled.API/Features/Server.cs          |  22 +-
 EXILED/Exiled.API/Features/Waves/TimedWave.cs |   4 +-
 EXILED/Exiled.API/Features/Window.cs          |   1 -
 .../API/Features/CustomItem.cs                |   9 +
 .../API/Features/CustomRole.cs                |   6 -
 EXILED/Exiled.CustomRoles/Commands/Get.cs     | 123 --------
 EXILED/Exiled.CustomRoles/Commands/Give.cs    |   2 +-
 EXILED/Exiled.CustomRoles/Commands/Parent.cs  |   3 +-
 .../Exiled.CustomRoles.csproj                 |   2 +-
 EXILED/Exiled.Events/Commands/TpsCommand.cs   |   5 +-
 .../Cassie/SendingCassieMessageEventArgs.cs   | 144 ++-------
 .../EventArgs/Interfaces/IMarshmallowEvent.cs |  22 --
 .../EventArgs/Interfaces/IScp127Event.cs      |  20 --
 .../EventArgs/Interfaces/IScp1507Event.cs     |   2 +-
 .../EventArgs/Interfaces/IScp559Event.cs      |   2 +-
 .../EventArgs/Item/CacklingEventArgs.cs       |  50 ----
 .../EventArgs/Item/PunchingEventArgs.cs       |  50 ----
 .../Map/AnnouncingScpTerminationEventArgs.cs  |  18 +-
 .../Player/ReceivingEffectEventArgs.cs        |  21 +-
 .../Scp1576TransmissionEndedEventArgs.cs      |  41 ---
 .../EventArgs/Player/UsedItemEventArgs.cs     |  14 +-
 .../Scp127/GainedExperienceEventArgs.cs       |  51 ----
 .../Scp127/GainingExperienceEventArgs.cs      |  59 ----
 .../EventArgs/Scp127/TalkedEventArgs.cs       |  52 ----
 .../EventArgs/Scp127/TalkingEventArgs.cs      |  57 ----
 .../Scp1507/AttackingDoorEventArgs.cs         |   2 +-
 .../EventArgs/Scp1507/ScreamingEventArgs.cs   |   2 +-
 .../Scp1507/SpawningFlamingosEventArgs.cs     |   2 +-
 .../EventArgs/Scp1507/UsingTapeEventArgs.cs   |   2 +-
 .../Scp2536/FoundPositionEventArgs.cs         |  40 ---
 .../Scp559/InteractingScp559EventArgs.cs      |   7 +-
 .../EventArgs/Scp559/SpawningEventArgs.cs     |   2 +-
 EXILED/Exiled.Events/Events.cs                |  12 -
 .../Exiled.Events/Handlers/Internal/Round.cs  |  15 +-
 EXILED/Exiled.Events/Handlers/Item.cs         |  22 --
 EXILED/Exiled.Events/Handlers/Player.cs       |  11 -
 EXILED/Exiled.Events/Handlers/Scp127.cs       |  81 ------
 EXILED/Exiled.Events/Handlers/Scp1507.cs      |   2 +-
 EXILED/Exiled.Events/Handlers/Scp2536.cs      |  11 -
 EXILED/Exiled.Events/Handlers/Scp559.cs       |   2 +-
 .../Events/Cassie/SendingCassieMessage.cs     |  54 +++-
 .../Patches/Events/Item/Cackling.cs           |  65 -----
 .../Patches/Events/Item/Punching.cs           |  65 -----
 .../Events/Map/AnnouncingChaosEntrance.cs     |  11 +-
 .../Events/Map/AnnouncingNtfEntrance.cs       |  25 +-
 .../Events/Map/AnnouncingNtfMiniEntrance.cs   |  12 +-
 .../Events/Map/AnnouncingScpTermination.cs    | 108 +++----
 .../Events/Map/AnnouncingTeamEntrance.cs      |  68 +++++
 .../Events/Map/SpawningRoomConnector.cs       |  13 +-
 .../Patches/Events/Player/Landing.cs          |  16 +-
 .../Events/Player/ReceivingStatusEffect.cs    |  12 +-
 .../Events/Player/Scp1576TransmissionEnded.cs |  59 ----
 .../Events/Player/UsedItemByHolstering.cs     |  58 ----
 .../Patches/Events/Scp079/Recontaining.cs     |   7 +-
 .../Patches/Events/Scp2536/FoundPosition.cs   |  86 ------
 .../Patches/Events/Scp2536/GrantingGift.cs    |  44 +--
 .../Patches/Events/Scp559/Interacting.cs      |  15 +-
 .../Patches/Events/Scp559/Spawning.cs         |   2 -
 .../Events/Scp914/InteractingEvents.cs        |   8 +-
 .../Patches/Fixes/FixEffectOrder.cs           | 101 -------
 .../Patches/Fixes/FixMarshmallowManFF.cs      |  91 ------
 .../Patches/Fixes/FixNWFlashbangDuration.cs   |  30 --
 .../Patches/Fixes/FixScp1507DestroyingDoor.cs |  52 ----
 .../Patches/Fixes/Jailbird914CoarseFix.cs     |   2 +-
 .../Patches/Fixes/JailbirdHitRegFix.cs        |  61 ++++
 .../Patches/Generic/IndividualFriendlyFire.cs |   7 -
 .../Patches/Generic/Scp127MaxHs.cs            |  32 --
 EXILED/Exiled.Installer/Program.cs            |   2 +-
 EXILED/Exiled.Loader/AutoUpdateFiles.cs       |   2 +-
 EXILED/Exiled.Loader/ConfigManager.cs         |   5 +-
 EXILED/Exiled.Loader/Loader.cs                |   3 -
 EXILED/Exiled.Loader/Updater.cs               |   2 +-
 .../SCPSLRessources/NW_Documentation.md       |  91 ++----
 111 files changed, 524 insertions(+), 2676 deletions(-)
 delete mode 100644 EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
 delete mode 100644 EXILED/Exiled.API/Features/Items/Marshmallow.cs
 delete mode 100644 EXILED/Exiled.API/Features/Items/Scp127.cs
 delete mode 100644 EXILED/Exiled.CustomRoles/Commands/Get.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/Handlers/Scp127.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs

diff --git a/EXILED/EXILED.props b/EXILED/EXILED.props
index edc17d4fb2..f67ef6f8da 100644
--- a/EXILED/EXILED.props
+++ b/EXILED/EXILED.props
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">9.12.2</Version>
+    <Version Condition="$(Version) == ''">9.10.1</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 
diff --git a/EXILED/Exiled.API/Enums/CameraType.cs b/EXILED/Exiled.API/Enums/CameraType.cs
index 292da90b2d..535e7366ce 100644
--- a/EXILED/Exiled.API/Enums/CameraType.cs
+++ b/EXILED/Exiled.API/Enums/CameraType.cs
@@ -159,11 +159,6 @@ public enum CameraType
         EzGateAElevators,
         EzGateBInterior,
         EzGateBSide,
-        EzGateAStairwell,
-        EzGateAUpper,
-        HczLoadingBay,
-        HczLoadingBayRamp,
-        HczLoadingBayStairwell,
         #endregion
     }
 }
diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs
index 5863d6e79a..87e0de99a5 100644
--- a/EXILED/Exiled.API/Enums/DoorType.cs
+++ b/EXILED/Exiled.API/Enums/DoorType.cs
@@ -369,10 +369,5 @@ public enum DoorType
         /// Represents the door in the <see cref="RoomType.EzGateA"/> Armory.
         /// </summary>
         GateAArmory,
-
-        /// <summary>
-        /// Represents the door in <see cref="RoomType.HczLoadingBay"/>.
-        /// </summary>
-        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/EffectType.cs b/EXILED/Exiled.API/Enums/EffectType.cs
index 9bed0519c9..e70e273e77 100644
--- a/EXILED/Exiled.API/Enums/EffectType.cs
+++ b/EXILED/Exiled.API/Enums/EffectType.cs
@@ -216,7 +216,7 @@ public enum EffectType
         /// <summary>
         /// Makes you a marshmallow guy.
         /// </summary>
-        // [Obsolete("Not functional in-game")]
+        [Obsolete("Not functional in-game")]
         Marshmallow,
 
         /// <summary>
@@ -261,27 +261,27 @@ public enum EffectType
         Blurred,
 
         /// <summary>
-        /// Makes you a flamingo <see cref="CustomPlayerEffects.BecomingFlamingo"/>.
+        /// Makes you a flamingo.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         BecomingFlamingo,
 
         /// <summary>
-        /// Makes you a Child after eating Cake <see cref="Scp559Effect"/>.
+        /// Makes you a Child after eating Cake.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp559,
 
         /// <summary>
-        /// Scp956 found you <see cref="global::Scp956Target"/>.
+        /// Scp956 found you.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp956Target,
 
         /// <summary>
-        /// you are snowed <see cref="global::Snowed"/>.
+        /// you are snowed.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Snowed,
 
         /// <summary>
@@ -317,93 +317,78 @@ public enum EffectType
         /// <summary>
         /// <see cref="CustomPlayerEffects.Metal"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         Metal,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeCandy"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         OrangeCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeWitness"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         OrangeWitness,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Prismatic"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         Prismatic,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SlowMetabolism"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SlowMetabolism,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Spicy"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         Spicy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarCrave"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween or Christmas.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SugarCrave,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarHigh"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SugarHigh,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarRush"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SugarRush,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TemporaryBypass"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         TemporaryBypass,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TraumatizedByEvil"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         TraumatizedByEvil,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.WhiteCandy"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         WhiteCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Scp1509Resurrected"/>.
         /// </summary>
         Scp1509Resurrected,
-
-        /// <summary>
-        /// <see cref="CustomPlayerEffects.FocusedVision"/>.
-        /// </summary>
-        FocusedVision,
-
-        /// <summary>
-        /// <see cref="CustomPlayerEffects.AnomalousRegeneration"/>.
-        /// </summary>
-        AnomalousRegeneration,
-
-        /// <summary>
-        /// <see cref="CustomPlayerEffects.AnomalousTarget"/>.
-        /// </summary>
-        AnomalousTarget,
     }
 }
diff --git a/EXILED/Exiled.API/Enums/GlassType.cs b/EXILED/Exiled.API/Enums/GlassType.cs
index fef4d59f44..85c068108f 100644
--- a/EXILED/Exiled.API/Enums/GlassType.cs
+++ b/EXILED/Exiled.API/Enums/GlassType.cs
@@ -84,10 +84,5 @@ public enum GlassType
         /// Represents the window in <see cref="RoomType.EzGateA"/>.
         /// </summary>
         GateAArmory,
-
-        /// <summary>
-        /// Represents the window in <see cref="RoomType.HczLoadingBay"/>
-        /// </summary>
-        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/PrefabType.cs b/EXILED/Exiled.API/Enums/PrefabType.cs
index 43936f1d80..6a52ce7995 100644
--- a/EXILED/Exiled.API/Enums/PrefabType.cs
+++ b/EXILED/Exiled.API/Enums/PrefabType.cs
@@ -417,47 +417,5 @@ public enum PrefabType
 
         [Prefab(213466224, "SCP-939 Ragdoll Halloween")]
         Scp939RagdollHalloween,
-
-        [Prefab(689741320, "SCP-559 Cake")]
-        Scp559Cake,
-
-        [Prefab(2657863153, "SCP-956")]
-        Scp956,
-
-        [Prefab(1205960739, "SCP-2536 Tree")]
-        Scp2536,
-
-        [Prefab(2102014206, "Snowpile")]
-        Snowpile,
-
-        [Prefab(3401975113, "Scp018Projectile Christmas")]
-        Scp018ProjectileChristmas,
-
-        [Prefab(3223468476, "SnowballProjectile")]
-        SnowballProjectile,
-
-        [Prefab(296717882, "CoalPickup")]
-        CoalPickup,
-
-        [Prefab(409273101, "TapePlayerPickup")]
-        Scp1507TapePickup,
-
-        [Prefab(3971391978, "Scp021JPickup")]
-        Scp021JPickup,
-
-        [Prefab(142820664, "CoalProjectile")]
-        CoalProjectile,
-
-        [Prefab(2405470903, "Scp2536Projectile")]
-        Scp2536Projectile,
-
-        [Prefab(1496232901, "SCP-173 Ragdoll Variant")]
-        Scp173RagdollChristmas,
-
-        [Prefab(6069361, "SnowPoop - TantrumObj")]
-        SnowTantrum,
-
-        [Prefab(3654754970, "SCP-1507 Ragdoll")]
-        Scp1507Ragdoll,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/ProjectileType.cs b/EXILED/Exiled.API/Enums/ProjectileType.cs
index 2d95210924..a8072ed48e 100644
--- a/EXILED/Exiled.API/Enums/ProjectileType.cs
+++ b/EXILED/Exiled.API/Enums/ProjectileType.cs
@@ -51,21 +51,21 @@ public enum ProjectileType
         /// Coal.
         /// Used by <see cref="ItemType.Coal"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Coal,
 
         /// <summary>
         /// SpecialCoal.
         /// Used by <see cref="ItemType.SpecialCoal"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         SpecialCoal,
 
         /// <summary>
         /// Snowball.
         /// Used by <see cref="ItemType.Snowball"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas.")]
+        [Obsolete("Only availaible for Christmas.")]
         Snowball,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/RoomType.cs b/EXILED/Exiled.API/Enums/RoomType.cs
index 6dceeea6e2..0b7737c193 100644
--- a/EXILED/Exiled.API/Enums/RoomType.cs
+++ b/EXILED/Exiled.API/Enums/RoomType.cs
@@ -353,10 +353,5 @@ public enum RoomType
         /// Heavy Containment Zone's straight hall room with lava.
         /// </summary>
         HczDss12 = HczIncineratorWayside,
-
-        /// <summary>
-        /// Heavy Containment Zone's T-intersection with a ramp in it.
-        /// </summary>
-        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/Side.cs b/EXILED/Exiled.API/Enums/Side.cs
index 5accace2f3..5e9c063be7 100644
--- a/EXILED/Exiled.API/Enums/Side.cs
+++ b/EXILED/Exiled.API/Enums/Side.cs
@@ -52,10 +52,5 @@ public enum Side
         /// No team. Same as <see cref="Team.Dead"/>.
         /// </summary>
         None,
-
-        /// <summary>
-        /// Contains <see cref="RoleTypeId.Flamingo"/> and <see cref="RoleTypeId.AlphaFlamingo"/>. Same as <see cref="Team.Flamingos"/>.
-        /// </summary>
-        Flamingos,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Exiled.API.csproj b/EXILED/Exiled.API/Exiled.API.csproj
index 70f81bf0d1..31fe36e002 100644
--- a/EXILED/Exiled.API/Exiled.API.csproj
+++ b/EXILED/Exiled.API/Exiled.API.csproj
@@ -34,7 +34,6 @@
         <Reference Include="Snake" HintPath="$(EXILED_REFERENCES)\Snake.dll" Private="false" />
         <Reference Include="Unity.TextMeshPro" HintPath="$(EXILED_REFERENCES)\Unity.TextMeshPro.dll" Private="false" />
         <Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
-        <Reference Include="UnityEngine.AnimationModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.AnimationModule.dll" Private="false" />
         <Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />
         <Reference Include="UnityEngine.ParticleSystemModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.ParticleSystemModule.dll" Private="false" />
         <Reference Include="UnityEngine.PhysicsModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.PhysicsModule.dll" Private="false" />
diff --git a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
index 6fde63477d..95dfc33727 100644
--- a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
@@ -204,13 +204,6 @@ public static DamageType GetDamageType(DamageHandlerBase damageHandlerBase)
                         Log.Warn($"{nameof(DamageTypeExtensions)}.{nameof(damageHandlerBase)}: No matching {nameof(DamageType)} for {nameof(UniversalDamageHandler)} with ID {translation.Id}, type will be reported as {DamageType.Unknown}. Report this to EXILED Devs.");
                         return DamageType.Unknown;
                     }
-
-                case AttackerDamageHandler attackerDamageHandler:
-                    {
-                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
-                            return DamageType.Marshmallow;
-                        return DamageType.Unknown;
-                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
index 088438e085..c44a32362d 100644
--- a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
+++ b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
@@ -101,9 +101,6 @@ public static class EffectTypeExtension
             { EffectType.TraumatizedByEvil, typeof(TraumatizedByEvil) },
             { EffectType.WhiteCandy, typeof(WhiteCandy) },
             { EffectType.Scp1509Resurrected, typeof(Scp1509Resurrected) },
-            { EffectType.FocusedVision, typeof(FocusedVision) },
-            { EffectType.AnomalousRegeneration, typeof(AnomalousRegeneration) },
-            { EffectType.AnomalousTarget, typeof(AnomalousTarget) },
             #pragma warning restore CS0618
         });
 
diff --git a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
index 3ba47fd9a8..605e6466c0 100644
--- a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
@@ -17,7 +17,6 @@ namespace Exiled.API.Extensions
 
     using AdminToys;
     using AudioPooling;
-    using Cassie;
     using CustomPlayerEffects;
     using Exiled.API.Enums;
     using Exiled.API.Features.Items;
@@ -513,12 +512,13 @@ public static void ResyncKeycardPickup(CustomKeycardPickup customKeycard)
         /// <param name="isSubtitles">Same on <see cref="Cassie.Message(string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void PlayCassieAnnouncement(this Player player, string words, bool makeHold = false, bool makeNoise = true, bool isSubtitles = false)
         {
-            CassieAnnouncement announcement = new(new CassieTtsPayload(words, isSubtitles, makeHold), 0, makeNoise ? 1 : 0);
-
-            // processes makeNoise
-            announcement.OnStartedPlaying();
-
-            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
+            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
+            {
+                if (controller != null)
+                {
+                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), words, makeHold, makeNoise, isSubtitles);
+                }
+            }
         }
 
         /// <summary>
@@ -533,12 +533,23 @@ public static void PlayCassieAnnouncement(this Player player, string words, bool
         /// <param name="isSubtitles">Same on <see cref="Cassie.MessageTranslated(string, string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void MessageTranslated(this Player player, string words, string translation, string customSubtitles, bool makeHold = false, bool makeNoise = true, bool isSubtitles = true)
         {
-            CassieAnnouncement announcement = new(new CassieTtsPayload(words, customSubtitles, makeHold), 0, makeNoise ? 1 : 0);
+            StringBuilder announcement = StringBuilderPool.Pool.Get();
 
-            // processes makeNoise
-            announcement.OnStartedPlaying();
+            string[] cassies = words.Split('\n');
+            string[] translations = translation.Split('\n');
 
-            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
+            for (int i = 0; i < cassies.Length; i++)
+                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
+
+            string message = StringBuilderPool.Pool.ToStringReturn(announcement);
+
+            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
+            {
+                if (controller != null)
+                {
+                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), message, makeHold, makeNoise, isSubtitles, customSubtitles);
+                }
+            }
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.API/Extensions/RoleExtensions.cs b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
index db1a7c99a9..369910654a 100644
--- a/EXILED/Exiled.API/Extensions/RoleExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
@@ -70,7 +70,6 @@ public static class RoleExtensions
             Team.FoundationForces or Team.Scientists => Side.Mtf,
             Team.ChaosInsurgency or Team.ClassD => Side.ChaosInsurgency,
             Team.OtherAlive => Side.Tutorial,
-            Team.Flamingos => Side.Flamingos,
             _ => Side.None,
         };
 
@@ -81,13 +80,12 @@ public static class RoleExtensions
         /// <returns><see cref="Team"/>.</returns>
         public static Team GetTeam(this RoleTypeId roleType) => roleType switch
         {
-            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman or RoleTypeId.ChaosFlamingo => Team.ChaosInsurgency,
+            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman => Team.ChaosInsurgency,
             RoleTypeId.Scientist => Team.Scientists,
             RoleTypeId.ClassD => Team.ClassD,
-            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 or RoleTypeId.ZombieFlamingo=> Team.SCPs,
-            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist or RoleTypeId.NtfFlamingo => Team.FoundationForces,
+            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 => Team.SCPs,
+            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist => Team.FoundationForces,
             RoleTypeId.Tutorial => Team.OtherAlive,
-            RoleTypeId.Flamingo or RoleTypeId.AlphaFlamingo => Team.Flamingos,
             _ => Team.Dead,
         };
 
@@ -133,7 +131,6 @@ public static bool TryGetRoleBase<T>(this RoleTypeId roleType, out T roleBase)
             Team.ClassD or Team.ChaosInsurgency => LeadingTeam.ChaosInsurgency,
             Team.FoundationForces or Team.Scientists => LeadingTeam.FacilityForces,
             Team.SCPs => LeadingTeam.Anomalies,
-            Team.Flamingos => LeadingTeam.Flamingo,
             _ => LeadingTeam.Draw,
         };
 
diff --git a/EXILED/Exiled.API/Features/Camera.cs b/EXILED/Exiled.API/Features/Camera.cs
index fa17a77540..fca5cbbc73 100644
--- a/EXILED/Exiled.API/Features/Camera.cs
+++ b/EXILED/Exiled.API/Features/Camera.cs
@@ -143,11 +143,6 @@ public class Camera : IWrapper<Scp079Camera>, IWorldSpace
             ["GATE A ELEVATORS"] = CameraType.EzGateAElevators,
             ["GATE B INTERIOR"] = CameraType.EzGateBInterior,
             ["GATE B SIDE"] = CameraType.EzGateBSide,
-            ["GATE A STAIRWELL"] = CameraType.EzGateAStairwell,
-            ["GATE A UPPER"] = CameraType.EzGateAUpper,
-            ["LOADING BAY"] = CameraType.HczLoadingBay,
-            ["HCZ LOADING RAMP"] = CameraType.HczLoadingBayRamp,
-            ["STAIRWELL"] = CameraType.HczLoadingBayStairwell,
 
             // CustomCamera
             ["EZ ARM CAMERA TOY"] = CameraType.EzArmCameraToy,
diff --git a/EXILED/Exiled.API/Features/Cassie.cs b/EXILED/Exiled.API/Features/Cassie.cs
index 475e68ad4e..0730f9a5a9 100644
--- a/EXILED/Exiled.API/Features/Cassie.cs
+++ b/EXILED/Exiled.API/Features/Cassie.cs
@@ -7,19 +7,19 @@
 
 namespace Exiled.API.Features
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
 
     using Exiled.API.Features.Pools;
-    using global::Cassie;
-    using global::Cassie.Interpreters;
+
     using MEC;
+
     using PlayerRoles;
+
     using PlayerStatsSystem;
+
     using Respawning;
-    using Respawning.NamingRules;
 
     using CustomFirearmHandler = DamageHandlers.FirearmDamageHandler;
     using CustomHandlerBase = DamageHandlers.DamageHandlerBase;
@@ -29,15 +29,20 @@ namespace Exiled.API.Features
     /// </summary>
     public static class Cassie
     {
+        /// <summary>
+        /// Gets the <see cref="NineTailedFoxAnnouncer"/> singleton.
+        /// </summary>
+        public static NineTailedFoxAnnouncer Announcer => NineTailedFoxAnnouncer.singleton;
+
         /// <summary>
         /// Gets a value indicating whether C.A.S.S.I.E is currently announcing. Does not include decontamination or Alpha Warhead Messages.
         /// </summary>
-        public static bool IsSpeaking => CassieAnnouncementDispatcher.AllAnnouncements.Count != 0;
+        public static bool IsSpeaking => Announcer.queue.Count != 0;
 
         /// <summary>
-        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="CassieAnnouncementDispatcher.AllAnnouncements"/> objects that C.A.S.S.I.E recognizes.
+        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="NineTailedFoxAnnouncer.VoiceLine"/> objects that C.A.S.S.I.E recognizes.
         /// </summary>
-        public static IReadOnlyCollection<CassieAnnouncement> VoiceLines => CassieAnnouncementDispatcher.AllAnnouncements;
+        public static IReadOnlyCollection<NineTailedFoxAnnouncer.VoiceLine> VoiceLines => Announcer.voiceLines;
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message.
@@ -47,7 +52,7 @@ public static class Cassie
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void Message(string message, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
+            RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles);
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message with a possibility to custom the subtitles.
@@ -59,7 +64,14 @@ public static void Message(string message, bool isHeld = false, bool isNoisy = t
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void MessageTranslated(string message, string translation, bool isHeld = false, bool isNoisy = true, bool isSubtitles = true)
         {
-            new CassieAnnouncement(new CassieTtsPayload(message, translation, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
+            StringBuilder announcement = StringBuilderPool.Pool.Get();
+            string[] cassies = message.Split('\n');
+            string[] translations = translation.Split('\n');
+            for (int i = 0; i < cassies.Length; i++)
+                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
+
+            RespawnEffectsController.PlayCassieAnnouncement(announcement.ToString(), isHeld, isNoisy, isSubtitles);
+            StringBuilderPool.Pool.Return(announcement);
         }
 
         /// <summary>
@@ -69,7 +81,7 @@ public static void MessageTranslated(string message, string translation, bool is
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void GlitchyMessage(string message, float glitchChance, float jamChance) =>
-            new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue();
+            Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance);
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message after a certain amount of seconds.
@@ -80,7 +92,7 @@ public static void GlitchyMessage(string message, float glitchChance, float jamC
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void DelayedMessage(string message, float delay, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue());
+            Timing.CallDelayed(delay, () => RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles));
 
         /// <summary>
         /// Reproduce a glitchy C.A.S.S.I.E announcement after a certain period of seconds.
@@ -90,53 +102,17 @@ public static void DelayedMessage(string message, float delay, bool isHeld = fal
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void DelayedGlitchyMessage(string message, float delay, float glitchChance, float jamChance) =>
-            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue());
-
-        /// <summary>
-        /// Calculates the duration of a C.A.S.S.I.E message.
-        /// </summary>
-        /// <param name="message">The message, which duration will be calculated.</param>
-        /// <param name="obsolete1">An obsolete parameter.</param>
-        /// <param name="obsolete2">Another obsolete parameter.</param>
-        /// <returns>Duration (in seconds) of specified message.</returns>
-        [Obsolete("Please use CalculateDuration(string)", true)]
-        public static float CalculateDuration(string message, bool obsolete1, float obsolete2) => CalculateDuration(message);
+            Timing.CallDelayed(delay, () => Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance));
 
         /// <summary>
         /// Calculates the duration of a C.A.S.S.I.E message.
         /// </summary>
         /// <param name="message">The message, which duration will be calculated.</param>
+        /// <param name="rawNumber">Determines if a number won't be converted to its full pronunciation.</param>
+        /// <param name="speed">The speed of the message.</param>
         /// <returns>Duration (in seconds) of specified message.</returns>
-        public static float CalculateDuration(string message)
-        {
-            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
-            {
-                return 0;
-            }
-
-            float value = 0;
-            string[] lines = message.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-            CassiePlaybackModifiers modifiers = new();
-            StringBuilder builder = StringBuilderPool.Pool.Get();
-
-            for (int i = 0; i < lines.Length; i++)
-            {
-                foreach (CassieInterpreter interpreter in CassieTtsAnnouncer.Interpreters)
-                {
-                    bool halt;
-                    foreach (CassieInterpreter.Result result in interpreter.GetResults(cassieLineDatabase, ref modifiers, lines[i], builder, out halt))
-                    {
-                        value += (float)result.Modifiers.GetTimeUntilNextWord(result.Line);
-                    }
-
-                    if (halt)
-                        break;
-                }
-            }
-
-            return value;
-        }
+        public static float CalculateDuration(string message, bool rawNumber = false, float speed = 1f)
+            => Announcer.CalculateDuration(message, rawNumber, speed);
 
         /// <summary>
         /// Converts a <see cref="Team"/> into a Cassie-Readable <c>CONTAINMENTUNIT</c>.
@@ -144,16 +120,8 @@ public static float CalculateDuration(string message)
         /// <param name="team"><see cref="Team"/>.</param>
         /// <param name="unitName">Unit Name.</param>
         /// <returns><see cref="string"/> Containment Unit text.</returns>
-        public static string ConvertTeam(Team team, string unitName) => team switch
-        {
-            Team.FoundationForces when NamingRulesManager.TryGetNamingRule(team, out UnitNamingRule unitNamingRule) => "CONTAINMENTUNIT " + unitNamingRule.TranslateToCassie(unitName),
-            Team.FoundationForces => "CONTAINMENTUNIT UNKNOWN",
-            Team.ChaosInsurgency => "BY CHAOSINSURGENCY",
-            Team.Scientists => "BY SCIENCE PERSONNEL",
-            Team.ClassD => "BY CLASSD PERSONNEL",
-            Team.Flamingos => "BY SCP 1 5 0 7",
-            _ => "UNKNOWN",
-        };
+        public static string ConvertTeam(Team team, string unitName)
+            => NineTailedFoxAnnouncer.ConvertTeam(team, unitName);
 
         /// <summary>
         /// Converts a number into a Cassie-Readable String.
@@ -161,23 +129,7 @@ Team.FoundationForces when NamingRulesManager.TryGetNamingRule(team, out UnitNam
         /// <param name="num">Number to convert.</param>
         /// <returns>A CASSIE-readable <see cref="string"/> representing the number.</returns>
         public static string ConvertNumber(int num)
-        {
-            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
-            {
-                return string.Empty;
-            }
-
-            NumberInterpreter numberInterpreter = (NumberInterpreter)CassieTtsAnnouncer.Interpreters.FirstOrDefault((CassieInterpreter x) => x is NumberInterpreter);
-            if (numberInterpreter == null)
-            {
-                return string.Empty;
-            }
-
-            CassiePlaybackModifiers cassiePlaybackModifiers = default;
-            StringBuilder stringBuilder = new();
-            numberInterpreter.GetResults(cassieLineDatabase, ref cassiePlaybackModifiers, num.ToString(), stringBuilder, out bool flag);
-            return stringBuilder.ToString();
-        }
+            => NineTailedFoxAnnouncer.ConvertNumber(num);
 
         /// <summary>
         /// Announce a SCP Termination.
@@ -185,7 +137,7 @@ public static string ConvertNumber(int num)
         /// <param name="scp">SCP to announce termination of.</param>
         /// <param name="info">HitInformation.</param>
         public static void ScpTermination(Player scp, DamageHandlerBase info)
-            => CassieScpTerminationAnnouncement.AnnounceScpTermination(scp.ReferenceHub, info);
+            => NineTailedFoxAnnouncer.AnnounceScpTermination(scp.ReferenceHub, info);
 
         /// <summary>
         /// Announces the termination of a custom SCP name.
@@ -215,14 +167,14 @@ public static void CustomScpTermination(string scpName, CustomHandlerBase info)
         /// <summary>
         /// Clears the C.A.S.S.I.E queue.
         /// </summary>
-        public static void Clear() => CassieAnnouncementDispatcher.ClearAll();
+        public static void Clear() => RespawnEffectsController.ClearQueue();
 
         /// <summary>
         /// Gets a value indicating whether the given word is a valid C.A.S.S.I.E word.
         /// </summary>
         /// <param name="word">The word to check.</param>
         /// <returns><see langword="true"/> if the word is valid; otherwise, <see langword="false"/>.</returns>
-        public static bool IsValid(string word) => CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase) ? cassieLineDatabase.AllLines.Any(line => line.ApiName.ToUpper() == word.ToUpper()) : false;
+        public static bool IsValid(string word) => Announcer.voiceLines.Any(line => line.apiName.ToUpper() == word.ToUpper());
 
         /// <summary>
         /// Gets a value indicating whether the given sentence is all valid C.A.S.S.I.E word.
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
index fde6e9e00a..67b464474f 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
@@ -39,17 +39,11 @@ public CustomDamageHandler(Player target, BaseHandler baseHandler)
             if (Attacker is not null)
             {
                 if (baseHandler is BaseScpDamageHandler)
-                {
                     CustomBase = new ScpDamageHandler(target, baseHandler);
-                }
+                else if (Attacker.CurrentItem is not null && Attacker.CurrentItem.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
+                    CustomBase = new FirearmDamageHandler(Attacker.CurrentItem, target, baseHandler);
                 else
-                {
-                    Item item = Attacker.CurrentItem;
-                    if (item is not null && item.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
-                        CustomBase = new FirearmDamageHandler(item, target, baseHandler);
-                    else
-                        CustomBase = new DamageHandler(target, Attacker);
-                }
+                    CustomBase = new DamageHandler(target, Attacker);
             }
             else
             {
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
index 248e89452b..ec59d5ee5a 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
@@ -271,13 +271,6 @@ protected DamageType GetDamageType(BaseHandler damageHandler = null)
                         FirearmType.FRMG0 => DamageType.Frmg0,
                         _ => DamageType.Firearm
                     };
-
-                case PlayerStatsSystem.AttackerDamageHandler attackerDamageHandler:
-                    {
-                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
-                            return DamageType.Marshmallow;
-                        return DamageType.Unknown;
-                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Features/Doors/Door.cs b/EXILED/Exiled.API/Features/Doors/Door.cs
index a8163f207c..19718900a7 100644
--- a/EXILED/Exiled.API/Features/Doors/Door.cs
+++ b/EXILED/Exiled.API/Features/Doors/Door.cs
@@ -624,7 +624,6 @@ private DoorType GetDoorType()
                         RoomType.HczEzCheckpointA => DoorType.CheckpointArmoryA,
                         RoomType.HczEzCheckpointB => DoorType.CheckpointArmoryB,
                         RoomType.EzGateA => DoorType.GateAArmory,
-                        RoomType.HczLoadingBay => DoorType.HczLoadingBay,
                         _ => DoorType.UnknownDoor,
                     },
                     "Unsecured Pryable GateDoor" => Room?.Type switch
diff --git a/EXILED/Exiled.API/Features/Effect.cs b/EXILED/Exiled.API/Features/Effect.cs
index 426b68dcdc..f901966917 100644
--- a/EXILED/Exiled.API/Features/Effect.cs
+++ b/EXILED/Exiled.API/Features/Effect.cs
@@ -35,7 +35,7 @@ public Effect(StatusEffectBase statusEffectBase)
             if (!statusEffectBase.TryGetEffectType(out EffectType effect))
                 Log.Error($"EffectType not found please report to Exiled BugReport : {statusEffectBase}");
             Type = effect;
-            Duration = statusEffectBase.TimeLeft;
+            Duration = statusEffectBase.Duration;
             Intensity = statusEffectBase.Intensity;
             IsEnabled = statusEffectBase.IsEnabled;
         }
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
index 8fb2688bb7..50a2538c64 100644
--- a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
+++ b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
@@ -11,8 +11,9 @@ namespace Exiled.API.Features.Items.FirearmModules
 
     using Exiled.API.Features.Items.FirearmModules.Barrel;
     using Exiled.API.Features.Items.FirearmModules.Primary;
+
     using InventorySystem.Items.Firearms.Modules;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
+
     using UnityEngine;
 
     /// <summary>
@@ -65,12 +66,8 @@ public static Magazine Get(IAmmoContainerModule module)
                 PumpActionModule pump => new PumpBarrelMagazine(pump),
                 IPrimaryAmmoContainerModule primary => primary switch
                 {
+                    MagazineModule magazine => new NormalMagazine(magazine),
                     CylinderAmmoModule cylinder => new CylinderMagazine(cylinder),
-                    MagazineModule magazine => magazine switch
-                    {
-                        Scp127MagazineModule scp127MagazineModule => new Scp127Magazine(scp127MagazineModule),
-                        _ => new NormalMagazine(magazine)
-                    },
                     _ => null,
                 },
                 _ => null,
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
deleted file mode 100644
index c3226169ea..0000000000
--- a/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127Magazine.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.API.Features.Items.FirearmModules.Primary
-{
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Represents a normal magazine for SCP-127.
-    /// </summary>
-    public class Scp127Magazine : NormalMagazine
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp127Magazine"/> class.
-        /// </summary>
-        /// <param name="magazine"><inheritdoc cref="MagazineModule"/></param>
-        public Scp127Magazine(Scp127MagazineModule magazine)
-            : base(magazine)
-        {
-            MagazineModule = magazine;
-        }
-
-        /// <inheritdoc cref="NormalMagazine.MagazineModule"/>
-        public new Scp127MagazineModule MagazineModule { get; }
-
-        /// <summary>
-        /// Gets or sets the kill bonus.
-        /// </summary>
-        public int KillBonus
-        {
-            get => MagazineModule.KillBonus;
-            set => MagazineModule.KillBonus = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the rank up bonus.
-        /// </summary>
-        public int RankUpBonus
-        {
-            get => MagazineModule.RankUpBonus;
-            set => MagazineModule.RankUpBonus = value;
-        }
-
-        /// <summary>
-        /// Gets or sets all settings.
-        /// </summary>
-        public Scp127MagazineModule.RegenerationSettings[] RegenerationPerTier
-        {
-            get => MagazineModule._regenerationPerTier;
-            set => MagazineModule._regenerationPerTier = value;
-        }
-
-        /// <summary>
-        /// Gets the current setting.
-        /// </summary>
-        public Scp127MagazineModule.RegenerationSettings ActiveSetting => MagazineModule.ActiveSettings;
-
-        /// <summary>
-        /// Gets or sets a pause in bullets regeneration process.
-        /// </summary>
-        public float RemainingRegenPause
-        {
-            get => MagazineModule._remainingRegenPause;
-            set => MagazineModule._remainingRegenPause = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the amount of bullets that should be regenerated.
-        /// </summary>
-        public float RegenProgress
-        {
-            get => MagazineModule._regenProgress;
-            set => MagazineModule._regenProgress = value;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Item.cs b/EXILED/Exiled.API/Features/Items/Item.cs
index 89bb189c42..f9d8a74a0d 100644
--- a/EXILED/Exiled.API/Features/Items/Item.cs
+++ b/EXILED/Exiled.API/Features/Items/Item.cs
@@ -22,7 +22,6 @@ namespace Exiled.API.Features.Items
     using InventorySystem.Items.Firearms.Ammo;
     using InventorySystem.Items.Jailbird;
     using InventorySystem.Items.Keycards;
-    using InventorySystem.Items.MarshmallowMan;
     using InventorySystem.Items.MicroHID;
     using InventorySystem.Items.Pickups;
     using InventorySystem.Items.Radio;
@@ -219,11 +218,7 @@ public static Item Get(ItemBase itemBase)
 
             return itemBase switch
             {
-                InventorySystem.Items.Firearms.Firearm firearm => firearm.ItemTypeId switch
-                {
-                    ItemType.GunSCP127 => new Scp127(firearm),
-                    _ => new Firearm(firearm),
-                },
+                InventorySystem.Items.Firearms.Firearm firearm => new Firearm(firearm),
                 KeycardItem keycard => keycard switch
                 {
                     ChaosKeycardItem chaosKeycardItem => new ChaosKeycard(chaosKeycardItem),
@@ -261,7 +256,6 @@ public static Item Get(ItemBase itemBase)
                     _ => new Throwable(throwable),
                 },
                 Scp1509Item scp1509 => new Scp1509(scp1509),
-                MarshmallowItem marshmallow => new Marshmallow(marshmallow),
                 _ => new(itemBase),
             };
         }
@@ -324,11 +318,7 @@ public static T Get<T>(ushort serial)
         /// <returns>The <see cref="Item"/> created. This can be cast as a subclass.</returns>
         public static Item Create(ItemType type, Player owner = null) => type.GetTemplate() switch
         {
-            InventorySystem.Items.Firearms.Firearm => type switch
-            {
-                ItemType.GunSCP127 => new Scp127(),
-                _ => new Firearm(type),
-            },
+            InventorySystem.Items.Firearms.Firearm => new Firearm(type),
             KeycardItem keycard => keycard switch
             {
                 ChaosKeycardItem => new ChaosKeycard(type),
@@ -366,7 +356,6 @@ public static T Get<T>(ushort serial)
                 _ => new Throwable(type, owner),
             },
             Scp1509Item => new Scp1509(),
-            MarshmallowItem => new Marshmallow(type, owner),
             _ => new(type),
         };
 
diff --git a/EXILED/Exiled.API/Features/Items/Jailbird.cs b/EXILED/Exiled.API/Features/Items/Jailbird.cs
index 4cc9a59c86..b68a3473c2 100644
--- a/EXILED/Exiled.API/Features/Items/Jailbird.cs
+++ b/EXILED/Exiled.API/Features/Items/Jailbird.cs
@@ -52,8 +52,8 @@ internal Jailbird()
         /// </summary>
         public float MeleeDamage
         {
-            get => Base.MeleeDamage;
-            set => Base.MeleeDamage = value;
+            get => Base._hitreg._damageMelee;
+            set => Base._hitreg._damageMelee = value;
         }
 
         /// <summary>
@@ -61,8 +61,8 @@ public float MeleeDamage
         /// </summary>
         public float ChargeDamage
         {
-            get => Base._chargeDamage;
-            set => Base._chargeDamage = value;
+            get => Base._hitreg._damageCharge;
+            set => Base._hitreg._damageCharge = value;
         }
 
         /// <summary>
@@ -70,8 +70,8 @@ public float ChargeDamage
         /// </summary>
         public float FlashDuration
         {
-            get => Base._flashedDuration;
-            set => Base._flashedDuration = value;
+            get => Base._hitreg._flashedDuration;
+            set => Base._hitreg._flashedDuration = value;
         }
 
         /// <summary>
@@ -79,17 +79,17 @@ public float FlashDuration
         /// </summary>
         public float ConcussionDuration
         {
-            get => Base._concussionDuration;
-            set => Base._concussionDuration = value;
+            get => Base._hitreg._concussionDuration;
+            set => Base._hitreg._concussionDuration = value;
         }
 
         /// <summary>
-        /// Gets or sets the radius of the Jailbird's hit radius.
+        /// Gets or sets the radius of the Jailbird's hit register.
         /// </summary>
         public float Radius
         {
-            get => Base._hitregRadius;
-            set => Base._hitregRadius = value;
+            get => Base._hitreg._hitregRadius;
+            set => Base._hitreg._hitregRadius = value;
         }
 
         /// <summary>
@@ -97,10 +97,10 @@ public float Radius
         /// </summary>
         public float TotalDamageDealt
         {
-            get => Base.TotalMeleeDamageDealt;
+            get => Base._hitreg.TotalMeleeDamageDealt;
             set
             {
-                Base.TotalMeleeDamageDealt = value;
+                Base._hitreg.TotalMeleeDamageDealt = value;
                 Base._deterioration.RecheckUsage();
             }
         }
diff --git a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
index bab50d19ce..8d8bdad39d 100644
--- a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
+++ b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
@@ -43,8 +43,7 @@ internal ChaosKeycard(ItemType type)
         /// <summary>
         /// Gets the <see cref="InventorySystem.Items.Keycards.Snake.SnakeEngine"/> this encapsulates.
         /// </summary>
-        /// <remarks>Can be null, but shouldn't be during usage.</remarks>
-        public SnakeEngine SnakeEngine => ChaosKeycardItem.SnakeSessions.TryGetValue(Serial, out SnakeEngine engine) ? engine : null;
+        public SnakeEngine SnakeEngine => Base._localEngine;
 
         /// <summary>
         /// Returns the Keycard in a human readable format.
diff --git a/EXILED/Exiled.API/Features/Items/Marshmallow.cs b/EXILED/Exiled.API/Features/Items/Marshmallow.cs
deleted file mode 100644
index 349fe342fb..0000000000
--- a/EXILED/Exiled.API/Features/Items/Marshmallow.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Marshmallow.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.API.Features.Items
-{
-    using CustomPlayerEffects;
-    using Exiled.API.Interfaces;
-    using InventorySystem.Items.MarshmallowMan;
-    using PlayerStatsSystem;
-    using UnityEngine;
-
-    /// <summary>
-    /// A wrapper class for <see cref="MarshmallowItem"/>.
-    /// </summary>
-    public class Marshmallow : Item, IWrapper<MarshmallowItem>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
-        /// </summary>
-        /// <param name="itemBase">The base <see cref="MarshmallowItem"/> class.</param>
-        public Marshmallow(MarshmallowItem itemBase)
-            : base(itemBase)
-        {
-            Base = itemBase;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
-        /// </summary>
-        /// <param name="type">The <see cref="ItemType"/> of the marshmallow item.</param>
-        /// <param name="owner">The owner of the marshmallow item. Leave <see langword="null"/> for no owner.</param>
-        internal Marshmallow(ItemType type, Player owner = null)
-            : base((MarshmallowItem)(owner ?? Server.Host).Inventory.CreateItemInstance(new(type, 0), false))
-        {
-        }
-
-        /// <summary>
-        /// Gets the <see cref="MarshmallowItem"/> that this class is encapsulating.
-        /// </summary>
-        public new MarshmallowItem Base { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this marshmallow man is evil.
-        /// </summary>
-        /// <remarks>See <see cref="MakeEvil"/> in regards to making a marshmallow evil.</remarks>
-        public bool Evil => Base.EvilMode;
-
-        /// <summary>
-        /// Gets or sets the <see cref="AhpStat.AhpProcess"/> of the marshmallow man that would be used if he was evil.
-        /// </summary>
-        public AhpStat.AhpProcess EvilAhpProcess
-        {
-            get => Base.EvilAHPProcess;
-            set
-            {
-                if (Evil && value is null)
-                    return;
-
-                Base.EvilAHPProcess = value;
-            }
-        }
-
-        /// <summary>
-        /// Cackles for the owner even if they are not evil.
-        /// </summary>
-        /// <param name="cooldown">How long until the player can cackle again (negative values do not affect current cooldown).</param>
-        /// <param name="duration">How long players near the marshmallow man get effected by <see cref="TraumatizedByEvil"/>.</param>
-        public void Cackle(double cooldown = -1, float duration = 5)
-        {
-            if (cooldown >= 0)
-                Base._cackleCooldown.Trigger(cooldown);
-
-            Base.ServerSendPublicRpc(writer =>
-            {
-                writer.WriteByte(4);
-                Base._cackleCooldown.WriteCooldown(writer);
-            });
-
-            foreach (Player player in Player.List)
-            {
-                if (Vector3.Distance(player.Position, Owner.Position) <= 5F && player.CurrentItem is not Marshmallow { Evil: true })
-                    player.EnableEffect<TraumatizedByEvil>(duration);
-            }
-        }
-
-        /// <summary>
-        /// Makes the owner of this marshmallow evil. You CANNOT undo this without resetting the player.
-        /// </summary>
-        /// <param name="evilProcess">The <see cref="AhpStat.AhpProcess"/> of the new evil player.</param>
-        public void MakeEvil(AhpStat.AhpProcess evilProcess = null)
-        {
-            if (Evil)
-                return;
-
-            Base.ReleaseEvil(evilProcess ?? EvilAhpProcess ?? Owner.GetModule<AhpStat>().ServerAddProcess(450F, 450F, 0F, 1F, 0F, true));
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Scp127.cs b/EXILED/Exiled.API/Features/Items/Scp127.cs
deleted file mode 100644
index 2c71fbe4bb..0000000000
--- a/EXILED/Exiled.API/Features/Items/Scp127.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.API.Features.Items
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using InventorySystem.Items.Firearms.Modules;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-    using UnityEngine;
-
-    /// <summary>
-    /// Represents SCP-127.
-    /// </summary>
-    public class Scp127 : Firearm
-    {
-        #pragma warning disable SA1401
-        /// <summary>
-        /// Custom amount of max HS.
-        /// </summary>
-        internal float? CustomHsMax;
-        #pragma warning restore SA1401
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp127"/> class.
-        /// </summary>
-        /// <param name="itemBase"><inheritdoc cref="Firearm.Base"/></param>
-        public Scp127(InventorySystem.Items.Firearms.Firearm itemBase)
-            : base(itemBase)
-        {
-            foreach (ModuleBase module in Base.Modules)
-            {
-                switch (module)
-                {
-                    case Scp127HumeModule humeModule:
-                        HumeModule = humeModule;
-                        break;
-                    case Scp127TierManagerModule tierManagerModule:
-                        TierManagerModule = tierManagerModule;
-                        break;
-                    case Scp127VoiceLineManagerModule voiceLineManagerModule:
-                        VoiceLineManagerModule = voiceLineManagerModule;
-                        break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp127"/> class.
-        /// </summary>
-        internal Scp127()
-            : this((InventorySystem.Items.Firearms.Firearm)Server.Host.Inventory.CreateItemInstance(new(ItemType.GunSCP127, 0), false))
-        {
-        }
-
-        /// <summary>
-        /// Gets a collection of all active HS sessions.
-        /// </summary>
-        public static List<Scp127HumeModule.HumeShieldSession> ActiveHumeShieldSessions => Scp127HumeModule.ServerActiveSessions;
-
-        /// <summary>
-        /// Gets the <see cref="Scp127HumeModule"/> instance.
-        /// </summary>
-        public Scp127HumeModule HumeModule { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Scp127TierManagerModule"/> instance.
-        /// </summary>
-        public Scp127TierManagerModule TierManagerModule { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Scp127VoiceLineManagerModule"/> instance.
-        /// </summary>
-        public Scp127VoiceLineManagerModule VoiceLineManagerModule { get; }
-
-        /// <summary>
-        /// Gets or sets the maximum amount of HS.
-        /// </summary>
-        /// <remarks>If setter is used, after tier chance this value won't be edited automatically.</remarks>
-        public float HsMax
-        {
-            get => CustomHsMax ?? HumeModule.HsMax;
-            set => CustomHsMax = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a shield regeneration rate.
-        /// </summary>
-        public float ShieldRegenRate
-        {
-            get => HumeModule.ShieldRegenRate;
-            set => HumeModule.ShieldRegenRate = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a shield decay time.
-        /// </summary>
-        public float ShieldDecayRate
-        {
-            get => HumeModule.ShieldDecayRate;
-            set => HumeModule.ShieldDecayRate = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a pause before HS starts regeneration after damage being taken.
-        /// </summary>
-        public float ShieldOnDamagePause
-        {
-            get => HumeModule.ShieldOnDamagePause;
-            set => HumeModule.ShieldOnDamagePause = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a delay before HS starts dropping after unequipment.
-        /// </summary>
-        public float UnequipDecayDelay
-        {
-            get => HumeModule.UnequipDecayDelay;
-            set => HumeModule.UnequipDecayDelay = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a HumeShield regeneration.
-        /// </summary>
-        public float HsRegeneration
-        {
-            get => HumeModule.HsRegeneration;
-            set => HumeModule.HsRegeneration = value;
-        }
-
-        /// <summary>
-        /// Gets or sets an experience bonus for kill.
-        /// </summary>
-        public float KillBonus
-        {
-            get => TierManagerModule.KillBonus;
-            set => TierManagerModule.KillBonus = value;
-        }
-
-        /// <summary>
-        /// Gets or sets an amount of passive experience increase.
-        /// </summary>
-        public float PassiveExpAmount
-        {
-            get => TierManagerModule.PassiveExpAmount;
-            set => TierManagerModule.PassiveExpAmount = value;
-        }
-
-        /// <summary>
-        /// Gets or sets an interval of passive experience increase.
-        /// </summary>
-        public float PassiveExpInterval
-        {
-            get => TierManagerModule.PassiveExpInterval;
-            set => TierManagerModule.PassiveExpInterval = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a collection of all tier thresholds.
-        /// </summary>
-        public Scp127TierManagerModule.TierThreshold[] TierThresholds
-        {
-            get => TierManagerModule.Thresholds;
-            set => TierManagerModule.Thresholds = value;
-        }
-
-        /// <summary>
-        /// Gets or sets current tier.
-        /// </summary>
-        public Scp127Tier CurrentTier
-        {
-            get => TierManagerModule.CurTier;
-            set => TierManagerModule.CurTier = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the current experience amount.
-        /// </summary>
-        public float Experience
-        {
-            get => TierManagerModule.ServerExp;
-            set => TierManagerModule.ServerExp = value;
-        }
-
-        /// <summary>
-        /// Gets the instance record.
-        /// </summary>
-        public Scp127TierManagerModule.InstanceRecord InstanceRecord => Scp127TierManagerModule.GetRecord(Serial);
-
-        /// <summary>
-        /// Gets the Owner stats.
-        /// </summary>
-        public Scp127TierManagerModule.OwnerStats OwnerStats => Scp127TierManagerModule.GetStats(Base);
-
-        /// <summary>
-        /// Gets or sets all Voice Triggers.
-        /// </summary>
-        public Scp127VoiceTriggerBase[] VoiceTriggers
-        {
-            get => VoiceLineManagerModule._foundTriggers;
-            set => VoiceLineManagerModule._foundTriggers = value;
-        }
-
-        /// <summary>
-        /// Gets a collection of players that are friends with this SCP-127.
-        /// </summary>
-        public IEnumerable<Player> Friends
-        {
-            get
-            {
-                if (!Scp127VoiceLineManagerModule.FriendshipMemory.TryGetValue(Serial, out HashSet<uint> uintSet))
-                    return null;
-
-                return uintSet.Select(Player.Get);
-            }
-        }
-
-        /// <summary>
-        /// Increases experience.
-        /// </summary>
-        /// <param name="amount">Amount to add.</param>
-        public void IncreaseExperience(float amount) => TierManagerModule.ServerIncreaseExp(Base, amount);
-
-        /// <summary>
-        /// Sets owner stats.
-        /// </summary>
-        /// <param name="exp">New experience amount.</param>
-        public void SetOwnerStats(float exp) => TierManagerModule.ServerSetStats(exp);
-
-        /// <summary>
-        /// Sends tier stats.
-        /// </summary>
-        /// <param name="tier">New tier.</param>
-        /// <param name="progress">New progress.</param>
-        public void SendTierStats(Scp127Tier tier, byte progress) => TierManagerModule.ServerSendStats(Serial, Owner.ReferenceHub, tier, progress);
-
-        /// <summary>
-        /// Tries to play voice line.
-        /// </summary>
-        /// <param name="voiceLine">Voice line to play.</param>
-        /// <param name="priority">Priority of the play.</param>
-        /// <returns><c>true</c> if voice line has been played successfully. Otherwise, <c>false</c>.</returns>
-        public bool TryPlayVoiceLine(Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority priority = Scp127VoiceTriggerBase.VoiceLinePriority.Normal)
-        {
-            if (!VoiceLineManagerModule.TryFindVoiceLine(voiceLine, out Scp127VoiceTriggerBase triggerBase, out AudioClip audioClip))
-                return false;
-
-            VoiceLineManagerModule.ServerSendVoiceLine(triggerBase, null, audioClip, (byte)priority);
-            return true;
-        }
-
-        /// <summary>
-        /// Checks if this instance of SCP-127 and <paramref name="player"/> have friendship.
-        /// </summary>
-        /// <param name="player">Target to check.</param>
-        /// <returns><c>true</c> if this instance of SCP-127 and <paramref name="player"/> have friendship. Otherwise, <c>false</c>.</returns>
-        public bool HasFriendship(Player player) => Scp127VoiceLineManagerModule.HasFriendship(Serial, player.ReferenceHub);
-
-        /// <summary>
-        /// Adds player as a friend.
-        /// </summary>
-        /// <param name="player">Target to be added.</param>
-        public void AddFriend(Player player)
-        {
-            HashSet<uint> uints = Scp127VoiceLineManagerModule.FriendshipMemory.GetOrAddNew(Serial);
-            uints.Add(player.NetId);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Lift.cs b/EXILED/Exiled.API/Features/Lift.cs
index d191cd6764..469a33bd22 100644
--- a/EXILED/Exiled.API/Features/Lift.cs
+++ b/EXILED/Exiled.API/Features/Lift.cs
@@ -47,7 +47,6 @@ public class Lift : IWrapper<ElevatorChamber>, IWorldSpace
         internal Lift(ElevatorChamber elevator)
         {
             Base = elevator;
-            ElevatorAutoReturn = elevator.GetComponent<ElevatorAutoReturn>();
             ElevatorChamberToLift.Add(elevator, this);
 
             internalDoorsList.AddRange(Elevator.AllElevatorDoors[Group]);
@@ -74,12 +73,6 @@ internal Lift(ElevatorChamber elevator)
         /// </summary>
         public ElevatorChamber Base { get; }
 
-        /// <summary>
-        /// Gets the base <see cref="ElevatorAutoReturn"/>.
-        /// </summary>
-        /// <remarks>Would be null for any elevator that do not used <see cref="Interactables.Interobjects.ElevatorAutoReturn"/>.</remarks>
-        public ElevatorAutoReturn ElevatorAutoReturn { get; }
-
         /// <summary>
         /// Gets a value of the internal doors list.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
index eaaf77cb7a..0494d2e966 100644
--- a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
@@ -123,11 +123,11 @@ protected override void InitializeProperties(ItemBase itemBase)
             base.InitializeProperties(itemBase);
             if (itemBase is JailbirdItem jailbirdItem)
             {
-                MeleeDamage = jailbirdItem.MeleeDamage;
-                ChargeDamage = jailbirdItem._chargeDamage;
-                FlashDuration = jailbirdItem._flashedDuration;
-                ConcussionDuration = jailbirdItem._concussionDuration;
-                Radius = Radius;
+                MeleeDamage = jailbirdItem._hitreg._damageMelee;
+                ChargeDamage = jailbirdItem._hitreg._damageCharge;
+                FlashDuration = jailbirdItem._hitreg._flashedDuration;
+                ConcussionDuration = jailbirdItem._hitreg._concussionDuration;
+                Radius = jailbirdItem._hitreg._hitregRadius;
             }
         }
     }
diff --git a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
index 935bc636ca..b11c1cb0e9 100644
--- a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
@@ -15,7 +15,7 @@ namespace Exiled.API.Features.Pickups
     using BaseScp1509 = InventorySystem.Items.Scp1509.Scp1509Pickup;
 
     /// <summary>
-    /// A wrapper class for a Scp1509 pickup.
+    /// A wrapper class for a Radio pickup.
     /// </summary>
     public class Scp1509Pickup : Pickup, IWrapper<BaseScp1509>
     {
diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index 956fcf7f23..a61d640a84 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -648,7 +648,7 @@ public ScpSpawnPreferences.SpawnPreferences ScpPreferences
         /// <summary>
         /// Gets a value indicating whether the player is reloading a weapon.
         /// </summary>
-        public bool IsReloading => CurrentItem is Firearm firearm && firearm.IsReloading;
+        public bool IsReloading => CurrentItem is Firearm firearm && !firearm.IsReloading;
 
         /// <summary>
         /// Gets a value indicating whether the player is aiming with a weapon.
@@ -1982,24 +1982,10 @@ public void SetRank(string name, UserGroup group)
                 ReferenceHub.serverRoles.SetGroup(group, false, false);
             }
 
-            ServerStatic.PermissionsHandler.Members[UserId] = name;
-        }
-
-        /// <summary>
-        /// If the rank(group) exists in the remote admin config, it will assign it to the player.
-        /// </summary>
-        /// <param name="name">The rank name to be set.</param>
-        /// <returns><see langword="true"/> if the rank(group) was found and successfully assigned, <see langword="false"/> otherwise.</returns>
-        public bool TrySetRank(string name)
-        {
-            if (ServerStatic.PermissionsHandler.Groups.TryGetValue(name, out UserGroup userGroup))
-            {
-                ReferenceHub.serverRoles.SetGroup(userGroup, false, false);
+            if (ServerStatic.PermissionsHandler.Members.ContainsKey(UserId))
                 ServerStatic.PermissionsHandler.Members[UserId] = name;
-                return true;
-            }
-
-            return false;
+            else
+                ServerStatic.PermissionsHandler.Members.Add(UserId, name);
         }
 
         /// <summary>
@@ -2043,21 +2029,6 @@ public void Broadcast(Broadcast broadcast, bool shouldClearPrevious = false)
                 Broadcast(broadcast.Duration, broadcast.Content, broadcast.Type, shouldClearPrevious);
         }
 
-        /// <summary>
-        /// Send an <see cref="global::Cassie.CassieAnnouncement"/> to the player.
-        /// </summary>
-        /// <param name="cassieAnnouncement">The <see cref="global::Cassie.CassieAnnouncement"/> to be broadcasted.</param>
-        /// <returns><see langword="0"/> if Cassie failed to play it or it's play nothing, otherwise it's return the duration of the annoucement.</returns>
-        public float CassieAnnouncement(global::Cassie.CassieAnnouncement cassieAnnouncement)
-        {
-            global::Cassie.CassieAnnouncementDispatcher.CurrentAnnouncement.OnStartedPlaying();
-            global::Cassie.CassieTtsPayload payload = cassieAnnouncement.Payload;
-            if (!global::Cassie.CassieTtsAnnouncer.TryPlay(payload, out float totalduration))
-                return 0;
-            payload.SendToHubsConditionally(x => x == ReferenceHub);
-            return totalduration;
-        }
-
         /// <summary>
         /// Drops an item from the player's inventory.
         /// </summary>
@@ -2090,12 +2061,10 @@ public void DropItem(Item item, bool isThrown = false)
         /// <returns>Dropped item's <see cref="Pickup"/>.</returns>
         public Pickup DropHeldItem()
         {
-            Item item = CurrentItem;
-
-            if (item is null)
+            if (CurrentItem is null)
                 return null;
 
-            return DropItem(item);
+            return DropItem(CurrentItem);
         }
 
         /// <summary>
@@ -3480,7 +3449,10 @@ public void SyncEffect(Effect effect)
         {
             if (effect.IsEnabled)
             {
-                EnableEffect(effect.Type, effect.Intensity, effect.Duration, effect.AddDurationIfActive);
+                EnableEffect(effect.Type, effect.Duration, effect.AddDurationIfActive);
+
+                if (effect.Intensity > 0)
+                    ChangeEffectIntensity(effect.Type, effect.Intensity, effect.Duration);
             }
         }
 
@@ -3608,7 +3580,8 @@ public void ChangeEffectIntensity<T>(byte intensity, float duration = 0)
         {
             if (ReferenceHub.playerEffectsController.TryGetEffect(out T statusEffect))
             {
-                statusEffect.ServerSetState(intensity, duration, false);
+                statusEffect.Intensity = intensity;
+                statusEffect.ServerChangeDuration(duration, true);
             }
         }
 
@@ -3622,7 +3595,8 @@ public void ChangeEffectIntensity(EffectType type, byte intensity, float duratio
         {
             if (TryGetEffect(type, out StatusEffectBase statusEffect))
             {
-                statusEffect.ServerSetState(intensity, duration, false);
+                statusEffect.Intensity = intensity;
+                statusEffect.ServerChangeDuration(duration, false);
             }
         }
 
diff --git a/EXILED/Exiled.API/Features/Recontainer.cs b/EXILED/Exiled.API/Features/Recontainer.cs
index dbc31a35bf..17f59c97d5 100644
--- a/EXILED/Exiled.API/Features/Recontainer.cs
+++ b/EXILED/Exiled.API/Features/Recontainer.cs
@@ -7,7 +7,6 @@
 
 namespace Exiled.API.Features
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -34,8 +33,7 @@ public static class Recontainer
         /// <summary>
         /// Gets a value indicating whether the C.A.S.S.I.E is currently busy.
         /// </summary>
-        [Obsolete("Use Cassie.IsSpeaking instead")]
-        public static bool IsCassieBusy => Cassie.IsSpeaking;
+        public static bool IsCassieBusy => Base.CassieBusy;
 
         /// <summary>
         /// Gets a value about how many generator have been activated.
@@ -63,8 +61,11 @@ public static bool IsContainmentZoneLocked
         /// <summary>
         /// Gets or sets the delay to wait before overcharging.
         /// </summary>
-        [Obsolete("Will be removed in Exiled 10, patch the Cassie079RecontainAnnouncement ctor if you need this functionality")]
-        public static float OverchargeDelay { get; set; }
+        public static float OverchargeDelay
+        {
+            get => Base._activationDelay;
+            set => Base._activationDelay = value;
+        }
 
         /// <summary>
         /// Gets or sets the lockdown duration.
@@ -187,7 +188,7 @@ public static bool IsContainmentSequenceSuccessful
         /// </summary>
         /// <param name="announcement">The announcement to play.</param>
         /// <param name="glitchyMultiplier">The glitchy multiplier.</param>
-        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, false, false, null);
+        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, glitchyMultiplier);
 
         /// <summary>
         /// Begins the overcharge procedure.
@@ -198,6 +199,7 @@ public static void BeginOvercharge(bool endOvercharge = true)
             Base.BeginOvercharge();
             if (endOvercharge)
             {
+                Base._delayStopwatch.Stop();
                 Base._unlockStopwatch.Start();
             }
         }
@@ -226,7 +228,7 @@ public static void BeginOvercharge(bool endOvercharge = true)
         /// <summary>
         /// Begins the recontainment procedure.
         /// </summary>
-        public static void Recontain() => Base.Recontain(false);
+        public static void Recontain() => Base.Recontain();
 
         /// <summary>
         /// Refreshes the activator.
diff --git a/EXILED/Exiled.API/Features/Roles/FpcRole.cs b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
index 9a1156833e..2b0d75cf00 100644
--- a/EXILED/Exiled.API/Features/Roles/FpcRole.cs
+++ b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
@@ -300,30 +300,6 @@ public BasicRagdoll Ragdoll
         /// </summary>
         public SpectatableModuleBase SpectatableModuleBase => FirstPersonController.SpectatorModule;
 
-        /// <summary>
-        /// Tries to get the <see cref="Transform"/> of a specified <see cref="HumanBodyBones"/> bone.
-        /// </summary>
-        /// <param name="bone">The bone to get the <see cref="Transform"/> of.</param>
-        /// <param name="boneTransform">
-        /// When this method returns, contains the <see cref="Transform"/> of the specified bone, if found;
-        /// otherwise, <c>null</c>.
-        /// </param>
-        /// <returns><c>true</c> if the bone transform was found; otherwise, <c>false</c>.</returns>
-        public bool TryGetBoneTransform(HumanBodyBones bone, out Transform boneTransform)
-        {
-            boneTransform = null;
-
-            if (Model is not AnimatedCharacterModel animatedModel)
-                return false;
-
-            Animator animator = animatedModel.Animator;
-            if (animator == null || animator.avatar == null || !animator.avatar.isValid || !animator.avatar.isHuman)
-                return false;
-
-            boneTransform = animator.GetBoneTransform(bone);
-            return boneTransform != null;
-        }
-
         /// <summary>
         /// Resets the <see cref="Player"/>'s stamina.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
index 6283226eb4..1c015e2ff0 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
@@ -271,7 +271,8 @@ public void Attack(Player player)
             else
             {
                 cardiacArrest.SetAttacker(AttackAbility.Owner);
-                cardiacArrest.ServerSetState(1, AttackAbility._statusEffectDuration, false);
+                cardiacArrest.Intensity = 1;
+                cardiacArrest.ServerChangeDuration(AttackAbility._statusEffectDuration, false);
             }
 
             SenseAbility.OnServerHit(AttackAbility._target);
diff --git a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
index 6e78b6c662..a59e699ac9 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
@@ -16,8 +16,6 @@ namespace Exiled.API.Features.Roles
     using PlayerRoles.PlayableScps.Scp096;
     using PlayerRoles.Subroutines;
 
-    using UnityEngine;
-
     using Scp096GameRole = PlayerRoles.PlayableScps.Scp096.Scp096Role;
 
     /// <summary>
@@ -141,20 +139,6 @@ internal Scp096Role(Scp096GameRole baseRole)
         /// </summary>
         public bool AttackPossible => AttackAbility.AttackPossible;
 
-        /// <summary>
-        /// Gets the head transform of SCP-096's character model.
-        /// </summary>
-        public Transform HeadTransform
-        {
-            get
-            {
-                if (Model is not Scp096CharacterModel scp96AnimatedCharacterModel)
-                    return null;
-
-                return scp96AnimatedCharacterModel.Head;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the Charge Ability Cooldown.
         /// </summary>
@@ -322,4 +306,4 @@ public void Charge(float cooldown = 1f)
         /// <returns>The Spawn Chance.</returns>
         public float GetSpawnChance(List<RoleTypeId> alreadySpawned) => Base.GetSpawnChance(alreadySpawned);
     }
-}
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
index 170bda116a..a4c9ba78cf 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
@@ -20,7 +20,7 @@ namespace Exiled.API.Features.Roles
     /// <summary>
     /// Defines a role that represents SCP-1507.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp1507Role : FpcRole, ISubroutinedScpRole, IHumeShieldRole, ISpawnableScp
     {
         /// <summary>
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
index 846a76509c..a81a24173f 100644
--- a/EXILED/Exiled.API/Features/Room.cs
+++ b/EXILED/Exiled.API/Features/Room.cs
@@ -506,7 +506,6 @@ private static RoomType FindType(GameObject gameObject)
                 "HCZ_ChkpB" => RoomType.HczElevatorB,
                 "HCZ_127" => RoomType.Hcz127,
                 "HCZ_ServerRoom" => RoomType.HczServerRoom,
-                "HCZ_Intersection_Ramp" => RoomType.HczLoadingBay,
                 "EZ_GateA" => RoomType.EzGateA,
                 "EZ_GateB" => RoomType.EzGateB,
                 "EZ_ThreeWay" => RoomType.EzTCross,
diff --git a/EXILED/Exiled.API/Features/Scp559.cs b/EXILED/Exiled.API/Features/Scp559.cs
index d05702b351..08fc899047 100644
--- a/EXILED/Exiled.API/Features/Scp559.cs
+++ b/EXILED/Exiled.API/Features/Scp559.cs
@@ -18,7 +18,7 @@ namespace Exiled.API.Features
     /// <summary>
     /// Represents a cake.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp559 : IWrapper<Scp559Cake>, IPosition
     {
         /// <summary>
@@ -50,34 +50,20 @@ public Scp559(Scp559Cake cakeBase)
         /// <summary>
         /// Gets a <see cref="Dictionary{TKey,TValue}"/> with spawnpoint in rooms.
         /// </summary>
-        public static Dictionary<RoomName, Vector4> SpawnPositions { get; } = Scp559Spawnpoint.InstancesPerRoom.ToDictionary(kvp => kvp.Key.Name, kvp =>
-        {
-            Transform roomTransform = kvp.Key.transform;
-            Transform spawnTransform = kvp.Value.transform;
-
-            Vector3 localPos = roomTransform.InverseTransformPoint(spawnTransform.position);
-
-            return new Vector4(localPos.x, localPos.y, localPos.z, spawnTransform.eulerAngles.y);
-        });
+        public static Dictionary<RoomName, Vector4> SpawnPositions => Scp559Cake.Spawnpoints;
 
         /// <summary>
         /// Gets the list of all available spawnpoints.
         /// </summary>
-        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossibleSpawnpoints.Select(spawnpoint =>
-        {
-            Transform t = spawnpoint.transform;
-            return new Vector4(t.position.x, t.position.y, t.position.z, t.eulerAngles.y);
-        }).ToList();
+        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossiblePositions;
 
         /// <summary>
         /// Gets or sets offset for spawning near pedestals.
         /// </summary>
         public static Vector3 PedestalOffset
         {
-            get => new(0, -Scp559Spawnpoint.PedestalHeight, 0);
-
-            [Obsolete("Setter no longer works")]
-            set { }
+            get => Scp559Cake.PedestalOffset;
+            set => Scp559Cake.PedestalOffset.Set(value.x, value.y, value.z);
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.API/Features/Server.cs b/EXILED/Exiled.API/Features/Server.cs
index 825cfb3566..96b8311fdf 100644
--- a/EXILED/Exiled.API/Features/Server.cs
+++ b/EXILED/Exiled.API/Features/Server.cs
@@ -111,27 +111,7 @@ public static string Name
         /// <summary>
         /// Gets the actual ticks per second of the server.
         /// </summary>
-        public static double Tps
-        {
-            get
-            {
-                double delta = Time.deltaTime;
-
-                if (delta <= 0)
-                    return MaxTps;
-
-                double tps = 1d / delta;
-
-                tps = Math.Min(tps, MaxTps);
-
-                return tps;
-            }
-        }
-
-        /// <summary>
-        /// Gets the average ticks per second of the server.
-        /// </summary>
-        public static double SmoothTps => Math.Round(1f / Time.smoothDeltaTime);
+        public static double Tps => Math.Round(1f / Time.smoothDeltaTime);
 
         /// <summary>
         /// Gets or sets the max ticks per second of the server.
diff --git a/EXILED/Exiled.API/Features/Waves/TimedWave.cs b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
index 6e9a5c55bf..8856727c58 100644
--- a/EXILED/Exiled.API/Features/Waves/TimedWave.cs
+++ b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
@@ -193,13 +193,13 @@ public static List<TimedWave> GetTimedWaves()
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
-        public void PlayAnnouncement() => Announcement?.PlayAnnouncement([], Base as IAnnouncedWave);
+        public void PlayAnnouncement() => Announcement?.PlayAnnouncement(new());
 
         /// <summary>
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
         /// <param name="players">The list of Player to spawn.</param>
-        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList(), Base as IAnnouncedWave);
+        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList());
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Window.cs b/EXILED/Exiled.API/Features/Window.cs
index 2d327ff0c4..e5a1624e0d 100644
--- a/EXILED/Exiled.API/Features/Window.cs
+++ b/EXILED/Exiled.API/Features/Window.cs
@@ -231,7 +231,6 @@ public void DamageWindow(float amount, DamageHandlerBase handler)
                 RoomType.HczEzCheckpointB => GlassType.HczEzCheckpointB,
                 RoomType.EzGateA when Base.name[7] == '5' => GlassType.GateAArmory,
                 RoomType.EzGateA => GlassType.GateAPit,
-                RoomType.HczLoadingBay => GlassType.HczLoadingBay,
                 _ => GlassType.Unknown,
             },
             "Window" => Room?.Type switch
diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
index 182f47155e..fa39569e0a 100644
--- a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
@@ -1013,6 +1013,15 @@ private void OnInternalOwnerHandcuffing(HandcuffingEventArgs ev)
                     continue;
 
                 OnOwnerHandcuffing(new OwnerHandcuffingEventArgs(item, ev));
+
+                if (!ev.IsAllowed)
+                    continue;
+
+                ev.Target.RemoveItem(item);
+
+                TrackedSerials.Remove(item.Serial);
+
+                Spawn(ev.Target, item, ev.Target);
             }
         }
 
diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index afce01ccdf..f29e2d525c 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -790,12 +790,6 @@ public bool TryAddFriendlyFire(Dictionary<RoleTypeId, float> ffRules, bool overw
             return true;
         }
 
-        /// <summary>
-        /// Returns the CustomRole in a human-readable format.
-        /// </summary>
-        /// <returns>A string containing CustomRole-related data.</returns>
-        public override string ToString() => $"{Name} ({Id})";
-
         /// <summary>
         /// Tries to register this role.
         /// </summary>
diff --git a/EXILED/Exiled.CustomRoles/Commands/Get.cs b/EXILED/Exiled.CustomRoles/Commands/Get.cs
deleted file mode 100644
index 7d96d5f6b4..0000000000
--- a/EXILED/Exiled.CustomRoles/Commands/Get.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Get.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.CustomRoles.Commands
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Text;
-
-    using CommandSystem;
-    using Exiled.API.Extensions;
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.CustomRoles.API;
-    using Exiled.CustomRoles.API.Features;
-    using Exiled.Permissions.Extensions;
-    using HarmonyLib;
-
-    /// <summary>
-    /// The command to get specified player(s) current custom roles.
-    /// </summary>
-    internal sealed class Get : ICommand
-    {
-        private Get()
-        {
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Get"/> command instance.
-        /// </summary>
-        public static Get Instance { get; } = new();
-
-        /// <inheritdoc/>
-        public string Command => "get";
-
-        /// <inheritdoc/>
-        public string[] Aliases { get; } = Array.Empty<string>();
-
-        /// <inheritdoc/>
-        public string Description => "Gets the specified player(s)' current custom role(s).";
-
-        /// <inheritdoc/>
-        public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
-        {
-            if (!sender.CheckPermission("customroles.get"))
-            {
-                response = "Permission Denied, required: customroles.get";
-                return false;
-            }
-
-            List<Player> players = ListPool<Player>.Pool.Get();
-
-            if (arguments.Count > 0)
-            {
-                string identifier = string.Join(" ", arguments);
-
-                switch (identifier.ToLower())
-                {
-                    case "*":
-                    case "all":
-                        players.AddRange(Player.List);
-                        break;
-                    default:
-                        players.AddRange(Player.GetProcessedData(arguments));
-                        break;
-                }
-
-                if (players.IsEmpty())
-                {
-                    if (arguments.Count > 0 || !Player.TryGet(sender, out Player player))
-                    {
-                        response = $"Player not found: {identifier}";
-                        return false;
-                    }
-
-                    players.Add(player);
-                }
-            }
-            else
-            {
-                response = "get <Nickname/PlayerID/UserID/all/*>";
-                return false;
-            }
-
-            StringBuilder builder = StringBuilderPool.Pool.Get();
-
-            builder.AppendLine();
-            builder.AppendLine("====================== Custom Roles ======================");
-
-            foreach (Player target in players)
-            {
-                ReadOnlyCollection<CustomRole> roles = target.GetCustomRoles();
-                builder.Append((target.DisplayNickname + (target.HasCustomName ? $" ({target.Nickname})" : string.Empty)).PadRight(30 + (target.HasCustomName ? 23 : 0)));
-                builder.Append(" ");
-                builder.Append($"({target.Id})".PadRight(5));
-                if (roles.IsEmpty())
-                {
-                    builder.AppendLine(" | No Custom Role");
-                }
-                else
-                {
-                    // builder.Append($" | [{string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>"))}]");
-                    builder.Append(" | [");
-                    builder.Append(string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>")));
-                    builder.AppendLine("]");
-                }
-            }
-
-            builder.AppendLine("==========================================================");
-
-            ListPool<Player>.Pool.Return(players);
-
-            response = StringBuilderPool.Pool.ToStringReturn(builder);
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.CustomRoles/Commands/Give.cs b/EXILED/Exiled.CustomRoles/Commands/Give.cs
index 9666bff990..2f74b46498 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Give.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Give.cs
@@ -83,7 +83,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
 
                 string identifier = string.Join(" ", arguments.Skip(1));
 
-                switch (identifier.ToLower())
+                switch (identifier)
                 {
                     case "*":
                     case "all":
diff --git a/EXILED/Exiled.CustomRoles/Commands/Parent.cs b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
index fd42b5e497..f64facabec 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Parent.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
@@ -41,13 +41,12 @@ public override void LoadGeneratedCommands()
             RegisterCommand(Give.Instance);
             RegisterCommand(Info.Instance);
             RegisterCommand(List.List.Instance);
-            RegisterCommand(Get.Instance);
         }
 
         /// <inheritdoc/>
         protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            response = "Invalid subcommand! Available: give, info, list, get";
+            response = "Invalid subcommand! Available: give, info, list";
             return false;
         }
     }
diff --git a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
index cd1a8b4769..78b2030580 100644
--- a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
+++ b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
@@ -49,4 +49,4 @@
         <PostBuildEvent>if [[ ! -z "$EXILED_DEV_REFERENCES" ]]; then cp "$(OutputPath)$(AssemblyName).dll" "$EXILED_DEV_REFERENCES/Plugins/"; fi</PostBuildEvent>
     </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/EXILED/Exiled.Events/Commands/TpsCommand.cs b/EXILED/Exiled.Events/Commands/TpsCommand.cs
index 14c0def05e..722de3b61e 100644
--- a/EXILED/Exiled.Events/Commands/TpsCommand.cs
+++ b/EXILED/Exiled.Events/Commands/TpsCommand.cs
@@ -15,6 +15,7 @@ namespace Exiled.Events.Commands
     /// <summary>
     /// Command for showing current server TPS.
     /// </summary>
+    [CommandHandler(typeof(RemoteAdminCommandHandler))]
     [CommandHandler(typeof(GameConsoleCommandHandler))]
     public class TpsCommand : ICommand
     {
@@ -30,7 +31,7 @@ public class TpsCommand : ICommand
         /// <inheritdoc />
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            double diff = Server.SmoothTps / Server.MaxTps;
+            double diff = Server.Tps / Server.MaxTps;
             string color = diff switch
             {
                 > 0.9 => "green",
@@ -38,7 +39,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 _ => "red"
             };
 
-            response = $"<color={color}>{Server.SmoothTps}/{Server.MaxTps}</color>";
+            response = $"<color={color}>{Server.Tps}/{Server.MaxTps}</color>";
             return true;
         }
     }
diff --git a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
index abd2f4877f..a8b986c171 100644
--- a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
@@ -7,70 +7,39 @@
 
 namespace Exiled.Events.EventArgs.Cassie
 {
-    using System;
-    using System.Text;
-
-    using Exiled.API.Features.Pools;
-    using global::Cassie;
     using Interfaces;
-    using Subtitles;
 
     /// <summary>
     /// Contains all the information after sending a C.A.S.S.I.E. message.
     /// </summary>
     public class SendingCassieMessageEventArgs : IDeniableEvent
     {
-        private readonly CassieAnnouncement announcement;
-        private readonly CassieTtsPayload payload;
-
-        private string customSubtitles;
-        private float glitchScale;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="SendingCassieMessageEventArgs" /> class.
         /// </summary>
-        /// <param name="annc">The announcement to populate all properties from.</param>
-        /// <param name="isAllowed">
-        /// <inheritdoc cref="IsAllowed"/>
+        /// <param name="words">
+        /// <inheritdoc cref="Words" />
+        /// </param>
+        /// <param name="makeHold">
+        /// <inheritdoc cref="MakeHold" />
+        /// </param>
+        /// <param name="makeNoise">
+        /// <inheritdoc cref="MakeNoise" />
         /// </param>
-        public SendingCassieMessageEventArgs(CassieAnnouncement annc, bool isAllowed = true)
+        /// <param name="customAnnouncement">
+        /// <inheritdoc cref="IsCustomAnnouncement" />
+        /// </param>
+        /// <param name="customSubtitles">
+        /// <inheritdoc cref="CustomSubtitles" />
+        /// </param>
+        /// <param name="isAllowed">Indicates whether the event can be executed.</param>
+        public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise, bool customAnnouncement, string customSubtitles, bool isAllowed = true)
         {
-            announcement = annc;
-            payload = annc.Payload;
-
-            Words = payload.Content;
-            switch (payload.SubtitleSource)
-            {
-                case CassieTtsPayload.SubtitleMode.None:
-                case CassieTtsPayload.SubtitleMode.Automatic:
-                    CustomSubtitles = string.Empty;
-                    break;
-                case CassieTtsPayload.SubtitleMode.Custom:
-                    CustomSubtitles = payload._customSubtitle;
-                    break;
-                case CassieTtsPayload.SubtitleMode.FromTranslation:
-                    StringBuilder builder = StringBuilderPool.Pool.Get();
-                    SubtitleController controller = SubtitleController.Singleton;
-
-                    foreach (SubtitlePart part in payload._subtitleMessage.SubtitleParts)
-                    {
-                        Subtitle subtitle = controller.Subtitles[part.Subtitle];
-                        builder.Append(controller.GetTranslation(subtitle));
-                    }
-
-                    CustomSubtitles = StringBuilderPool.Pool.ToStringReturn(builder);
-
-                    break;
-                default:
-                    CustomSubtitles = string.Empty;
-                    break;
-            }
-
-            MakeHold = payload.PlayBackground;
-            GlitchScale = annc.GlitchScale;
-            MakeNoise = annc.GlitchScale is not 0;
-            SubtitleSource = payload.SubtitleSource;
-
+            Words = words;
+            CustomSubtitles = customSubtitles;
+            MakeHold = makeHold;
+            MakeNoise = makeNoise;
+            IsCustomAnnouncement = customAnnouncement;
             IsAllowed = isAllowed;
         }
 
@@ -82,38 +51,13 @@ public SendingCassieMessageEventArgs(CassieAnnouncement annc, bool isAllowed = t
         /// <summary>
         /// Gets or sets the message subtitles.
         /// </summary>
-        public string CustomSubtitles
-        {
-            get => customSubtitles;
-            set
-            {
-                if (customSubtitles != value)
-                    SubtitleSource = CassieTtsPayload.SubtitleMode.Custom;
-
-                customSubtitles = value;
-            }
-        }
+        public string CustomSubtitles { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the message should be held.
         /// </summary>
         public bool MakeHold { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value controlling how glitchy this CASSIE message is.
-        /// </summary>
-        public float GlitchScale
-        {
-            get => glitchScale;
-            set
-            {
-                if (!MakeNoise && value is not 0)
-                    MakeNoise = true;
-
-                glitchScale = value;
-            }
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether the message should make noise.
         /// </summary>
@@ -125,50 +69,8 @@ public float GlitchScale
         public bool IsAllowed { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the event can be executed.
+        /// Gets or sets a value indicating whether the message can be sent.
         /// </summary>
-        [Obsolete("Useless and will be removed in Exiled 10.")]
         public bool IsCustomAnnouncement { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating where the subtitles for this message came from.
-        /// </summary>
-        public CassieTtsPayload.SubtitleMode SubtitleSource { get; set; }
-
-        /// <summary>
-        /// Gets a <see cref="CassieAnnouncement"/> consisting of all properties in this event.
-        /// </summary>
-        public CassieAnnouncement Announcement
-        {
-            get
-            {
-                CassieTtsPayload newPayload;
-
-                // I love readonly fields :)
-                if (SubtitleSource is CassieTtsPayload.SubtitleMode.FromTranslation)
-                {
-                    newPayload = new CassieTtsPayload(Words, MakeHold, payload._subtitleMessage.SubtitleParts);
-                }
-                else
-                {
-                    if (SubtitleSource is CassieTtsPayload.SubtitleMode.Automatic)
-                        newPayload = new CassieTtsPayload(Words, true, MakeHold);
-                    else
-                        newPayload = new CassieTtsPayload(Words, CustomSubtitles, MakeHold);
-                }
-
-                return announcement switch
-                {
-                    CassieScpTerminationAnnouncement =>
-
-                        // this is disabled via patch b/c termination messages are not modifiable at the stage the SendCassieMessage patch is in.
-                        throw new InvalidOperationException("SendCassieMessage was called for a SCP termination message!"),
-
-                    CassieWaveAnnouncement waveAnnc => new CassieWaveAnnouncement(waveAnnc.Wave, newPayload),
-                    Cassie079RecontainAnnouncement recontainAnnc => new Cassie079RecontainAnnouncement(recontainAnnc._callback, false, newPayload),
-                    _ => new CassieAnnouncement(newPayload, 0, GlitchScale / (API.Features.Warhead.IsDetonated ? 2F : 1F) * (MakeNoise ? 1F : 0F)),
-                };
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
deleted file mode 100644
index fdd41cef5b..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="IMarshmallowEvent.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Interfaces
-{
-    using Exiled.API.Features.Items;
-
-    /// <summary>
-    /// Represents all events related to the marshmallow man.
-    /// </summary>
-    public interface IMarshmallowEvent : IItemEvent
-    {
-        /// <summary>
-        /// Gets the marshmallow item related to this event.
-        /// </summary>
-        public Marshmallow Marshmallow { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
deleted file mode 100644
index 616ad8f3e5..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="IScp127Event.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Interfaces
-{
-    /// <summary>
-    /// Represents all events related to SCP-127.
-    /// </summary>
-    public interface IScp127Event : IItemEvent
-    {
-        /// <summary>
-        /// Gets the SCP-127 instance, related to this event.
-        /// </summary>
-        public API.Features.Items.Scp127 Scp127 { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
index acb2463878..1d6dcf3add 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
@@ -14,7 +14,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Event args used for all <see cref="Scp1507Role"/> related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp1507Event : IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
index fc62383340..d8a5537257 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
@@ -12,7 +12,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Defines the base contract for all <see cref="Scp559Cake"/> related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp559Event : IExiledEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
deleted file mode 100644
index 8e491ee0b1..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="CacklingEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Item
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.MarshmallowMan;
-
-    /// <summary>
-    /// Contains all information before a marshmallow man punches.
-    /// </summary>
-    public class CacklingEventArgs : IMarshmallowEvent, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacklingEventArgs"/> class.
-        /// </summary>
-        /// <param name="marshmallow">The marshmallow item of the player cackling.</param>
-        /// <param name="isAllowed">Whether the player is allowed to cackle.</param>
-        public CacklingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
-        {
-            Marshmallow = Item.Get<Marshmallow>(marshmallow);
-            Player = Marshmallow.Owner;
-            IsAllowed = isAllowed;
-        }
-
-        /// <summary>
-        /// Gets the player cackling.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <inheritdoc />
-        public API.Features.Items.Item Item => Marshmallow;
-
-        /// <summary>
-        /// Gets the marshmallow item of the player cackling.
-        /// </summary>
-        public Marshmallow Marshmallow { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the player is allowed to cackle.
-        /// </summary>
-        public bool IsAllowed { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
deleted file mode 100644
index d2d927d95a..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="PunchingEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Item
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.MarshmallowMan;
-
-    /// <summary>
-    /// Contains all information before a marshmallow man punches.
-    /// </summary>
-    public class PunchingEventArgs : IMarshmallowEvent, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PunchingEventArgs"/> class.
-        /// </summary>
-        /// <param name="marshmallow">The marshmallow item of the player attacking.</param>
-        /// <param name="isAllowed">Whether the player is allowed to punch.</param>
-        public PunchingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
-        {
-            Marshmallow = Item.Get<Marshmallow>(marshmallow);
-            Player = Marshmallow.Owner;
-            IsAllowed = isAllowed;
-        }
-
-        /// <summary>
-        /// Gets the player punching.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <inheritdoc />
-        public Item Item => Marshmallow;
-
-        /// <summary>
-        /// Gets the marshmallow item of the player punching.
-        /// </summary>
-        public Marshmallow Marshmallow { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the punch is allowed.
-        /// </summary>
-        public bool IsAllowed { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
index d8d38cc474..4c43eb1df8 100644
--- a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
@@ -7,13 +7,15 @@
 
 namespace Exiled.Events.EventArgs.Map
 {
-    using System;
-
     using API.Features;
     using API.Features.DamageHandlers;
     using API.Features.Roles;
+
     using Interfaces;
 
+    using CustomAttackerHandler = API.Features.DamageHandlers.AttackerDamageHandler;
+    using DamageHandlerBase = PlayerStatsSystem.DamageHandlerBase;
+
     /// <summary>
     /// Contains all information before C.A.S.S.I.E announces an SCP termination.
     /// </summary>
@@ -25,14 +27,16 @@ public class AnnouncingScpTerminationEventArgs : IAttackerEvent, IDeniableEvent
         /// <param name="scp">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="terminationCause">
-        /// <inheritdoc cref="TerminationCause"/>
+        /// <param name="damageHandlerBase">
+        /// <inheritdoc cref="DamageHandler" />
         /// </param>
-        public AnnouncingScpTerminationEventArgs(Player scp, string terminationCause)
+        public AnnouncingScpTerminationEventArgs(Player scp, DamageHandlerBase damageHandlerBase)
         {
             Player = scp;
             Role = scp.Role;
-            TerminationCause = terminationCause;
+            DamageHandler = new CustomDamageHandler(scp, damageHandlerBase);
+            Attacker = DamageHandler.BaseIs(out CustomAttackerHandler customAttackerHandler) ? customAttackerHandler.Attacker : null;
+            TerminationCause = damageHandlerBase.CassieDeathAnnouncement.Announcement;
             IsAllowed = true;
         }
 
@@ -54,13 +58,11 @@ public AnnouncingScpTerminationEventArgs(Player scp, string terminationCause)
         /// <summary>
         /// Gets the player who killed the SCP.
         /// </summary>
-        [Obsolete("Attacker can no longer be acquired for this event. This will be readded in a different event.")]
         public Player Attacker { get; }
 
         /// <summary>
         /// Gets or sets the <see cref="CustomDamageHandler" />.
         /// </summary>
-        [Obsolete("DamageHandler can no longer be acquired for this event. This will be readded in a different event.")]
         public CustomDamageHandler DamageHandler { get; set; }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
index 038a3e16c4..168a0f578e 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
@@ -18,6 +18,8 @@ namespace Exiled.Events.EventArgs.Player
     /// </summary>
     public class ReceivingEffectEventArgs : IPlayerEvent, IDeniableEvent
     {
+        private byte intensity;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ReceivingEffectEventArgs" /> class.
         /// </summary>
@@ -30,9 +32,9 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         {
             Player = player;
             Effect = effect;
-            Intensity = intensity;
+            this.intensity = intensity;
             CurrentIntensity = currentIntensity;
-            Duration = intensity is 0 ? 0 : duration;
+            Duration = duration;
         }
 
         /// <summary>
@@ -51,9 +53,20 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         public float Duration { get; set; } = 0;
 
         /// <summary>
-        /// Gets or sets the value of the new intensity of the effect.
+        /// Gets or sets the value of the new intensity of the effect. Setting this to <c>0</c> is the same as setting IsAllowed to
+        /// <see langword="false" />.
         /// </summary>
-        public byte Intensity { get; set; }
+        public byte Intensity
+        {
+            get => intensity;
+            set
+            {
+                intensity = value;
+
+                if (intensity == 0)
+                    IsAllowed = false;
+            }
+        }
 
         /// <summary>
         /// Gets the value of the intensity of this effect on the player.
diff --git a/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
deleted file mode 100644
index 6dce01109c..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp1576TransmissionEndedEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Player
-{
-    using API.Features;
-    using API.Features.Items;
-    using Interfaces;
-    using InventorySystem.Items.Usables.Scp1576;
-
-    /// <summary>
-    /// Contains all information after a SCP-1576 transmission has ended.
-    /// </summary>
-    public class Scp1576TransmissionEndedEventArgs : IPlayerEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp1576TransmissionEndedEventArgs"/> class.
-        /// </summary>
-        /// <param name="player"><inheritdoc cref="Player"/></param>
-        /// <param name="scp1576Item"><inheritdoc cref="Scp1576"/></param>
-        public Scp1576TransmissionEndedEventArgs(Player player, Scp1576Item scp1576Item)
-        {
-            Player = player;
-            Scp1576 = Item.Get<Scp1576>(scp1576Item);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Exiled.API.Features.Player"/> that the transmission ended for.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Exiled.API.Features.Items.Scp1576"/> instance.
-        /// </summary>
-        public Exiled.API.Features.Items.Scp1576 Scp1576 { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
index c6aeed7ffb..e25e9fd728 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
@@ -28,14 +28,10 @@ public class UsedItemEventArgs : IPlayerEvent, IUsableEvent
         /// <param name="item">
         /// <inheritdoc cref="Item" />
         /// </param>
-        /// <param name="causedByHolstering">
-        /// <inheritdoc cref="CausedByHolstering"/>
-        /// </param>
-        public UsedItemEventArgs(ReferenceHub player, UsableItem item, bool causedByHolstering)
+        public UsedItemEventArgs(ReferenceHub player, UsableItem item)
         {
             Player = Player.Get(player);
-            Usable = Item.Get(item) as Usable;
-            CausedByHolstering = causedByHolstering;
+            Usable = Item.Get(item) is Usable usable ? usable : null;
         }
 
         /// <summary>
@@ -50,11 +46,5 @@ public UsedItemEventArgs(ReferenceHub player, UsableItem item, bool causedByHols
         /// Gets the player who used the item.
         /// </summary>
         public Player Player { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this event was triggered by a player switching items (true) or by waiting after using the item (false).
-        /// </summary>
-        /// <remarks>Use this value if you wish to keep the bug where you could switch items quickly to skip this event.</remarks>
-        public bool CausedByHolstering { get; }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
deleted file mode 100644
index 533ccbb5ce..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="GainedExperienceEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information before SCP-127 gains experience.
-    /// </summary>
-    public class GainedExperienceEventArgs : IScp127Event
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GainedExperienceEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="experience"><inheritdoc cref="Experience"/></param>
-        public GainedExperienceEventArgs(Scp127 scp127, float experience)
-        {
-            Scp127 = scp127;
-            Experience = experience;
-            Tier = Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
-        }
-
-        /// <inheritdoc />
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc />
-        public Item Item => Scp127;
-
-        /// <inheritdoc />
-        public Scp127 Scp127 { get; }
-
-        /// <summary>
-        /// Gets the experience that SCP-127 has gained.
-        /// </summary>
-        public float Experience { get; }
-
-        /// <summary>
-        /// Gets the tier.
-        /// </summary>
-        public Scp127Tier Tier { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
deleted file mode 100644
index 6a1d7b738b..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="GainingExperienceEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information before SCP-127 gains experience.
-    /// </summary>
-    public class GainingExperienceEventArgs : IScp127Event, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GainingExperienceEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="experience"><inheritdoc cref="Experience"/></param>
-        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
-        public GainingExperienceEventArgs(Scp127 scp127, float experience, bool isAllowed = true)
-        {
-            Scp127 = scp127;
-            Experience = experience;
-            IsAllowed = isAllowed;
-        }
-
-        /// <inheritdoc />
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc />
-        public Item Item => Scp127;
-
-        /// <inheritdoc />
-        public Scp127 Scp127 { get; }
-
-        /// <inheritdoc />
-        public bool IsAllowed { get; set; }
-
-        /// <summary>
-        /// Gets or sets the gaining experience.
-        /// </summary>
-        public float Experience { get; set; }
-
-        /// <summary>
-        /// Gets or sets the new tier.
-        /// </summary>
-        public Scp127Tier Tier
-        {
-            get => Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
-            set => Experience = Scp127.TierManagerModule.GetExpForTier(value) - Scp127.Experience;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
deleted file mode 100644
index 10810403d5..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="TalkedEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information after SCP-127 voice line is played.
-    /// </summary>
-    public class TalkedEventArgs : IScp127Event
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TalkedEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
-        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
-        public TalkedEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority)
-        {
-            Scp127 = scp127;
-            VoiceLine = voiceLine;
-            Priority = voiceLinePriority;
-        }
-
-        /// <inheritdoc/>
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc/>
-        public Item Item => Scp127;
-
-        /// <inheritdoc/>
-        public Scp127 Scp127 { get; }
-
-        /// <summary>
-        /// Gets a voice line which is played.
-        /// </summary>
-        public Scp127VoiceLinesTranslation VoiceLine { get; }
-
-        /// <summary>
-        /// Gets a priority for this play.
-        /// </summary>
-        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
deleted file mode 100644
index b8934566a8..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="TalkingEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information before SCP-127 voice line is played.
-    /// </summary>
-    public class TalkingEventArgs : IScp127Event, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TalkingEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
-        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
-        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
-        public TalkingEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority, bool isAllowed = true)
-        {
-            Scp127 = scp127;
-            VoiceLine = voiceLine;
-            Priority = voiceLinePriority;
-            IsAllowed = isAllowed;
-        }
-
-        /// <inheritdoc/>
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc/>
-        public Item Item => Scp127;
-
-        /// <inheritdoc/>
-        public Scp127 Scp127 { get; }
-
-        /// <inheritdoc/>
-        public bool IsAllowed { get; set; }
-
-        /// <summary>
-        /// Gets or sets a voice line which is played.
-        /// </summary>
-        public Scp127VoiceLinesTranslation VoiceLine { get; set; }
-
-        /// <summary>
-        /// Gets or sets a priority for this play.
-        /// </summary>
-        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
index c6ea947e55..c58330e252 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
@@ -18,7 +18,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 attacks door.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class AttackingDoorEventArgs : IScp1507Event, IDeniableEvent, IDoorEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
index 7ab56f98e2..ae5ebb8450 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class ScreamingEventArgs : IScp1507Event, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
index 5cc50f9352..376eba5abf 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
@@ -19,7 +19,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before flamingos get spawned.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningFlamingosEventArgs : IDeniableEvent, IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
index 10b713052e..0121d02d95 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class UsingTapeEventArgs : IPlayerEvent, IItemEvent, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
deleted file mode 100644
index d4935e6c92..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FoundPositionEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp2536
-{
-    using Christmas.Scp2536;
-    using Exiled.API.Features;
-    using Exiled.Events.EventArgs.Interfaces;
-
-    /// <summary>
-    /// Contains all information after SCP-2536 chooses target for spawning.
-    /// </summary>
-    public class FoundPositionEventArgs : IPlayerEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FoundPositionEventArgs"/> class.
-        /// </summary>
-        /// <param name="player"><inheritdoc cref="Player"/></param>
-        /// <param name="spawnpoint"><inheritdoc cref="Spawnpoint"/></param>
-        public FoundPositionEventArgs(Player player, Scp2536Spawnpoint spawnpoint)
-        {
-            Player = player;
-            Spawnpoint = spawnpoint;
-        }
-
-        /// <summary>
-        /// Gets the player near whom SCP-2536 will spawn.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <summary>
-        /// Gets or sets the spawn point where SCP will spawn.
-        /// </summary>
-        public Scp2536Spawnpoint Spawnpoint { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
index 1a4a7408dc..b8b99f9ac9 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
@@ -15,7 +15,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before a player interacts with SCP-559.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerEvent
     {
         /// <summary>
@@ -23,11 +23,12 @@ public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerE
         /// </summary>
         /// <param name="scp559"><inheritdoc cref="Scp559"/></param>
         /// <param name="player"><inheritdoc cref="Player"/></param>
-        public InteractingScp559EventArgs(Scp559 scp559, Player player)
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public InteractingScp559EventArgs(Scp559 scp559, Player player, bool isAllowed = true)
         {
             Player = player;
             Scp559 = scp559;
-            IsAllowed = scp559.RemainingSlices > 0 && PlayerRoles.PlayerRolesUtils.IsHuman(player.Role.Type);
+            IsAllowed = isAllowed;
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
index c83baddd2c..6e3a81f06a 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before SCP-559 spawns.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningEventArgs : IDeniableEvent, IScp559Event
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Events.cs b/EXILED/Exiled.Events/Events.cs
index adae6e21a8..a1bdd040a2 100644
--- a/EXILED/Exiled.Events/Events.cs
+++ b/EXILED/Exiled.Events/Events.cs
@@ -21,7 +21,6 @@ namespace Exiled.Events
     using PlayerRoles.FirstPersonControl.NetworkMessages;
     using PlayerRoles.Ragdolls;
     using PlayerRoles.RoleAssign;
-
     using Respawning;
     using UnityEngine.SceneManagement;
     using UserSettings.ServerSpecific;
@@ -74,7 +73,6 @@ public override void OnEnabled()
             Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
             Handlers.Map.ChangedIntoGrenade += Handlers.Internal.ExplodingGrenade.OnChangedIntoGrenade;
-            Handlers.Warhead.Detonated += Handlers.Internal.Round.OnWarheadDetonated;
 
             RoleAssigner.OnPlayersSpawned += Handlers.Server.OnAllPlayersSpawned;
             CharacterClassManager.OnRoundStarted += Handlers.Server.OnRoundStarted;
@@ -97,11 +95,6 @@ public override void OnEnabled()
 
             FpcServerPositionDistributor.RoleSyncEvent += Handlers.Internal.Round.OnRoleSyncEvent;
 
-            LabApi.Events.Handlers.Scp127Events.Talking += Handlers.Scp127.OnTalking;
-            LabApi.Events.Handlers.Scp127Events.Talked += Handlers.Scp127.OnTalked;
-            LabApi.Events.Handlers.Scp127Events.GainingExperience += Handlers.Scp127.OnGainingExperience;
-            LabApi.Events.Handlers.Scp127Events.GainExperience += Handlers.Scp127.OnGainedExperience;
-
             ServerConsole.ReloadServerName();
         }
 
@@ -142,11 +135,6 @@ public override void OnDisabled()
             LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon -= Handlers.Player.OnUnloadingWeapon;
 
             FpcServerPositionDistributor.RoleSyncEvent -= Handlers.Internal.Round.OnRoleSyncEvent;
-
-            LabApi.Events.Handlers.Scp127Events.Talking -= Handlers.Scp127.OnTalking;
-            LabApi.Events.Handlers.Scp127Events.Talked -= Handlers.Scp127.OnTalked;
-            LabApi.Events.Handlers.Scp127Events.GainingExperience -= Handlers.Scp127.OnGainingExperience;
-            LabApi.Events.Handlers.Scp127Events.GainExperience -= Handlers.Scp127.OnGainedExperience;
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index ff2833b79b..4cedb7a21e 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -29,7 +29,6 @@ namespace Exiled.Events.Handlers.Internal
     using InventorySystem.Items.Firearms.Attachments.Components;
     using InventorySystem.Items.Usables;
     using InventorySystem.Items.Usables.Scp244.Hypothermia;
-    using InventorySystem.Items.Usables.Scp330;
     using Mirror;
     using PlayerRoles;
     using PlayerRoles.FirstPersonControl;
@@ -44,7 +43,7 @@ namespace Exiled.Events.Handlers.Internal
     internal static class Round
     {
         /// <inheritdoc cref="Handlers.Player.OnUsedItem" />
-        public static void OnServerOnUsingCompleted(ReferenceHub hub, UsableItem usable) => Handlers.Player.OnUsedItem(new (hub, usable, false));
+        public static void OnServerOnUsingCompleted(ReferenceHub hub, UsableItem usable) => Handlers.Player.OnUsedItem(new (hub, usable));
 
         /// <inheritdoc cref="Handlers.Server.OnWaitingForPlayers" />
         public static void OnWaitingForPlayers()
@@ -109,9 +108,6 @@ public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
             if (ev.Role.IsDead() || !ev.Role.IsFpcRole())
                 ev.IsAllowed = false;
-
-            if (ev.DamageHandlerBase is Exiled.Events.Patches.Fixes.FixMarshmallowManFF fixMarshamllowManFf)
-                ev.DamageHandlerBase = fixMarshamllowManFf.MarshmallowItem.NewDamageHandler;
         }
 
         /// <inheritdoc cref="Scp049.OnActivatingSense(ActivatingSenseEventArgs)" />
@@ -140,7 +136,7 @@ public static void OnVerified(VerifiedEventArgs ev)
             }
 
             // Fix bug that player that Join do not receive information about other players Scale
-            foreach (Player player in ReferenceHub.AllHubs.Select(Player.Get))
+            foreach (Player player in Player.Enumerable)
             {
                 player.SetFakeScale(player.Scale, new List<Player>() { ev.Player });
 
@@ -182,13 +178,6 @@ public static RoleTypeId OnRoleSyncEvent(ReferenceHub viewerHub, ReferenceHub ow
             return actualRole;
         }
 
-        /// <inheritdoc cref="Handlers.Warhead.OnDetonated()"/>
-        public static void OnWarheadDetonated()
-        {
-            // fix for black candy
-            CandyBlack.Outcomes.RemoveAll(outcome => outcome is TeleportOutcome);
-        }
-
         private static void GenerateAttachments()
         {
             foreach (FirearmType firearmType in EnumUtils<FirearmType>.Values)
diff --git a/EXILED/Exiled.Events/Handlers/Item.cs b/EXILED/Exiled.Events/Handlers/Item.cs
index b1ca257f09..9ac83aafd3 100644
--- a/EXILED/Exiled.Events/Handlers/Item.cs
+++ b/EXILED/Exiled.Events/Handlers/Item.cs
@@ -89,16 +89,6 @@ public static class Item
         /// </summary>
         public static Event<JailbirdChangedWearStateEventArgs> JailbirdChangedWearState { get; set; } = new();
 
-        /// <summary>
-        /// Invoked before a marshmallow man punches.
-        /// </summary>
-        public static Event<PunchingEventArgs> Punching { get; set; } = new();
-
-        /// <summary>
-        /// Invoked before a marshmallow man cackles.
-        /// </summary>
-        public static Event<CacklingEventArgs> Cackling { get; set; } = new();
-
         /// <summary>
         /// Called before the Jailbird's <see cref="InventorySystem.Items.Jailbird.JailbirdWearState"/> is changed.
         /// </summary>
@@ -183,17 +173,5 @@ public static class Item
         /// </summary>
         /// <param name="ev">The <see cref="InspectedItemEventArgs"/> instance.</param>
         public static void OnInspectedItem(InspectedItemEventArgs ev) => InspectedItem.InvokeSafely(ev);
-
-        /// <summary>
-        /// Called before a marshmallow man punches.
-        /// </summary>
-        /// <param name="ev">The <see cref="PunchingEventArgs"/> instance.</param>
-        public static void OnPunching(PunchingEventArgs ev) => Punching.InvokeSafely(ev);
-
-        /// <summary>
-        /// Called before a marshmallow man cackles.
-        /// </summary>
-        /// <param name="ev">The <see cref="CacklingEventArgs"/> instance.</param>
-        public static void OnCackling(CacklingEventArgs ev) => Cackling.InvokeSafely(ev);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs
index 998b54f813..97e6137003 100644
--- a/EXILED/Exiled.Events/Handlers/Player.cs
+++ b/EXILED/Exiled.Events/Handlers/Player.cs
@@ -621,11 +621,6 @@ public class Player
         /// </summary>
         public static Event<InteractingEmergencyButtonEventArgs> InteractingEmergencyButton { get; set; } = new();
 
-        /// <summary>
-        /// Invoked after transmission has ended.
-        /// </summary>
-        public static Event<Scp1576TransmissionEndedEventArgs> Scp1576TransmissionEnded { get; set; } = new();
-
         /// <summary>
         /// Called before a player's emotion changed.
         /// </summary>
@@ -1361,11 +1356,5 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item
         /// </summary>
         /// <param name="ev">The <see cref="InteractingEmergencyButtonEventArgs"/> instance.</param>
         public static void OnInteractingEmergencyButton(InteractingEmergencyButtonEventArgs ev) => InteractingEmergencyButton.InvokeSafely(ev);
-
-        /// <summary>
-        /// Called after a 1576 transmisiion has ended.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp1576TransmissionEndedEventArgs"/> instance.</param>
-        public static void OnScp1576TransmissionEnded(Scp1576TransmissionEndedEventArgs ev) => Scp1576TransmissionEnded.InvokeSafely(ev);
     }
 }
diff --git a/EXILED/Exiled.Events/Handlers/Scp127.cs b/EXILED/Exiled.Events/Handlers/Scp127.cs
deleted file mode 100644
index b3f86534d3..0000000000
--- a/EXILED/Exiled.Events/Handlers/Scp127.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Handlers
-{
-    using Exiled.Events.EventArgs.Scp127;
-    using Exiled.Events.Features;
-    using LabApi.Events.Arguments.Scp127Events;
-
-#pragma warning disable SA1623
-    /// <summary>
-    /// SCP-127 event handlers.
-    /// </summary>
-    public static class Scp127
-    {
-        /// <summary>
-        /// Invoked before SCP-127 voice line is played.
-        /// </summary>
-        public static Event<TalkingEventArgs> Talking { get; set; } = new();
-
-        /// <summary>
-        /// Invoked after SCP-127 voice line is played.
-        /// </summary>
-        public static Event<TalkedEventArgs> Talked { get; set; } = new();
-
-        /// <summary>
-        /// Invoked before SCP-127 gains experience.
-        /// </summary>
-        public static Event<GainingExperienceEventArgs> GainingExperience { get; set; } = new();
-
-        /// <summary>
-        /// Invoked after SCP-127 gains experience.
-        /// </summary>
-        public static Event<GainedExperienceEventArgs> GainedExperience { get; set; } = new();
-
-        /// <summary>
-        /// Called before SCP-127 voice line is played.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127TalkingEventArgs"/> instance.</param>
-        public static void OnTalking(Scp127TalkingEventArgs ev)
-        {
-            TalkingEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority, ev.IsAllowed);
-            Talking.InvokeSafely(eventArgs);
-
-            ev.Priority = eventArgs.Priority;
-            ev.VoiceLine = eventArgs.VoiceLine;
-            ev.IsAllowed = eventArgs.IsAllowed;
-        }
-
-        /// <summary>
-        /// Called after SCP-127 voice line is played.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127TalkedEventArgs"/> instance.</param>
-        public static void OnTalked(Scp127TalkedEventArgs ev)
-            => Talked.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority));
-
-        /// <summary>
-        /// Called before SCP-127 gains experience.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127GainingExperienceEventArgs"/> instance.</param>
-        public static void OnGainingExperience(Scp127GainingExperienceEventArgs ev)
-        {
-            GainingExperienceEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain, ev.IsAllowed);
-            GainingExperience.InvokeSafely(eventArgs);
-
-            ev.ExperienceGain = eventArgs.Experience;
-            ev.IsAllowed = eventArgs.IsAllowed;
-        }
-
-        /// <summary>
-        /// Called after SCP-127 gains experience.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127GainExperienceEventArgs"/> instance.</param>
-        public static void OnGainedExperience(Scp127GainExperienceEventArgs ev) =>
-            GainedExperience.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain));
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Scp1507.cs b/EXILED/Exiled.Events/Handlers/Scp1507.cs
index f36b16d633..63e4536d2c 100644
--- a/EXILED/Exiled.Events/Handlers/Scp1507.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp1507.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// SCP-1507 related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp1507
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp2536.cs b/EXILED/Exiled.Events/Handlers/Scp2536.cs
index 8c0d272583..3f7dfd1c58 100644
--- a/EXILED/Exiled.Events/Handlers/Scp2536.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp2536.cs
@@ -21,11 +21,6 @@ public static class Scp2536
         /// </summary>
         public static Event<FindingPositionEventArgs> FindingPosition { get; set; } = new();
 
-        /// <summary>
-        /// Invoked once SCP-2536 has found a spawn location.
-        /// </summary>
-        public static Event<FoundPositionEventArgs> FoundPosition { get; set; } = new();
-
         /// <summary>
         /// Invoked before SCP-2536 gives a gift to a player.
         /// </summary>
@@ -42,12 +37,6 @@ public static class Scp2536
         /// <param name="ev">The <see cref="FindingPositionEventArgs"/> instance.</param>
         public static void OnFindingPosition(FindingPositionEventArgs ev) => FindingPosition.InvokeSafely(ev);
 
-        /// <summary>
-        /// Called after SCP-2536 chooses a target.
-        /// </summary>
-        /// <param name="ev">The <see cref="FoundPositionEventArgs"/> instance.</param>
-        public static void OnFoundPosition(FoundPositionEventArgs ev) => FoundPosition.InvokeSafely(ev);
-
         /// <summary>
         /// Called before SCP-2536 gives a gift to a player.
         /// </summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp559.cs b/EXILED/Exiled.Events/Handlers/Scp559.cs
index 70d5387520..b17f520c9d 100644
--- a/EXILED/Exiled.Events/Handlers/Scp559.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp559.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// All SCP-559 related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp559
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
index 1e7b55e3a8..0cb378ac02 100644
--- a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
@@ -8,61 +8,87 @@
 namespace Exiled.Events.Patches.Events.Cassie
 {
     using System.Collections.Generic;
-    using System.Linq;
     using System.Reflection.Emit;
 
     using API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Cassie;
-    using global::Cassie;
+
     using Handlers;
+
     using HarmonyLib;
     using Respawning;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="global::Cassie.CassieAnnouncementDispatcher.PlayNewAnnouncement(CassieAnnouncement)" />.
+    /// Patches <see cref="RespawnEffectsController.PlayCassieAnnouncement(string, bool, bool, bool, string)" />.
     /// Adds the <see cref="Cassie.SendingCassieMessage" /> event.
     /// </summary>
     [EventPatch(typeof(Cassie), nameof(Cassie.SendingCassieMessage))]
-    [HarmonyPatch(typeof(CassieAnnouncementDispatcher), nameof(CassieAnnouncementDispatcher.PlayNewAnnouncement))]
+    [HarmonyPatch(typeof(RespawnEffectsController), nameof(RespawnEffectsController.PlayCassieAnnouncement))]
     internal static class SendingCassieMessage
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            Label skipLabel = generator.DefineLabel();
             Label returnLabel = generator.DefineLabel();
 
-            newInstructions[0].WithLabels(skipLabel);
-
             newInstructions.InsertRange(
                 0,
                 new CodeInstruction[]
                 {
+                    // words
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Isinst, typeof(CassieScpTerminationAnnouncement)),
-                    new(OpCodes.Brtrue_S, skipLabel),
 
-                    new(OpCodes.Ldarg_0),
+                    // makeHold
+                    new(OpCodes.Ldarg_1),
+
+                    // makeNoise
+                    new(OpCodes.Ldarg_2),
+
+                    // customAnnouncement
+                    new(OpCodes.Ldarg_3),
+
+                    // customSubtitles
+                    new(OpCodes.Ldarg_S, 4),
 
                     // isAllowed
                     new(OpCodes.Ldc_I4_1),
 
-                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(CassieAnnouncement, bool);
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs)).Single(ctor => ctor.GetParameters().Length == 2)),
+                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(string, bool, bool, bool, string, bool);
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs))[0]),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),
 
                     // Cassie.OnSendingCassieMessage(ev);
                     new(OpCodes.Call, Method(typeof(Cassie), nameof(Cassie.OnSendingCassieMessage))),
 
-                    // annc = ev.Announcement
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Announcement))),
+                    // words = ev.Words
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Words))),
                     new(OpCodes.Starg_S, 0),
 
+                    // makeHold = ev.MakeHold
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeHold))),
+                    new(OpCodes.Starg_S, 1),
+
+                    // makeNoise = ev.MakeNoise
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeNoise))),
+                    new(OpCodes.Starg_S, 2),
+
+                    // customAnnouncement = ev.IsCustomAnnouncement
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsCustomAnnouncement))),
+                    new(OpCodes.Starg_S, 3),
+
+                    // customSubtitles = ev.CustomSubtitles
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.CustomSubtitles))),
+                    new(OpCodes.Starg_S, 4),
+
                     // if (!IsAllowed)
                     //   return;
                     new(OpCodes.Callvirt, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsAllowed))),
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs b/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
deleted file mode 100644
index fec7811ecf..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Cackling.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Item
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Item;
-    using HarmonyLib;
-    using InventorySystem.Items.MarshmallowMan;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
-    /// Adds the <see cref="Handlers.Item.Cackling" /> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Cackling))]
-    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCackle))]
-    public class Cackling
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label retLabel = generator.DefineLabel();
-
-            int offset = 1;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // this;
-                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // ev = new CacklingEventArgs(MarshmallowItem, bool);
-                new(OpCodes.Newobj, Constructor(typeof(CacklingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnCackling))),
-
-                // if (!ev.IsAllowed) return
-                new(OpCodes.Callvirt, PropertyGetter(typeof(CacklingEventArgs), nameof(CacklingEventArgs.IsAllowed))),
-                new(OpCodes.Brfalse_S, retLabel),
-            });
-
-            newInstructions[newInstructions.Count - 1].WithLabels(retLabel);
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs b/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
deleted file mode 100644
index 15c74b57b1..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Punching.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Item
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Item;
-    using HarmonyLib;
-    using InventorySystem.Items.MarshmallowMan;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
-    /// Adds the <see cref="Handlers.Item.Punching" /> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Punching))]
-    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCmd))]
-    public class Punching
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label retLabel = generator.DefineLabel();
-
-            int offset = 1;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
-
-            newInstructions[^1].WithLabels(retLabel);
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // this;
-                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // ev = new PunchingEventArgs(MarshmallowItem, bool);
-                new(OpCodes.Newobj, Constructor(typeof(PunchingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnPunching))),
-
-                // if (!ev.IsAllowed) return
-                new(OpCodes.Callvirt, PropertyGetter(typeof(PunchingEventArgs), nameof(PunchingEventArgs.IsAllowed))),
-                new(OpCodes.Brfalse_S, retLabel),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
index 3033a0327d..0d53ebeefb 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
@@ -7,7 +7,6 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
-    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -18,12 +17,11 @@ namespace Exiled.Events.Patches.Events.Map
     using Exiled.Events.EventArgs.Map;
     using HarmonyLib;
     using Respawning.Announcements;
-    using Subtitles;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncement"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncement"/>
+    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncementString"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncementString"/>
     /// to add <see cref="Handlers.Map.AnnouncingChaosEntrance"/> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
@@ -32,8 +30,8 @@ internal static class AnnouncingChaosEntrance
     {
         private static IEnumerable<MethodBase> TargetMethods()
         {
-            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncement));
-            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncement));
+            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncementString));
+            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncementString));
         }
 
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instruction, ILGenerator generator)
@@ -72,9 +70,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldarg_1),
                 new(OpCodes.Callvirt, Method(typeof(StringBuilder), nameof(StringBuilder.Clear))),
                 new(OpCodes.Pop),
-                new(OpCodes.Ldarg_3),
-                new(OpCodes.Call, Method(typeof(Array), nameof(Array.Empty), new Type[] { }, new[] { typeof(SubtitlePart) })),
-                new(OpCodes.Stind_Ref),
                 new(OpCodes.Ret),
 
                 new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel),
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
index 75cf10177c..bf59ef0103 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
@@ -7,7 +7,6 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
-    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -24,11 +23,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncement" />
+    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncementString" />
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncement))]
+    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncementString))]
     internal static class AnnouncingNtfEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -40,8 +39,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = 2;
-            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie)))) + offset;
+            int offset = 1;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_3) + offset;
 
             newInstructions.InsertRange(
                 index,
@@ -51,10 +50,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_3),
-
-                    // string[] unitInformation = lastGeneratedName.Split('-');
                     new(OpCodes.Ldloc_2),
+
+                    // string[] unitInformation = unitNameClear.Split('-');
+                    new(OpCodes.Ldloc_1),
                     new(OpCodes.Ldstr, "<[^>]*?>"),
                     new(OpCodes.Ldsfld, Field(typeof(string), nameof(string.Empty))),
                     new(OpCodes.Call, Method(typeof(Regex), nameof(Regex.Replace), new System.Type[] { typeof(string), typeof(string), typeof(string) })),
@@ -64,9 +63,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldc_I4_0),
                     new(OpCodes.Ldc_I4_S, 45),
                     new(OpCodes.Stelem_I2),
-                    new(OpCodes.Callvirt, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
+                    new(OpCodes.Call, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
 
-                    // AnnouncingNtfEntranceEventArgs ev = new(this, scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
+                    // AnnouncingNtfEntranceEventArgs ev = new(scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
                     //
                     // Map.OnAnnouncingNtfEntrance(ev);
                     new(OpCodes.Dup),
@@ -99,14 +98,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Box, typeof(int)),
                     new(OpCodes.Call, Method(typeof(string), nameof(string.Format), new[] { typeof(string), typeof(object), typeof(object) })),
                     new(OpCodes.Dup),
-                    new(OpCodes.Stloc_2),
+                    new(OpCodes.Stloc_1),
                     new(OpCodes.Callvirt, Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie))),
-                    new(OpCodes.Stloc_3),
+                    new(OpCodes.Stloc_2),
 
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_3),
+                    new(OpCodes.Stloc_2),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
index 018362acde..8bb3389fdd 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
@@ -20,11 +20,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncement"/>
+    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncementString"/>
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncement))]
+    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncementString))]
     internal static class AnnouncingNtfMiniEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -35,17 +35,15 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_1) + 1;
-
             newInstructions.InsertRange(
-                index,
+                0,
                 new CodeInstruction[]
                 {
                     // WaveAnnouncementBase
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_1),
+                    new(OpCodes.Ldloc_0),
 
                     // null
                     new(OpCodes.Ldnull),
@@ -68,7 +66,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_1),
+                    new(OpCodes.Stloc_0),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
index 5064239e03..71363142ff 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
@@ -7,102 +7,78 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
-    using System;
-    using System.Collections;
     using System.Collections.Generic;
+    using System.Reflection;
     using System.Reflection.Emit;
 
+    using API.Features.DamageHandlers;
     using API.Features.Pools;
-    using Exiled.API.Features;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Map;
     using Exiled.Events.Handlers;
-    using Footprinting;
-    using global::Cassie;
+
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
 
-    using Map = Exiled.Events.Handlers.Map;
     using Player = API.Features.Player;
 
     /// <summary>
     /// Patches
-    /// <see cref="CassieScpTerminationAnnouncement.OnStartedPlaying()" />.
+    /// <see cref="NineTailedFoxAnnouncer.AnnounceScpTermination(ReferenceHub, PlayerStatsSystem.DamageHandlerBase)" />.
     /// Adds the <see cref="Map.AnnouncingScpTermination" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingScpTermination))]
-    [HarmonyPatch(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.OnStartedPlaying))]
+    [HarmonyPatch(typeof(NineTailedFoxAnnouncer), nameof(NineTailedFoxAnnouncer.AnnounceScpTermination))]
     internal static class AnnouncingScpTermination
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            LocalBuilder cause = generator.DeclareLocal(typeof(string));
-            LocalBuilder enumerator = generator.DeclareLocal(typeof(IEnumerator<Footprint>));
-
-            ExceptionBlock beginTry = new(ExceptionBlockType.BeginExceptionBlock);
-            ExceptionBlock beginFinally = new(ExceptionBlockType.BeginFinallyBlock);
-            ExceptionBlock endFinally = new(ExceptionBlockType.EndExceptionBlock);
+            LocalBuilder ev = generator.DeclareLocal(typeof(AnnouncingScpTerminationEventArgs));
 
             Label ret = generator.DefineLabel();
-            Label entryLabel = generator.DefineLabel();
-            Label loopLabel = generator.DefineLabel();
-            Label leaveLabel = generator.DefineLabel();
-            Label endFinallyLabel = generator.DefineLabel();
-
-            int offset = -1;
-            int index = newInstructions.FindIndex(i => i.LoadsField(Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts)))) + offset;
-
-            newInstructions.RemoveRange(index, 2);
-            newInstructions.Insert(index, new CodeInstruction(OpCodes.Ldloc_S, cause));
 
-            newInstructions[0].WithLabels(leaveLabel);
+            int offset = -4;
+            int index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.CassieQueuingScpTerminationEventArgs))[0]) + offset;
 
             newInstructions.InsertRange(
-                0,
+                index,
                 new[]
-            {
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Ldfld, Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts))),
-                new(OpCodes.Stloc_S, cause),
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.Victims))),
-                new(OpCodes.Callvirt, Method(typeof(IEnumerable<Footprint>), nameof(IEnumerable<Footprint>.GetEnumerator))),
-                new(OpCodes.Stloc_S, enumerator),
-
-                // start of try
-                new CodeInstruction(OpCodes.Br_S, entryLabel).WithBlocks(beginTry),
-
-                // start of loop
-                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(loopLabel),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(IEnumerator<Footprint>), nameof(IEnumerator<Footprint>.Current))),
-                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(Footprint) })),
-                new(OpCodes.Ldloc_S, cause),
-                new(OpCodes.Newobj, Constructor(typeof(AnnouncingScpTerminationEventArgs), new[] { typeof(Player), typeof(string) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
-                new(OpCodes.Stloc_S, cause),
-
-                // entry point
-                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(entryLabel),
-                new(OpCodes.Callvirt, Method(typeof(IEnumerator), nameof(IEnumerator.MoveNext))),
-                new(OpCodes.Brtrue_S, loopLabel),
-
-                // end of loop
-                new(OpCodes.Leave, leaveLabel),
-
-                // begin finally
-                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithBlocks(beginFinally),
-                new(OpCodes.Brfalse, endFinallyLabel),
-                new(OpCodes.Ldloc_S, enumerator),
-                new(OpCodes.Callvirt, Method(typeof(IDisposable), nameof(IDisposable.Dispose))),
-
-                // end of finally
-                new CodeInstruction(OpCodes.Endfinally).WithLabels(endFinallyLabel).WithBlocks(endFinally),
-            });
+                {
+                    // Player.Get(scp)
+                    new CodeInstruction(OpCodes.Ldarg_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // hit
+                    new(OpCodes.Ldarg_1),
+
+                    // AnnouncingScpTerminationEventArgs ev = new(Player, DamageHandlerBase)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(AnnouncingScpTerminationEventArgs))[0]),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Stloc_S, ev.LocalIndex),
+
+                    // Map.OnAnnouncingScpTermination(ev)
+                    new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
+
+                    // if (!ev.IsAllowed)
+                    //    return;
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.IsAllowed))),
+                    new(OpCodes.Brfalse_S, ret),
+
+                    // hit = ev.DamageHandler.Base
+                    new(OpCodes.Ldloc_S, ev.LocalIndex),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.DamageHandler))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(CustomDamageHandler), nameof(CustomDamageHandler.Base))),
+                    new(OpCodes.Starg, 1),
+
+                    // announcement = ev.TerminationCause
+                    new(OpCodes.Ldloc_S, ev.LocalIndex),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
+                    new(OpCodes.Stloc_0),
+                });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
new file mode 100644
index 0000000000..7193f8d17f
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
@@ -0,0 +1,68 @@
+// -----------------------------------------------------------------------
+// <copyright file="AnnouncingTeamEntrance.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Map
+{
+    using System.Collections.Generic;
+    using System.Reflection;
+    using System.Reflection.Emit;
+    using System.Text;
+
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Map;
+    using HarmonyLib;
+    using Respawning.Announcements;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="WaveAnnouncementBase.PlayAnnouncement"/> to prevent cassie from playing empty string.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingNtfEntrance))]
+    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
+    [HarmonyPatch(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.PlayAnnouncement))]
+    internal static class AnnouncingTeamEntrance
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label returnLabel = generator.DefineLabel();
+
+            // the instruction that sends subtitles is called before stringReturn is created (and thus checked) so we need to move it so that empty (or disallowed) message's subtitles are not sent.
+            // this removes the Ldarg_0 and the CallVirt
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.SendSubtitles))));
+            CodeInstruction sendSubtitlesInstruction = newInstructions[index];
+            newInstructions.RemoveRange(index - 2, 3);
+
+            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldsfld);
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // if (stringReturn == "")
+                //     return;
+                new(OpCodes.Ldloc_S, 4),
+                new(OpCodes.Ldstr, string.Empty),
+                new(OpCodes.Ceq),
+                new(OpCodes.Brtrue_S, returnLabel),
+
+                // send subtitles before cassie message, but after our check.
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Ldarg_1),
+                sendSubtitlesInstruction,
+            });
+
+            newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
index 4af8bd4e11..b379bdec1a 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
@@ -89,13 +89,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))));
-            List<Label> labels = newInstructions[index].ExtractLabels();
-            List<CodeInstruction> codeInstructionsCopy = newInstructions.GetRange(index, 4);
-            newInstructions.RemoveRange(index, 4);
-            newInstructions[index].labels.AddRange(labels);
+            List<Label> label = newInstructions[index].labels;
+
+            newInstructions.RemoveAt(index);
+
+            int offset = -1;
+            index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.MapGeneratedEventArgs))[0]) + offset;
+            newInstructions.Insert(index, new CodeInstruction(OpCodes.Call, Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))).WithLabels(label));
 
-            index = newInstructions.FindIndex(x => x.OperandIs(Field(typeof(SeedSynchronizer), nameof(SeedSynchronizer.MapGenerated))));
-            newInstructions.InsertRange(index, codeInstructionsCopy);
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
index ac28cd901a..6f70c4b8b0 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
@@ -14,34 +14,36 @@ namespace Exiled.Events.Patches.Events.Player
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Player;
     using Exiled.Events.Handlers;
+
     using HarmonyLib;
-    using PlayerRoles.FirstPersonControl;
+
     using PlayerRoles.FirstPersonControl.Thirdperson;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="FirstPersonMovementModule.IsGrounded" />
+    /// Patches <see cref="AnimatedCharacterModel.OnGrounded" />
     /// Adds the <see cref="Player.Landing" /> event.
     /// </summary>
     [EventPatch(typeof(Player), nameof(Player.Landing))]
-    [HarmonyPatch(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.IsGrounded), MethodType.Setter)]
+    [HarmonyPatch(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.OnGrounded))]
     internal static class Landing
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            const int offset = 2;
-            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Ldarg_1) + offset;
+            const int offset = -1;
+            int index = newInstructions.FindIndex(
+                instruction => instruction.Calls(Method(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.PlayFootstep)))) + offset;
 
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
-                    // Player.Get(this.Hub)
+                    // Player.Get(base.OwnerHub)
                     new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.Hub))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(CharacterModel), nameof(CharacterModel.OwnerHub))),
                     new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // LandingEventArgs ev = new(Player)
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
index 707743a243..9d22a80b67 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
@@ -23,9 +23,9 @@ namespace Exiled.Events.Patches.Events.Player
 
     /// <summary>
     /// Patches the <see cref="StatusEffectBase.Intensity"/> method.
-    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event and fix NW Duration not being correctly set to 0 when effect is Reset.
+    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event.
     /// </summary>
-    // [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
     [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ForceIntensity))]
     internal static class ReceivingStatusEffect
     {
@@ -74,9 +74,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._intensity))),
 
-                    // this._timeLeft
+                    // this.Duration
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
 
                     // ReceivingEventArgs ev = new(Player, StatusEffectBase, byte, byte, float)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ReceivingEffectEventArgs))[0]),
@@ -95,11 +95,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Intensity))),
                     new(OpCodes.Starg_S, 1),
 
-                    // this._timeLeft = ev.Duration
+                    // this.Duration = ev.Duration
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Duration))),
-                    new(OpCodes.Stfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
+                    new(OpCodes.Callvirt, PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
                 });
 
             newInstructions[newInstructions.Count - 1].WithLabels(returnLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs b/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
deleted file mode 100644
index 2f81bec7c7..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp1576TransmissionEnded.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Player
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Player;
-    using HarmonyLib;
-    using InventorySystem.Items.Usables.Scp1576;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Scp1576Item.ServerStopTransmitting"/> to add <see cref="Handlers.Player.Scp1576TransmissionEnded"/> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.Scp1576TransmissionEnded))]
-    [HarmonyPatch(typeof(InventorySystem.Items.Usables.Scp1576.Scp1576Item), nameof(Scp1576Item.ServerStopTransmitting))]
-    public class Scp1576TransmissionEnded
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-                List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-                int index = newInstructions.Count - 1;
-
-                newInstructions.InsertRange(
-                    index,
-                    new[]
-                    {
-                        // Player.Get(base.Owner)
-                        new CodeInstruction(OpCodes.Ldarg_0),
-                        new CodeInstruction(OpCodes.Callvirt, PropertyGetter(typeof(Scp1576Item), nameof(Scp1576Item.Owner))),
-                        new CodeInstruction(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
-
-                        // this
-                        new CodeInstruction(OpCodes.Ldarg_0),
-
-                        // Scp1576TransmissionEndedEventArgs ev = new(Player, this)
-                        new CodeInstruction(OpCodes.Newobj, GetDeclaredConstructors(typeof(Scp1576TransmissionEndedEventArgs))[0]),
-
-                        // OnScp1576TransmissionEnded(ev)
-                        new CodeInstruction(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnScp1576TransmissionEnded))),
-                    });
-
-                for (int i = 0; i < newInstructions.Count; i++)
-                    yield return newInstructions[i];
-
-                ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs b/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
deleted file mode 100644
index d83af6e966..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="UsedItemByHolstering.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Player
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Player;
-    using HarmonyLib;
-    using InventorySystem.Items.Usables;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Consumable.OnHolstered" />.
-    /// Adds an alternative trigger of the <see cref="Handlers.Player.UsedItem" /> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.UsedItem))]
-    [HarmonyPatch(typeof(Consumable), nameof(Consumable.OnHolstered))]
-    public class UsedItemByHolstering
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            // after ServerRemoveSelf, which lines up with before the ret
-            newInstructions.InsertRange(newInstructions.Count - 1, new CodeInstruction[]
-            {
-                // this.Owner
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(Consumable), nameof(Consumable.Owner))),
-
-                // this (Consumable inherits UsableItem)
-                new(OpCodes.Ldarg_0),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // OnUsedItem(new UsedItemEventArgs(ReferenceHub, UsableItem, bool));
-                new(OpCodes.Newobj, Constructor(typeof(UsedItemEventArgs), new[] { typeof(ReferenceHub), typeof(UsableItem), typeof(bool) })),
-                new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnUsedItem))),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
index 680bbbf0dd..d2efcd3fd3 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
@@ -31,18 +31,17 @@ internal class Recontaining
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
+            int index = 0;
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             LocalBuilder ev = generator.DeclareLocal(typeof(RecontainingEventArgs));
 
             Label returnLabel = generator.DefineLabel();
 
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + 1;
-
-            newInstructions.InsertRange(index, new[]
+            newInstructions.InsertRange(index, new CodeInstruction[]
             {
                 // RecontainingEventArgs ev = new(this._activatorGlass)
-                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+                new(OpCodes.Ldarg_0),
                 new(OpCodes.Ldfld, Field(typeof(Scp079Recontainer), nameof(Scp079Recontainer._activatorGlass))),
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RecontainingEventArgs))[0]),
                 new(OpCodes.Stloc_S, ev.LocalIndex),
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
deleted file mode 100644
index dd942042fb..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FoundPosition.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Scp2536
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Christmas.Scp2536;
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Scp2536;
-    using HarmonyLib;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Scp2536Controller.ServerFindTarget"/>
-    /// to add <see cref="Handlers.Scp2536.FoundPosition"/> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.FoundPosition))]
-    [HarmonyPatch(typeof(Scp2536Controller), nameof(Scp2536Controller.ServerFindTarget))]
-    public class FoundPosition
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label retLabel = generator.DefineLabel();
-
-            int index = newInstructions.Count - 1;
-
-            newInstructions[index].WithLabels(retLabel);
-
-            newInstructions.InsertRange(index, new CodeInstruction[]
-            {
-                // dupe the result (true / false if found)
-                new(OpCodes.Dup),
-
-                // return w result if failed
-                new(OpCodes.Brfalse_S, retLabel),
-                new(OpCodes.Pop),
-
-                // load ADDRESS of parameter "out Scp2536Spawnpoint spawnpoint" onto stack (so not actual value but address)
-                // this is used at end of transpiler
-                new(OpCodes.Ldarg_2),
-
-                // load address of parameter "out ReferenceHub target"
-                new(OpCodes.Ldarg_1),
-
-                // load value at address
-                new(OpCodes.Ldind_Ref),
-
-                // player = Player.Get(target);
-                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
-
-                // load address of parameter "out Scp2536Spawnpoint spawnpoint"
-                new(OpCodes.Ldarg_2),
-
-                // load value at address
-                new(OpCodes.Ldind_Ref),
-
-                // ev = new FoundPositionEventArgs(player, spawnpoint);
-                new(OpCodes.Newobj, Constructor(typeof(FoundPositionEventArgs), new[] { typeof(Player), typeof(Scp2536Spawnpoint) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnFoundPosition))),
-
-                // spawnpoint = ev.Spawnpoint;
-                new(OpCodes.Callvirt, PropertyGetter(typeof(FoundPositionEventArgs), nameof(FoundPositionEventArgs.Spawnpoint))),
-
-                // this uses the address already on stack (see 3rd comment) with the value from the event args
-                new(OpCodes.Stind_Ref),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
index 855523f1e3..9389addfa5 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
@@ -11,7 +11,6 @@ namespace Exiled.Events.Patches.Events.Scp2536
     using System.Reflection.Emit;
 
     using Christmas.Scp2536;
-    using Christmas.Scp2536.Gifts;
     using Exiled.API.Features;
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
@@ -35,7 +34,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label retLabel = generator.DefineLabel();
 
             LocalBuilder ev = generator.DeclareLocal(typeof(GrantingGiftEventArgs));
-            LocalBuilder naughty = generator.DeclareLocal(typeof(Naughty));
 
             int offset = -1;
             int index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp2536GiftBase), nameof(Scp2536GiftBase.ObtainedBy)))) + offset;
@@ -47,7 +45,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                 // gift
-                new(OpCodes.Ldloc_2),
+                new(OpCodes.Ldloc_1),
 
                 // true
                 new(OpCodes.Ldc_I4_1),
@@ -69,45 +67,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // gift = ev.Gift;
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
-                new(OpCodes.Stloc_2),
-            });
-
-            offset = 1;
-            index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(Scp2536GiftController), nameof(Scp2536GiftController.ServerGetGift), null, new[] { typeof(Naughty) }))) + offset;
-
-            newInstructions.InsertRange(index, new CodeInstruction[]
-            {
-                // naughty is already on the stack
-                // naughty = this.ServerGetGift<Naught>();
-                new(OpCodes.Stloc_S, naughty),
-
-                // Player.Get(hub);
-                new(OpCodes.Ldarg_1),
-                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
-
-                // naughty
-                new(OpCodes.Ldloc_S, naughty),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // GrantingGiftEventArgs ev = new(Player, Scp2536GiftBase, true);
-                new(OpCodes.Newobj, GetDeclaredConstructors(typeof(GrantingGiftEventArgs))[0]),
-                new(OpCodes.Dup),
-                new(OpCodes.Dup),
-                new(OpCodes.Stloc_S, ev.LocalIndex),
-
-                // Handlers.Scp2536.OnGrantingGift(ev);
-                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnGrantingGift))),
-
-                // if (!ev.IsAllowed)
-                //   goto retLabel;
-                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.IsAllowed))),
-                new(OpCodes.Brfalse_S, retLabel),
-
-                // load naughty onto stack
-                new(OpCodes.Ldloc_S, ev.LocalIndex),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
+                new(OpCodes.Stloc_1),
             });
 
             newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
index dcf788f079..1c0f3442e3 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
@@ -30,13 +30,9 @@ internal class Interacting
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Brfalse_S);
 
-            newInstructions.RemoveRange(index, 6);
-            newInstructions[index].opcode = OpCodes.Brtrue_S;
-            int offset = -2;
-
-            index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp559Cake), nameof(Scp559Cake._remainingSlices)))) + offset;
+            int offset = 1;
+            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ret) + offset;
 
             Label retLabel = generator.DefineLabel();
 
@@ -52,7 +48,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                    // InteractingScp559EventArgs ev = new(Scp559, Player);
+                    // true
+                    new(OpCodes.Ldc_I4_1),
+
+                    // InteractingScp559EventArgs ev = new(Scp559, Player, true);
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingScp559EventArgs))[0]),
                     new(OpCodes.Dup),
 
@@ -69,8 +68,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
index cd52be3cc0..8027c34ad9 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
@@ -76,8 +76,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
index defc59b9b6..c042b65f9e 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
@@ -14,7 +14,9 @@ namespace Exiled.Events.Patches.Events.Scp914
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp914;
+
     using global::Scp914;
+
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
@@ -37,8 +39,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = -3;
-            int index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914KnobChangingEventArgs))[0])) + offset;
+            int offset = 1;
+            int index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Stloc_1) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
@@ -73,7 +75,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             });
 
             offset = -3;
-            index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914ActivatingEventArgs))[0])) + offset;
+            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Newobj) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs b/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
deleted file mode 100644
index 6ea4a5ac08..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixEffectOrder.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Reflection.Emit;
-
-    using API.Features.Pools;
-    using CustomPlayerEffects;
-    using Exiled.API.Features;
-    using HarmonyLib;
-    using InventorySystem.Items.Usables.Scp330;
-    using PlayerRoles.PlayableScps.Scp049;
-
-    using static HarmonyLib.AccessTools;
-
-#pragma warning disable SA1402 // File may only contain a single type
-
-    /// <summary>
-    /// Patches <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
-    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
-    /// </summary>
-    [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState))]
-    internal class FixEffectOrder
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            // Find the setter call index
-            int offset = -2;
-            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity)))) + offset;
-
-            // Extract: ldarg.0, ldarg.1, call set_Intensity
-            List<CodeInstruction> intensityBlock = newInstructions.GetRange(intensityCallIndex, 3);
-
-            // Remove it from original location
-            newInstructions.RemoveRange(intensityCallIndex, 3);
-            newInstructions[intensityCallIndex].WithLabels(intensityBlock[0].ExtractLabels());
-
-            // Find ServerChangeDuration call
-            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
-
-            // Insert AFTER ServerChangeDuration
-            newInstructions.InsertRange(serverChangeIndex + 1, intensityBlock);
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-
-    /// <summary>
-    /// Patches Method that should use <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
-    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
-    /// </summary>
-    [HarmonyPatch]
-    internal class FixEffectOrder2
-    {
-        private static IEnumerable<MethodBase> TargetMethods()
-        {
-            yield return Method(typeof(CandyYellow), nameof(CandyYellow.ServerApplyEffects));
-            yield return Method(typeof(Scp049AttackAbility), nameof(Scp049AttackAbility.ServerProcessCmd));
-            yield return Method(typeof(SugarCrave), nameof(SugarCrave.Disabled));
-        }
-
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity))));
-
-            int offset = 6;
-            if (newInstructions[intensityCallIndex - offset].opcode == OpCodes.Dup)
-            {
-                // specific to Yellow candy that get it's Instance from a OpCodes.Dup
-                newInstructions.RemoveAt(intensityCallIndex);
-                newInstructions.RemoveAt(intensityCallIndex - offset);
-            }
-            else
-            {
-                newInstructions.RemoveRange(intensityCallIndex, 2);
-            }
-
-            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
-
-            newInstructions[serverChangeIndex] = new CodeInstruction(OpCodes.Callvirt, Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState)));
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs b/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
deleted file mode 100644
index 51dab211b3..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixMarshmallowManFF.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using CustomPlayerEffects;
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Footprinting;
-    using HarmonyLib;
-    using InventorySystem.Items.MarshmallowMan;
-    using InventorySystem.Items.Pickups;
-    using InventorySystem.Items.ThrowableProjectiles;
-    using Mirror;
-    using PlayerRoles;
-    using PlayerRoles.FirstPersonControl;
-    using PlayerStatsSystem;
-    using Respawning.NamingRules;
-    using Subtitles;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches the <see cref="MarshmallowItem.ServerAttack"/> delegate.
-    /// </summary>
-    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerAttack))]
-    internal class FixMarshmallowManFF : AttackerDamageHandler
-    {
-#pragma warning disable SA1600 // Elements should be documented
-        public FixMarshmallowManFF(MarshmallowItem marshmallowItem, bool isEvilMode)
-        {
-            MarshmallowItem = marshmallowItem;
-            Attacker = new(marshmallowItem.Owner);
-            Damage = marshmallowItem._attackDamage;
-            ForceFullFriendlyFire = isEvilMode;
-        }
-
-        public MarshmallowItem MarshmallowItem { get; set; }
-
-        public override Footprint Attacker { get; set; }
-
-        public override bool AllowSelfDamage { get; } = false;
-
-        public override float Damage { get; set; }
-
-        public override string RagdollInspectText { get; } = DeathTranslations.MarshmallowMan.RagdollTranslation;
-
-        public override CassieAnnouncement CassieDeathAnnouncement { get; } = new()
-        {
-            Announcement = "TERMINATED BY MARSHMALLOW MAN",
-            SubtitleParts =
-            [
-                new SubtitlePart(SubtitleType.TerminatedByMarshmallowMan, null),
-            ],
-        };
-
-        public override string DeathScreenText { get; } = DeathTranslations.MarshmallowMan.DeathscreenTranslation;
-
-        public override string ServerLogsText => "Stabbed with Marshmallow Item by " + Attacker.Nickname;
-#pragma warning restore SA1600 // Elements should be documented
-#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
-
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int index = newInstructions.FindIndex(instruction => instruction.Calls(PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.NewDamageHandler))));
-
-            // replace the getter for NewDamageHandler with ctor of FixMarshmallowManFF
-            newInstructions.RemoveAt(index);
-            newInstructions.InsertRange(index, new List<CodeInstruction>
-            {
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.EvilMode))),
-                new(OpCodes.Newobj, Constructor(typeof(FixMarshmallowManFF), new[] { typeof(MarshmallowItem), typeof(bool) })),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs b/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
deleted file mode 100644
index fde6bfd51a..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixNWFlashbangDuration.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using CustomPlayerEffects;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Player;
-    using HarmonyLib;
-    using InventorySystem;
-
-    /// <summary>
-    /// Patches <see cref="Flashed.IntensityChanged"/> to fix NW overwritting value multiple time.
-    /// </summary>
-    [HarmonyPatch(typeof(Flashed), nameof(Flashed.IntensityChanged))]
-    internal class FixNWFlashbangDuration
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-        {
-            yield return new CodeInstruction(OpCodes.Ret);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs b/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
deleted file mode 100644
index c40037f4b9..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixScp1507DestroyingDoor.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using API.Features.Pools;
-    using Footprinting;
-    using HarmonyLib;
-    using Interactables.Interobjects.DoorUtils;
-    using PlayerRoles.PlayableScps.Scp1507;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Scp1507AttackAbility.TryAttackDoor()"/> delegate.
-    /// Fix than NW don't set the footprint argument <see cref="IDamageableDoor.ServerDamage(float, DoorDamageType, Footprint)"/>.
-    /// </summary>
-    [HarmonyPatch(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.TryAttackDoor))]
-    internal class FixScp1507DestroyingDoor
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int offset = -1;
-            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Initobj) + offset;
-
-            newInstructions.RemoveRange(index, 3);
-
-            newInstructions.InsertRange(
-                index,
-                new CodeInstruction[]
-                {
-                    new(OpCodes.Ldarg_0),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.Owner))),
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(Footprint))[0]),
-                });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
index 17bdf5e142..1f6a8ee431 100644
--- a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
+++ b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
@@ -22,7 +22,7 @@ namespace Exiled.Events.Patches.Fixes
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem)" />.
+    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem, JailbirdHitreg)" />.
     /// Bug reported to NW (https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/88).
     /// </summary>
     [HarmonyPatch(typeof(JailbirdDeteriorationTracker), nameof(JailbirdDeteriorationTracker.Setup))]
diff --git a/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs b/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
new file mode 100644
index 0000000000..46151c7577
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
@@ -0,0 +1,61 @@
+// -----------------------------------------------------------------------
+// <copyright file="JailbirdHitRegFix.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using API.Features.Pools;
+
+    using HarmonyLib;
+    using InventorySystem.Items.Jailbird;
+    using Mirror;
+    using Utils.Networking;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="JailbirdHitreg.ServerAttack(bool, NetworkReader)" />.
+    /// </summary>
+    [HarmonyPatch(typeof(JailbirdHitreg), nameof(JailbirdHitreg.ServerAttack))]
+    internal static class JailbirdHitRegFix
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(ReferenceHubReaderWriter), nameof(ReferenceHubReaderWriter.TryReadReferenceHub)))) - 2;
+
+            int breakIndex = newInstructions.FindIndex(i => i.Calls(Method(typeof(JailbirdHitreg), nameof(JailbirdHitreg.DetectDestructibles)))) - 1;
+            Label breakLabel = generator.DefineLabel();
+            newInstructions[breakIndex].WithLabels(breakLabel);
+
+            List<Label> loopBeginingLabels = newInstructions[index].ExtractLabels();
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // reader.Remaining
+                new CodeInstruction(OpCodes.Ldarg_2),
+                new CodeInstruction(OpCodes.Call, PropertyGetter(typeof(NetworkReader), nameof(NetworkReader.Remaining))),
+
+                // if (reader.Remaining == 0)
+                //     break;
+                new CodeInstruction(OpCodes.Ldc_I4_0),
+                new CodeInstruction(OpCodes.Ceq),
+                new CodeInstruction(OpCodes.Brtrue, breakLabel),
+            });
+
+            newInstructions[index].WithLabels(loopBeginingLabels);
+
+            foreach (CodeInstruction instruction in newInstructions)
+                yield return instruction;
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
index 574c0d856a..bafb4a2847 100644
--- a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
+++ b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
@@ -16,7 +16,6 @@ namespace Exiled.Events.Patches.Generic
 
     using API.Features;
     using API.Features.Pools;
-    using Exiled.API.Features.Items;
 
     using Footprinting;
 
@@ -126,12 +125,6 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref
                     return true;
                 }
 
-                if (victim.CurrentItem is Marshmallow { Evil: true })
-                {
-                    Log.Debug("CheckFriendlyFirePlayerRules, NW Fix victim not getting hit");
-                    return true;
-                }
-
                 Log.Debug($"CheckFriendlyFirePlayerRules, Attacker role {attacker.Role} and Victim {victim.Role}");
 
                 // Check victim's UniqueRole for custom FF multiplier
diff --git a/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs b/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
deleted file mode 100644
index c98d2d57c2..0000000000
--- a/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127MaxHs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Generic
-{
-    using Exiled.API.Features.Items;
-    using HarmonyLib;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-#pragma warning disable SA1313
-    /// <summary>
-    /// Patches <see cref="Scp127HumeModule.HsMax"/> to implement <see cref="Scp127.HsMax"/> setter.
-    /// </summary>
-    [HarmonyPatch(typeof(Scp127HumeModule), nameof(Scp127HumeModule.HsMax), MethodType.Getter)]
-    internal class Scp127MaxHs
-    {
-        private static void Postfix(Scp127HumeModule __instance, ref float __result)
-        {
-            Scp127 item = Item.Get<Scp127>(__instance.ItemSerial);
-
-            if (item == null || !item.CustomHsMax.HasValue)
-                return;
-
-            __result = item.CustomHsMax.Value;
-            return;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Installer/Program.cs b/EXILED/Exiled.Installer/Program.cs
index 6ea75b0df0..1924fc369d 100644
--- a/EXILED/Exiled.Installer/Program.cs
+++ b/EXILED/Exiled.Installer/Program.cs
@@ -172,7 +172,7 @@ private static async Task<IEnumerable<Release>> GetReleases()
                     r => Version.TryParse(r.TagName, out Version version)
                          && version > VersionLimit);
 
-            return releases.OrderByDescending(r => r.PublishedAt);
+            return releases.OrderByDescending(r => r.CreatedAt.Ticks);
         }
 
         private static string FormatRelease(Release r)
diff --git a/EXILED/Exiled.Loader/AutoUpdateFiles.cs b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
index 3ad56c5c95..a4e454cb3a 100644
--- a/EXILED/Exiled.Loader/AutoUpdateFiles.cs
+++ b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
@@ -17,6 +17,6 @@ public static class AutoUpdateFiles
         /// <summary>
         /// Gets which SCP: SL version generated Exiled.
         /// </summary>
-        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 4);
+        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 1);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Loader/ConfigManager.cs b/EXILED/Exiled.Loader/ConfigManager.cs
index 706924ee45..f04835e61c 100644
--- a/EXILED/Exiled.Loader/ConfigManager.cs
+++ b/EXILED/Exiled.Loader/ConfigManager.cs
@@ -446,10 +446,7 @@ public static bool LoadLabAPIProperties(LabPlugin plugin)
             ISerializer serializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Serializer;
             IDeserializer deserializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Deserializer;
 
-            string directory = Path.Combine(Paths.IndividualConfigs, plugin.Name);
-            string configPath = Path.Combine(directory, $"{Server.Port}-properties.yml");
-
-            Directory.CreateDirectory(directory);
+            string configPath = Path.Combine(Paths.IndividualConfigs, plugin.Name, $"{Server.Port}-properties.yml");
 
             if (!File.Exists(configPath))
             {
diff --git a/EXILED/Exiled.Loader/Loader.cs b/EXILED/Exiled.Loader/Loader.cs
index 1a30436669..b8a8883fa3 100644
--- a/EXILED/Exiled.Loader/Loader.cs
+++ b/EXILED/Exiled.Loader/Loader.cs
@@ -635,10 +635,7 @@ private static void LoadPluginsFromDirectory(string dir = null)
                     continue;
 
                 if (PluginLoader.EnabledPlugins.Any(p => p.Name == plugin.Name) || Plugins.Any(p => p.Name == plugin.Name) || LabAPIPlugins.Keys.Any(p => p.Name == plugin.Name))
-                {
-                    Log.Info("Skipping loading duplicate LabAPI plugin " + plugin.Name);
                     continue;
-                }
 
                 Log.Info("Successfully loaded LabAPI plugin " + plugin.Name);
                 LabAPIPlugins.Add(plugin, attempt);
diff --git a/EXILED/Exiled.Loader/Updater.cs b/EXILED/Exiled.Loader/Updater.cs
index a2a3863597..672c17063a 100644
--- a/EXILED/Exiled.Loader/Updater.cs
+++ b/EXILED/Exiled.Loader/Updater.cs
@@ -229,7 +229,7 @@ private void Update(HttpClient client, NewVersion newVersion)
                     FileName = installerPath,
                     UseShellExecute = false,
                     CreateNoWindow = true,
-                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{Path.Combine(config.ExiledDirectoryPath, "..")}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
+                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{config.ExiledDirectoryPath}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     StandardErrorEncoding = ProcessEncoding,
diff --git a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
index faeda9462e..f797797370 100644
--- a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
+++ b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
@@ -17,7 +17,7 @@
 title: NW Documentation
 ---
 
-Last Update (14.2.0.4)
+Last Update (14.2.0.1)
 
 ### Index
 
@@ -56,7 +56,6 @@ Last Update (14.2.0.4)
 - [CallType](#calltype)
 - [CandyKindID](#candykindid)
 - [CassieAnnouncementType](#cassieannouncementtype)
-- [CassieClipCategory](#cassieclipcategory)
 - [Category](#category)
 - [CentralAuthPreauthFlags](#centralauthpreauthflags)
 - [ChallengeState](#challengestate)
@@ -90,6 +89,7 @@ Last Update (14.2.0.4)
 - [DecalPoolType](#decalpooltype)
 - [DecontaminationStatus](#decontaminationstatus)
 - [DeliveryMethod](#deliverymethod)
+- [DetectionStatus](#detectionstatus)
 - [DiodeType](#diodetype)
 - [DisconnectReason](#disconnectreason)
 - [DisconnectResult](#disconnectresult)
@@ -206,7 +206,6 @@ Last Update (14.2.0.4)
 - [NatAddressType](#nataddresstype)
 - [NetLogLevel](#netloglevel)
 - [NetworkProtocolType](#networkprotocoltype)
-- [NextAction](#nextaction)
 - [NextRoundAction](#nextroundaction)
 - [NotificationSound](#notificationsound)
 - [NtpLeapIndicator](#ntpleapindicator)
@@ -221,7 +220,6 @@ Last Update (14.2.0.4)
 - [OtherAudioSetting](#otheraudiosetting)
 - [OtherCondition](#othercondition)
 - [OutputCodes](#outputcodes)
-- [OverwatchSettings](#overwatchsettings)
 - [PacketProperty](#packetproperty)
 - [PanelColliderId](#panelcolliderid)
 - [ParameterMixingMode](#parametermixingmode)
@@ -319,7 +317,6 @@ Last Update (14.2.0.4)
 - [SteamLobbyPrivacy](#steamlobbyprivacy)
 - [StorageLocation](#storagelocation)
 - [StructureType](#structuretype)
-- [SubtitleMode](#subtitlemode)
 - [SubtitleType](#subtitletype)
 - [SyncData](#syncdata)
 - [SyncDataFlags](#syncdataflags)
@@ -961,18 +958,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### CassieClipCategory
-
-<details><summary><b>Cassie.CassieClipCategory</b></summary>
-
-```
- [0] = Word
- [1] = Glitch
- [2] = Other
-```
-
-</details>
-
 ### Category
 
 <details><summary><b>PlayerRoles.PlayableScps.Scp079.Scp079KeyAbilityBase+Category</b></summary>
@@ -1466,6 +1451,18 @@ Last Update (14.2.0.4)
 
 </details>
 
+### DetectionStatus
+
+<details><summary><b>InventorySystem.Items.Firearms.Modules.Scp127.Scp127CassieBasedVoiceTriggerBase+DetectionStatus</b></summary>
+
+```
+ [0] = Idle
+ [1] = WaitingForTrigger
+ [2] = AnnouncementStartedPlaying
+```
+
+</details>
+
 ### DiodeType
 
 <details><summary><b>AlphaWarheadNukesitePanel+DiodeType</b></summary>
@@ -2415,7 +2412,7 @@ Last Update (14.2.0.4)
 
 ### HitResult
 
-<details><summary><b>InventorySystem.Items.Autosync.MeleeAutoSync+HitResult</b></summary>
+<details><summary><b>InventorySystem.Items.Scp1509.Scp1509Hitreg+HitResult</b></summary>
 
 ```
  [0] = HitPlayer
@@ -2772,7 +2769,6 @@ Last Update (14.2.0.4)
  [66] = KeycardCustomMetalCase
  [67] = MarshmallowItem
  [68] = SCP1509
- [69] = Scp021J
  [-1] = None
 ```
 
@@ -3298,17 +3294,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### NextAction
-
-<details><summary><b>Cassie.Interpreters.CassieInterpreter+NextAction</b></summary>
-
-```
- [0] = Continue
- [1] = Halt
-```
-
-</details>
-
 ### NextRoundAction
 
 <details><summary><b>ServerStatic+NextRoundAction</b></summary>
@@ -3515,18 +3500,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### OverwatchSettings
-
-<details><summary><b>PlayerRoles.Spectating.OverwatchSettings</b></summary>
-
-```
- [0] = PlayerInfoToggle
- [1] = HitRegisterToggle
- [2] = DebugLines
-```
-
-</details>
-
 ### PacketProperty
 
 <details><summary><b>LiteNetLib.PacketProperty</b></summary>
@@ -4081,8 +4054,6 @@ Last Update (14.2.0.4)
  [25] = Flamingo
  [26] = AlphaFlamingo
  [27] = ZombieFlamingo
- [28] = NtfFlamingo
- [29] = ChaosFlamingo
  [-1] = None
 ```
 
@@ -4146,7 +4117,6 @@ Last Update (14.2.0.4)
  [38] = Hcz127
  [39] = HczAcroamaticAbatement
  [40] = HczWaysideIncinerator
- [41] = HczRampTunnel
 ```
 
 </details>
@@ -4211,9 +4181,7 @@ Last Update (14.2.0.4)
  [0] = TargetResync
  [1] = TargetKilled
  [2] = AttackInterrupted
- [3] = AttackCancelled
- [4] = OutOfRange
- [5] = StrangleTimer
+ [3] = OutOfRange
 ```
 
 </details>
@@ -5232,19 +5200,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### SubtitleMode
-
-<details><summary><b>Cassie.CassieTtsPayload+SubtitleMode</b></summary>
-
-```
- [0] = None
- [1] = Automatic
- [2] = Custom
- [3] = FromTranslation
-```
-
-</details>
-
 ### SubtitleType
 
 <details><summary><b>Subtitles.SubtitleType</b></summary>
@@ -5479,7 +5434,6 @@ Last Update (14.2.0.4)
  [8] = Tokens
  [11] = All
  [16] = Spawn
- [32] = Max
 ```
 
 </details>
@@ -5544,8 +5498,6 @@ Last Update (14.2.0.4)
  [3] = Two
  [4] = Three
  [5] = Four
- [6] = Five
- [7] = Six
 ```
 
 </details>
@@ -5724,7 +5676,6 @@ Last Update (14.2.0.4)
  [5] = Scp127Voice
  [6] = Scp3114Voice
  [7] = ChaseThemes
- [8] = SoundEffectsWhileSpectating
 ```
 
 </details>
@@ -5833,11 +5784,9 @@ Last Update (14.2.0.4)
 | 22  | Filmmaker      | Dead             | None             | Draw            |
 | 23  | Scp3114        | SCPs             | Scp              | Anomalies       |
 | 24  | Destroyed      | Dead             | None             | Draw            |
-| 25  | Flamingo       | Flamingos        | Flamingos        | Flamingo        |
-| 26  | AlphaFlamingo  | Flamingos        | Flamingos        | Flamingo        |
-| 27  | ZombieFlamingo | SCPs             | Scp              | Anomalies       |
-| 28  | NtfFlamingo    | FoundationForces | Mtf              | FacilityForces  |
-| 29  | ChaosFlamingo  | ChaosInsurgency  | ChaosInsurgency  | ChaosInsurgency |
+| 25  | Flamingo       | Dead             | None             | Draw            |
+| 26  | AlphaFlamingo  | Dead             | None             | Draw            |
+| 27  | ZombieFlamingo | Dead             | None             | Draw            |
 ```
 
 </details>
@@ -5848,7 +5797,7 @@ Last Update (14.2.0.4)
 
 <details><summary> <b>Damage Handlers</b></summary>
 
-```md title="Latest Updated: 14.2.0.4"
+```md title="Latest Updated: 14.2.0.1"
 All available DamageHandlers
 
 + Symbol ':' literally means "inherits from"

From e13aaaa907e8f776af5eb36c51e5e93a7cbdc21f Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Mon, 5 Jan 2026 13:40:09 -0500
Subject: [PATCH 05/10] Revert "Merge branch 'dev' into fake-role-API"

This reverts commit 90076c984d5dacee0f9b3c4934ab782d91d9e909, reversing
changes made to 2ef23f02e035cc109f9f0a3d8ef5bd4847e961a1.
---
 EXILED/EXILED.props                           |   2 +-
 EXILED/Exiled.API/Enums/CameraType.cs         |   5 -
 EXILED/Exiled.API/Enums/DoorType.cs           |   5 -
 EXILED/Exiled.API/Enums/EffectType.cs         |  57 ++--
 EXILED/Exiled.API/Enums/GlassType.cs          |   5 -
 EXILED/Exiled.API/Enums/PrefabType.cs         |  42 ---
 EXILED/Exiled.API/Enums/ProjectileType.cs     |   6 +-
 EXILED/Exiled.API/Enums/RoomType.cs           |   5 -
 EXILED/Exiled.API/Enums/Side.cs               |   5 -
 EXILED/Exiled.API/Exiled.API.csproj           |   1 -
 .../Extensions/DamageTypeExtensions.cs        |   7 -
 .../Extensions/EffectTypeExtension.cs         |   3 -
 .../Exiled.API/Extensions/MirrorExtensions.cs |  33 ++-
 .../Exiled.API/Extensions/RoleExtensions.cs   |   9 +-
 EXILED/Exiled.API/Features/Camera.cs          |   5 -
 EXILED/Exiled.API/Features/Cassie.cs          | 116 +++-----
 .../DamageHandlers/CustomDamageHandler.cs     |  12 +-
 .../DamageHandlers/DamageHandlerBase.cs       |   7 -
 EXILED/Exiled.API/Features/Doors/Door.cs      |   1 -
 EXILED/Exiled.API/Features/Effect.cs          |   2 +-
 .../Features/Items/FirearmModules/Magazine.cs |   9 +-
 .../FirearmModules/Primary/Scp127Magazine.cs  |  80 -----
 EXILED/Exiled.API/Features/Items/Item.cs      |  15 +-
 EXILED/Exiled.API/Features/Items/Jailbird.cs  |  26 +-
 .../Features/Items/Keycards/ChaosKeycard.cs   |   3 +-
 .../Exiled.API/Features/Items/Marshmallow.cs  | 102 -------
 EXILED/Exiled.API/Features/Items/Scp127.cs    | 274 ------------------
 EXILED/Exiled.API/Features/Lift.cs            |   7 -
 .../Features/Pickups/JailbirdPickup.cs        |  10 +-
 .../Features/Pickups/Scp1509Pickup.cs         |   2 +-
 EXILED/Exiled.API/Features/Player.cs          |  54 +---
 EXILED/Exiled.API/Features/Recontainer.cs     |  16 +-
 EXILED/Exiled.API/Features/Roles/FpcRole.cs   |  24 --
 .../Exiled.API/Features/Roles/Scp049Role.cs   |   3 +-
 .../Exiled.API/Features/Roles/Scp096Role.cs   |  18 +-
 .../Exiled.API/Features/Roles/Scp1507Role.cs  |   2 +-
 EXILED/Exiled.API/Features/Room.cs            |   1 -
 EXILED/Exiled.API/Features/Scp559.cs          |  24 +-
 EXILED/Exiled.API/Features/Server.cs          |  22 +-
 EXILED/Exiled.API/Features/Waves/TimedWave.cs |   4 +-
 EXILED/Exiled.API/Features/Window.cs          |   1 -
 .../API/Features/CustomItem.cs                |   9 +
 .../API/Features/CustomRole.cs                |   6 -
 EXILED/Exiled.CustomRoles/Commands/Get.cs     | 123 --------
 EXILED/Exiled.CustomRoles/Commands/Give.cs    |   2 +-
 EXILED/Exiled.CustomRoles/Commands/Parent.cs  |   3 +-
 .../Exiled.CustomRoles.csproj                 |   2 +-
 EXILED/Exiled.Events/Commands/TpsCommand.cs   |   5 +-
 .../Cassie/SendingCassieMessageEventArgs.cs   | 144 ++-------
 .../EventArgs/Interfaces/IMarshmallowEvent.cs |  22 --
 .../EventArgs/Interfaces/IScp127Event.cs      |  20 --
 .../EventArgs/Interfaces/IScp1507Event.cs     |   2 +-
 .../EventArgs/Interfaces/IScp559Event.cs      |   2 +-
 .../EventArgs/Item/CacklingEventArgs.cs       |  50 ----
 .../EventArgs/Item/PunchingEventArgs.cs       |  50 ----
 .../Map/AnnouncingScpTerminationEventArgs.cs  |  18 +-
 .../Player/ReceivingEffectEventArgs.cs        |  21 +-
 .../Scp1576TransmissionEndedEventArgs.cs      |  41 ---
 .../EventArgs/Player/UsedItemEventArgs.cs     |  14 +-
 .../Scp127/GainedExperienceEventArgs.cs       |  51 ----
 .../Scp127/GainingExperienceEventArgs.cs      |  59 ----
 .../EventArgs/Scp127/TalkedEventArgs.cs       |  52 ----
 .../EventArgs/Scp127/TalkingEventArgs.cs      |  57 ----
 .../Scp1507/AttackingDoorEventArgs.cs         |   2 +-
 .../EventArgs/Scp1507/ScreamingEventArgs.cs   |   2 +-
 .../Scp1507/SpawningFlamingosEventArgs.cs     |   2 +-
 .../EventArgs/Scp1507/UsingTapeEventArgs.cs   |   2 +-
 .../Scp2536/FoundPositionEventArgs.cs         |  40 ---
 .../Scp559/InteractingScp559EventArgs.cs      |   7 +-
 .../EventArgs/Scp559/SpawningEventArgs.cs     |   2 +-
 EXILED/Exiled.Events/Events.cs                |  12 -
 .../Exiled.Events/Handlers/Internal/Round.cs  |  13 +-
 EXILED/Exiled.Events/Handlers/Item.cs         |  22 --
 EXILED/Exiled.Events/Handlers/Player.cs       |  11 -
 EXILED/Exiled.Events/Handlers/Scp127.cs       |  81 ------
 EXILED/Exiled.Events/Handlers/Scp1507.cs      |   2 +-
 EXILED/Exiled.Events/Handlers/Scp2536.cs      |  11 -
 EXILED/Exiled.Events/Handlers/Scp559.cs       |   2 +-
 .../Events/Cassie/SendingCassieMessage.cs     |  54 +++-
 .../Patches/Events/Item/Cackling.cs           |  65 -----
 .../Patches/Events/Item/Punching.cs           |  65 -----
 .../Events/Map/AnnouncingChaosEntrance.cs     |  11 +-
 .../Events/Map/AnnouncingNtfEntrance.cs       |  25 +-
 .../Events/Map/AnnouncingNtfMiniEntrance.cs   |  12 +-
 .../Events/Map/AnnouncingScpTermination.cs    | 108 +++----
 .../Events/Map/AnnouncingTeamEntrance.cs      |  68 +++++
 .../Events/Map/SpawningRoomConnector.cs       |  13 +-
 .../Patches/Events/Player/Landing.cs          |  16 +-
 .../Events/Player/ReceivingStatusEffect.cs    |  12 +-
 .../Events/Player/Scp1576TransmissionEnded.cs |  59 ----
 .../Events/Player/UsedItemByHolstering.cs     |  58 ----
 .../Patches/Events/Scp079/Recontaining.cs     |   7 +-
 .../Patches/Events/Scp2536/FoundPosition.cs   |  86 ------
 .../Patches/Events/Scp2536/GrantingGift.cs    |  44 +--
 .../Patches/Events/Scp559/Interacting.cs      |  15 +-
 .../Patches/Events/Scp559/Spawning.cs         |   2 -
 .../Events/Scp914/InteractingEvents.cs        |   8 +-
 .../Patches/Fixes/FixEffectOrder.cs           | 101 -------
 .../Patches/Fixes/FixMarshmallowManFF.cs      |  91 ------
 .../Patches/Fixes/FixNWFlashbangDuration.cs   |  30 --
 .../Patches/Fixes/FixScp1507DestroyingDoor.cs |  52 ----
 .../Patches/Fixes/Jailbird914CoarseFix.cs     |   2 +-
 .../Patches/Fixes/JailbirdHitRegFix.cs        |  61 ++++
 .../Patches/Generic/IndividualFriendlyFire.cs |   7 -
 .../Patches/Generic/Scp127MaxHs.cs            |  32 --
 EXILED/Exiled.Installer/Program.cs            |   2 +-
 EXILED/Exiled.Loader/AutoUpdateFiles.cs       |   2 +-
 EXILED/Exiled.Loader/ConfigManager.cs         |   5 +-
 EXILED/Exiled.Loader/Loader.cs                |   3 -
 EXILED/Exiled.Loader/Updater.cs               |   2 +-
 .../SCPSLRessources/NW_Documentation.md       |  91 ++----
 111 files changed, 523 insertions(+), 2675 deletions(-)
 delete mode 100644 EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
 delete mode 100644 EXILED/Exiled.API/Features/Items/Marshmallow.cs
 delete mode 100644 EXILED/Exiled.API/Features/Items/Scp127.cs
 delete mode 100644 EXILED/Exiled.CustomRoles/Commands/Get.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
 delete mode 100644 EXILED/Exiled.Events/Handlers/Scp127.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs

diff --git a/EXILED/EXILED.props b/EXILED/EXILED.props
index edc17d4fb2..f67ef6f8da 100644
--- a/EXILED/EXILED.props
+++ b/EXILED/EXILED.props
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">9.12.2</Version>
+    <Version Condition="$(Version) == ''">9.10.1</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 
diff --git a/EXILED/Exiled.API/Enums/CameraType.cs b/EXILED/Exiled.API/Enums/CameraType.cs
index 292da90b2d..535e7366ce 100644
--- a/EXILED/Exiled.API/Enums/CameraType.cs
+++ b/EXILED/Exiled.API/Enums/CameraType.cs
@@ -159,11 +159,6 @@ public enum CameraType
         EzGateAElevators,
         EzGateBInterior,
         EzGateBSide,
-        EzGateAStairwell,
-        EzGateAUpper,
-        HczLoadingBay,
-        HczLoadingBayRamp,
-        HczLoadingBayStairwell,
         #endregion
     }
 }
diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs
index 5863d6e79a..87e0de99a5 100644
--- a/EXILED/Exiled.API/Enums/DoorType.cs
+++ b/EXILED/Exiled.API/Enums/DoorType.cs
@@ -369,10 +369,5 @@ public enum DoorType
         /// Represents the door in the <see cref="RoomType.EzGateA"/> Armory.
         /// </summary>
         GateAArmory,
-
-        /// <summary>
-        /// Represents the door in <see cref="RoomType.HczLoadingBay"/>.
-        /// </summary>
-        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/EffectType.cs b/EXILED/Exiled.API/Enums/EffectType.cs
index 9bed0519c9..e70e273e77 100644
--- a/EXILED/Exiled.API/Enums/EffectType.cs
+++ b/EXILED/Exiled.API/Enums/EffectType.cs
@@ -216,7 +216,7 @@ public enum EffectType
         /// <summary>
         /// Makes you a marshmallow guy.
         /// </summary>
-        // [Obsolete("Not functional in-game")]
+        [Obsolete("Not functional in-game")]
         Marshmallow,
 
         /// <summary>
@@ -261,27 +261,27 @@ public enum EffectType
         Blurred,
 
         /// <summary>
-        /// Makes you a flamingo <see cref="CustomPlayerEffects.BecomingFlamingo"/>.
+        /// Makes you a flamingo.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         BecomingFlamingo,
 
         /// <summary>
-        /// Makes you a Child after eating Cake <see cref="Scp559Effect"/>.
+        /// Makes you a Child after eating Cake.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp559,
 
         /// <summary>
-        /// Scp956 found you <see cref="global::Scp956Target"/>.
+        /// Scp956 found you.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp956Target,
 
         /// <summary>
-        /// you are snowed <see cref="global::Snowed"/>.
+        /// you are snowed.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Snowed,
 
         /// <summary>
@@ -317,93 +317,78 @@ public enum EffectType
         /// <summary>
         /// <see cref="CustomPlayerEffects.Metal"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         Metal,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeCandy"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         OrangeCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeWitness"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         OrangeWitness,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Prismatic"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         Prismatic,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SlowMetabolism"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SlowMetabolism,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Spicy"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         Spicy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarCrave"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween or Christmas.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SugarCrave,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarHigh"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SugarHigh,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarRush"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         SugarRush,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TemporaryBypass"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         TemporaryBypass,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TraumatizedByEvil"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         TraumatizedByEvil,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.WhiteCandy"/>.
         /// </summary>
-        [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween.")]
         WhiteCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Scp1509Resurrected"/>.
         /// </summary>
         Scp1509Resurrected,
-
-        /// <summary>
-        /// <see cref="CustomPlayerEffects.FocusedVision"/>.
-        /// </summary>
-        FocusedVision,
-
-        /// <summary>
-        /// <see cref="CustomPlayerEffects.AnomalousRegeneration"/>.
-        /// </summary>
-        AnomalousRegeneration,
-
-        /// <summary>
-        /// <see cref="CustomPlayerEffects.AnomalousTarget"/>.
-        /// </summary>
-        AnomalousTarget,
     }
 }
diff --git a/EXILED/Exiled.API/Enums/GlassType.cs b/EXILED/Exiled.API/Enums/GlassType.cs
index fef4d59f44..85c068108f 100644
--- a/EXILED/Exiled.API/Enums/GlassType.cs
+++ b/EXILED/Exiled.API/Enums/GlassType.cs
@@ -84,10 +84,5 @@ public enum GlassType
         /// Represents the window in <see cref="RoomType.EzGateA"/>.
         /// </summary>
         GateAArmory,
-
-        /// <summary>
-        /// Represents the window in <see cref="RoomType.HczLoadingBay"/>
-        /// </summary>
-        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/PrefabType.cs b/EXILED/Exiled.API/Enums/PrefabType.cs
index 43936f1d80..6a52ce7995 100644
--- a/EXILED/Exiled.API/Enums/PrefabType.cs
+++ b/EXILED/Exiled.API/Enums/PrefabType.cs
@@ -417,47 +417,5 @@ public enum PrefabType
 
         [Prefab(213466224, "SCP-939 Ragdoll Halloween")]
         Scp939RagdollHalloween,
-
-        [Prefab(689741320, "SCP-559 Cake")]
-        Scp559Cake,
-
-        [Prefab(2657863153, "SCP-956")]
-        Scp956,
-
-        [Prefab(1205960739, "SCP-2536 Tree")]
-        Scp2536,
-
-        [Prefab(2102014206, "Snowpile")]
-        Snowpile,
-
-        [Prefab(3401975113, "Scp018Projectile Christmas")]
-        Scp018ProjectileChristmas,
-
-        [Prefab(3223468476, "SnowballProjectile")]
-        SnowballProjectile,
-
-        [Prefab(296717882, "CoalPickup")]
-        CoalPickup,
-
-        [Prefab(409273101, "TapePlayerPickup")]
-        Scp1507TapePickup,
-
-        [Prefab(3971391978, "Scp021JPickup")]
-        Scp021JPickup,
-
-        [Prefab(142820664, "CoalProjectile")]
-        CoalProjectile,
-
-        [Prefab(2405470903, "Scp2536Projectile")]
-        Scp2536Projectile,
-
-        [Prefab(1496232901, "SCP-173 Ragdoll Variant")]
-        Scp173RagdollChristmas,
-
-        [Prefab(6069361, "SnowPoop - TantrumObj")]
-        SnowTantrum,
-
-        [Prefab(3654754970, "SCP-1507 Ragdoll")]
-        Scp1507Ragdoll,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/ProjectileType.cs b/EXILED/Exiled.API/Enums/ProjectileType.cs
index 2d95210924..a8072ed48e 100644
--- a/EXILED/Exiled.API/Enums/ProjectileType.cs
+++ b/EXILED/Exiled.API/Enums/ProjectileType.cs
@@ -51,21 +51,21 @@ public enum ProjectileType
         /// Coal.
         /// Used by <see cref="ItemType.Coal"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Coal,
 
         /// <summary>
         /// SpecialCoal.
         /// Used by <see cref="ItemType.SpecialCoal"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas and AprilFools.")]
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         SpecialCoal,
 
         /// <summary>
         /// Snowball.
         /// Used by <see cref="ItemType.Snowball"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Christmas.")]
+        [Obsolete("Only availaible for Christmas.")]
         Snowball,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/RoomType.cs b/EXILED/Exiled.API/Enums/RoomType.cs
index 6dceeea6e2..0b7737c193 100644
--- a/EXILED/Exiled.API/Enums/RoomType.cs
+++ b/EXILED/Exiled.API/Enums/RoomType.cs
@@ -353,10 +353,5 @@ public enum RoomType
         /// Heavy Containment Zone's straight hall room with lava.
         /// </summary>
         HczDss12 = HczIncineratorWayside,
-
-        /// <summary>
-        /// Heavy Containment Zone's T-intersection with a ramp in it.
-        /// </summary>
-        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/Side.cs b/EXILED/Exiled.API/Enums/Side.cs
index 5accace2f3..5e9c063be7 100644
--- a/EXILED/Exiled.API/Enums/Side.cs
+++ b/EXILED/Exiled.API/Enums/Side.cs
@@ -52,10 +52,5 @@ public enum Side
         /// No team. Same as <see cref="Team.Dead"/>.
         /// </summary>
         None,
-
-        /// <summary>
-        /// Contains <see cref="RoleTypeId.Flamingo"/> and <see cref="RoleTypeId.AlphaFlamingo"/>. Same as <see cref="Team.Flamingos"/>.
-        /// </summary>
-        Flamingos,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Exiled.API.csproj b/EXILED/Exiled.API/Exiled.API.csproj
index 70f81bf0d1..31fe36e002 100644
--- a/EXILED/Exiled.API/Exiled.API.csproj
+++ b/EXILED/Exiled.API/Exiled.API.csproj
@@ -34,7 +34,6 @@
         <Reference Include="Snake" HintPath="$(EXILED_REFERENCES)\Snake.dll" Private="false" />
         <Reference Include="Unity.TextMeshPro" HintPath="$(EXILED_REFERENCES)\Unity.TextMeshPro.dll" Private="false" />
         <Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
-        <Reference Include="UnityEngine.AnimationModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.AnimationModule.dll" Private="false" />
         <Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />
         <Reference Include="UnityEngine.ParticleSystemModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.ParticleSystemModule.dll" Private="false" />
         <Reference Include="UnityEngine.PhysicsModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.PhysicsModule.dll" Private="false" />
diff --git a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
index 6fde63477d..95dfc33727 100644
--- a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
@@ -204,13 +204,6 @@ public static DamageType GetDamageType(DamageHandlerBase damageHandlerBase)
                         Log.Warn($"{nameof(DamageTypeExtensions)}.{nameof(damageHandlerBase)}: No matching {nameof(DamageType)} for {nameof(UniversalDamageHandler)} with ID {translation.Id}, type will be reported as {DamageType.Unknown}. Report this to EXILED Devs.");
                         return DamageType.Unknown;
                     }
-
-                case AttackerDamageHandler attackerDamageHandler:
-                    {
-                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
-                            return DamageType.Marshmallow;
-                        return DamageType.Unknown;
-                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
index 088438e085..c44a32362d 100644
--- a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
+++ b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
@@ -101,9 +101,6 @@ public static class EffectTypeExtension
             { EffectType.TraumatizedByEvil, typeof(TraumatizedByEvil) },
             { EffectType.WhiteCandy, typeof(WhiteCandy) },
             { EffectType.Scp1509Resurrected, typeof(Scp1509Resurrected) },
-            { EffectType.FocusedVision, typeof(FocusedVision) },
-            { EffectType.AnomalousRegeneration, typeof(AnomalousRegeneration) },
-            { EffectType.AnomalousTarget, typeof(AnomalousTarget) },
             #pragma warning restore CS0618
         });
 
diff --git a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
index 3ba47fd9a8..605e6466c0 100644
--- a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
@@ -17,7 +17,6 @@ namespace Exiled.API.Extensions
 
     using AdminToys;
     using AudioPooling;
-    using Cassie;
     using CustomPlayerEffects;
     using Exiled.API.Enums;
     using Exiled.API.Features.Items;
@@ -513,12 +512,13 @@ public static void ResyncKeycardPickup(CustomKeycardPickup customKeycard)
         /// <param name="isSubtitles">Same on <see cref="Cassie.Message(string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void PlayCassieAnnouncement(this Player player, string words, bool makeHold = false, bool makeNoise = true, bool isSubtitles = false)
         {
-            CassieAnnouncement announcement = new(new CassieTtsPayload(words, isSubtitles, makeHold), 0, makeNoise ? 1 : 0);
-
-            // processes makeNoise
-            announcement.OnStartedPlaying();
-
-            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
+            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
+            {
+                if (controller != null)
+                {
+                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), words, makeHold, makeNoise, isSubtitles);
+                }
+            }
         }
 
         /// <summary>
@@ -533,12 +533,23 @@ public static void PlayCassieAnnouncement(this Player player, string words, bool
         /// <param name="isSubtitles">Same on <see cref="Cassie.MessageTranslated(string, string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void MessageTranslated(this Player player, string words, string translation, string customSubtitles, bool makeHold = false, bool makeNoise = true, bool isSubtitles = true)
         {
-            CassieAnnouncement announcement = new(new CassieTtsPayload(words, customSubtitles, makeHold), 0, makeNoise ? 1 : 0);
+            StringBuilder announcement = StringBuilderPool.Pool.Get();
 
-            // processes makeNoise
-            announcement.OnStartedPlaying();
+            string[] cassies = words.Split('\n');
+            string[] translations = translation.Split('\n');
 
-            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
+            for (int i = 0; i < cassies.Length; i++)
+                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
+
+            string message = StringBuilderPool.Pool.ToStringReturn(announcement);
+
+            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
+            {
+                if (controller != null)
+                {
+                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), message, makeHold, makeNoise, isSubtitles, customSubtitles);
+                }
+            }
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.API/Extensions/RoleExtensions.cs b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
index db1a7c99a9..369910654a 100644
--- a/EXILED/Exiled.API/Extensions/RoleExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
@@ -70,7 +70,6 @@ public static class RoleExtensions
             Team.FoundationForces or Team.Scientists => Side.Mtf,
             Team.ChaosInsurgency or Team.ClassD => Side.ChaosInsurgency,
             Team.OtherAlive => Side.Tutorial,
-            Team.Flamingos => Side.Flamingos,
             _ => Side.None,
         };
 
@@ -81,13 +80,12 @@ public static class RoleExtensions
         /// <returns><see cref="Team"/>.</returns>
         public static Team GetTeam(this RoleTypeId roleType) => roleType switch
         {
-            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman or RoleTypeId.ChaosFlamingo => Team.ChaosInsurgency,
+            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman => Team.ChaosInsurgency,
             RoleTypeId.Scientist => Team.Scientists,
             RoleTypeId.ClassD => Team.ClassD,
-            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 or RoleTypeId.ZombieFlamingo=> Team.SCPs,
-            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist or RoleTypeId.NtfFlamingo => Team.FoundationForces,
+            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 => Team.SCPs,
+            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist => Team.FoundationForces,
             RoleTypeId.Tutorial => Team.OtherAlive,
-            RoleTypeId.Flamingo or RoleTypeId.AlphaFlamingo => Team.Flamingos,
             _ => Team.Dead,
         };
 
@@ -133,7 +131,6 @@ public static bool TryGetRoleBase<T>(this RoleTypeId roleType, out T roleBase)
             Team.ClassD or Team.ChaosInsurgency => LeadingTeam.ChaosInsurgency,
             Team.FoundationForces or Team.Scientists => LeadingTeam.FacilityForces,
             Team.SCPs => LeadingTeam.Anomalies,
-            Team.Flamingos => LeadingTeam.Flamingo,
             _ => LeadingTeam.Draw,
         };
 
diff --git a/EXILED/Exiled.API/Features/Camera.cs b/EXILED/Exiled.API/Features/Camera.cs
index fa17a77540..fca5cbbc73 100644
--- a/EXILED/Exiled.API/Features/Camera.cs
+++ b/EXILED/Exiled.API/Features/Camera.cs
@@ -143,11 +143,6 @@ public class Camera : IWrapper<Scp079Camera>, IWorldSpace
             ["GATE A ELEVATORS"] = CameraType.EzGateAElevators,
             ["GATE B INTERIOR"] = CameraType.EzGateBInterior,
             ["GATE B SIDE"] = CameraType.EzGateBSide,
-            ["GATE A STAIRWELL"] = CameraType.EzGateAStairwell,
-            ["GATE A UPPER"] = CameraType.EzGateAUpper,
-            ["LOADING BAY"] = CameraType.HczLoadingBay,
-            ["HCZ LOADING RAMP"] = CameraType.HczLoadingBayRamp,
-            ["STAIRWELL"] = CameraType.HczLoadingBayStairwell,
 
             // CustomCamera
             ["EZ ARM CAMERA TOY"] = CameraType.EzArmCameraToy,
diff --git a/EXILED/Exiled.API/Features/Cassie.cs b/EXILED/Exiled.API/Features/Cassie.cs
index 475e68ad4e..0730f9a5a9 100644
--- a/EXILED/Exiled.API/Features/Cassie.cs
+++ b/EXILED/Exiled.API/Features/Cassie.cs
@@ -7,19 +7,19 @@
 
 namespace Exiled.API.Features
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
 
     using Exiled.API.Features.Pools;
-    using global::Cassie;
-    using global::Cassie.Interpreters;
+
     using MEC;
+
     using PlayerRoles;
+
     using PlayerStatsSystem;
+
     using Respawning;
-    using Respawning.NamingRules;
 
     using CustomFirearmHandler = DamageHandlers.FirearmDamageHandler;
     using CustomHandlerBase = DamageHandlers.DamageHandlerBase;
@@ -29,15 +29,20 @@ namespace Exiled.API.Features
     /// </summary>
     public static class Cassie
     {
+        /// <summary>
+        /// Gets the <see cref="NineTailedFoxAnnouncer"/> singleton.
+        /// </summary>
+        public static NineTailedFoxAnnouncer Announcer => NineTailedFoxAnnouncer.singleton;
+
         /// <summary>
         /// Gets a value indicating whether C.A.S.S.I.E is currently announcing. Does not include decontamination or Alpha Warhead Messages.
         /// </summary>
-        public static bool IsSpeaking => CassieAnnouncementDispatcher.AllAnnouncements.Count != 0;
+        public static bool IsSpeaking => Announcer.queue.Count != 0;
 
         /// <summary>
-        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="CassieAnnouncementDispatcher.AllAnnouncements"/> objects that C.A.S.S.I.E recognizes.
+        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="NineTailedFoxAnnouncer.VoiceLine"/> objects that C.A.S.S.I.E recognizes.
         /// </summary>
-        public static IReadOnlyCollection<CassieAnnouncement> VoiceLines => CassieAnnouncementDispatcher.AllAnnouncements;
+        public static IReadOnlyCollection<NineTailedFoxAnnouncer.VoiceLine> VoiceLines => Announcer.voiceLines;
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message.
@@ -47,7 +52,7 @@ public static class Cassie
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void Message(string message, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
+            RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles);
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message with a possibility to custom the subtitles.
@@ -59,7 +64,14 @@ public static void Message(string message, bool isHeld = false, bool isNoisy = t
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void MessageTranslated(string message, string translation, bool isHeld = false, bool isNoisy = true, bool isSubtitles = true)
         {
-            new CassieAnnouncement(new CassieTtsPayload(message, translation, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
+            StringBuilder announcement = StringBuilderPool.Pool.Get();
+            string[] cassies = message.Split('\n');
+            string[] translations = translation.Split('\n');
+            for (int i = 0; i < cassies.Length; i++)
+                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
+
+            RespawnEffectsController.PlayCassieAnnouncement(announcement.ToString(), isHeld, isNoisy, isSubtitles);
+            StringBuilderPool.Pool.Return(announcement);
         }
 
         /// <summary>
@@ -69,7 +81,7 @@ public static void MessageTranslated(string message, string translation, bool is
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void GlitchyMessage(string message, float glitchChance, float jamChance) =>
-            new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue();
+            Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance);
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message after a certain amount of seconds.
@@ -80,7 +92,7 @@ public static void GlitchyMessage(string message, float glitchChance, float jamC
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void DelayedMessage(string message, float delay, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue());
+            Timing.CallDelayed(delay, () => RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles));
 
         /// <summary>
         /// Reproduce a glitchy C.A.S.S.I.E announcement after a certain period of seconds.
@@ -90,53 +102,17 @@ public static void DelayedMessage(string message, float delay, bool isHeld = fal
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void DelayedGlitchyMessage(string message, float delay, float glitchChance, float jamChance) =>
-            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue());
-
-        /// <summary>
-        /// Calculates the duration of a C.A.S.S.I.E message.
-        /// </summary>
-        /// <param name="message">The message, which duration will be calculated.</param>
-        /// <param name="obsolete1">An obsolete parameter.</param>
-        /// <param name="obsolete2">Another obsolete parameter.</param>
-        /// <returns>Duration (in seconds) of specified message.</returns>
-        [Obsolete("Please use CalculateDuration(string)", true)]
-        public static float CalculateDuration(string message, bool obsolete1, float obsolete2) => CalculateDuration(message);
+            Timing.CallDelayed(delay, () => Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance));
 
         /// <summary>
         /// Calculates the duration of a C.A.S.S.I.E message.
         /// </summary>
         /// <param name="message">The message, which duration will be calculated.</param>
+        /// <param name="rawNumber">Determines if a number won't be converted to its full pronunciation.</param>
+        /// <param name="speed">The speed of the message.</param>
         /// <returns>Duration (in seconds) of specified message.</returns>
-        public static float CalculateDuration(string message)
-        {
-            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
-            {
-                return 0;
-            }
-
-            float value = 0;
-            string[] lines = message.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-            CassiePlaybackModifiers modifiers = new();
-            StringBuilder builder = StringBuilderPool.Pool.Get();
-
-            for (int i = 0; i < lines.Length; i++)
-            {
-                foreach (CassieInterpreter interpreter in CassieTtsAnnouncer.Interpreters)
-                {
-                    bool halt;
-                    foreach (CassieInterpreter.Result result in interpreter.GetResults(cassieLineDatabase, ref modifiers, lines[i], builder, out halt))
-                    {
-                        value += (float)result.Modifiers.GetTimeUntilNextWord(result.Line);
-                    }
-
-                    if (halt)
-                        break;
-                }
-            }
-
-            return value;
-        }
+        public static float CalculateDuration(string message, bool rawNumber = false, float speed = 1f)
+            => Announcer.CalculateDuration(message, rawNumber, speed);
 
         /// <summary>
         /// Converts a <see cref="Team"/> into a Cassie-Readable <c>CONTAINMENTUNIT</c>.
@@ -144,16 +120,8 @@ public static float CalculateDuration(string message)
         /// <param name="team"><see cref="Team"/>.</param>
         /// <param name="unitName">Unit Name.</param>
         /// <returns><see cref="string"/> Containment Unit text.</returns>
-        public static string ConvertTeam(Team team, string unitName) => team switch
-        {
-            Team.FoundationForces when NamingRulesManager.TryGetNamingRule(team, out UnitNamingRule unitNamingRule) => "CONTAINMENTUNIT " + unitNamingRule.TranslateToCassie(unitName),
-            Team.FoundationForces => "CONTAINMENTUNIT UNKNOWN",
-            Team.ChaosInsurgency => "BY CHAOSINSURGENCY",
-            Team.Scientists => "BY SCIENCE PERSONNEL",
-            Team.ClassD => "BY CLASSD PERSONNEL",
-            Team.Flamingos => "BY SCP 1 5 0 7",
-            _ => "UNKNOWN",
-        };
+        public static string ConvertTeam(Team team, string unitName)
+            => NineTailedFoxAnnouncer.ConvertTeam(team, unitName);
 
         /// <summary>
         /// Converts a number into a Cassie-Readable String.
@@ -161,23 +129,7 @@ Team.FoundationForces when NamingRulesManager.TryGetNamingRule(team, out UnitNam
         /// <param name="num">Number to convert.</param>
         /// <returns>A CASSIE-readable <see cref="string"/> representing the number.</returns>
         public static string ConvertNumber(int num)
-        {
-            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
-            {
-                return string.Empty;
-            }
-
-            NumberInterpreter numberInterpreter = (NumberInterpreter)CassieTtsAnnouncer.Interpreters.FirstOrDefault((CassieInterpreter x) => x is NumberInterpreter);
-            if (numberInterpreter == null)
-            {
-                return string.Empty;
-            }
-
-            CassiePlaybackModifiers cassiePlaybackModifiers = default;
-            StringBuilder stringBuilder = new();
-            numberInterpreter.GetResults(cassieLineDatabase, ref cassiePlaybackModifiers, num.ToString(), stringBuilder, out bool flag);
-            return stringBuilder.ToString();
-        }
+            => NineTailedFoxAnnouncer.ConvertNumber(num);
 
         /// <summary>
         /// Announce a SCP Termination.
@@ -185,7 +137,7 @@ public static string ConvertNumber(int num)
         /// <param name="scp">SCP to announce termination of.</param>
         /// <param name="info">HitInformation.</param>
         public static void ScpTermination(Player scp, DamageHandlerBase info)
-            => CassieScpTerminationAnnouncement.AnnounceScpTermination(scp.ReferenceHub, info);
+            => NineTailedFoxAnnouncer.AnnounceScpTermination(scp.ReferenceHub, info);
 
         /// <summary>
         /// Announces the termination of a custom SCP name.
@@ -215,14 +167,14 @@ public static void CustomScpTermination(string scpName, CustomHandlerBase info)
         /// <summary>
         /// Clears the C.A.S.S.I.E queue.
         /// </summary>
-        public static void Clear() => CassieAnnouncementDispatcher.ClearAll();
+        public static void Clear() => RespawnEffectsController.ClearQueue();
 
         /// <summary>
         /// Gets a value indicating whether the given word is a valid C.A.S.S.I.E word.
         /// </summary>
         /// <param name="word">The word to check.</param>
         /// <returns><see langword="true"/> if the word is valid; otherwise, <see langword="false"/>.</returns>
-        public static bool IsValid(string word) => CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase) ? cassieLineDatabase.AllLines.Any(line => line.ApiName.ToUpper() == word.ToUpper()) : false;
+        public static bool IsValid(string word) => Announcer.voiceLines.Any(line => line.apiName.ToUpper() == word.ToUpper());
 
         /// <summary>
         /// Gets a value indicating whether the given sentence is all valid C.A.S.S.I.E word.
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
index fde6e9e00a..67b464474f 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
@@ -39,17 +39,11 @@ public CustomDamageHandler(Player target, BaseHandler baseHandler)
             if (Attacker is not null)
             {
                 if (baseHandler is BaseScpDamageHandler)
-                {
                     CustomBase = new ScpDamageHandler(target, baseHandler);
-                }
+                else if (Attacker.CurrentItem is not null && Attacker.CurrentItem.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
+                    CustomBase = new FirearmDamageHandler(Attacker.CurrentItem, target, baseHandler);
                 else
-                {
-                    Item item = Attacker.CurrentItem;
-                    if (item is not null && item.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
-                        CustomBase = new FirearmDamageHandler(item, target, baseHandler);
-                    else
-                        CustomBase = new DamageHandler(target, Attacker);
-                }
+                    CustomBase = new DamageHandler(target, Attacker);
             }
             else
             {
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
index 248e89452b..ec59d5ee5a 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
@@ -271,13 +271,6 @@ protected DamageType GetDamageType(BaseHandler damageHandler = null)
                         FirearmType.FRMG0 => DamageType.Frmg0,
                         _ => DamageType.Firearm
                     };
-
-                case PlayerStatsSystem.AttackerDamageHandler attackerDamageHandler:
-                    {
-                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
-                            return DamageType.Marshmallow;
-                        return DamageType.Unknown;
-                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Features/Doors/Door.cs b/EXILED/Exiled.API/Features/Doors/Door.cs
index a8163f207c..19718900a7 100644
--- a/EXILED/Exiled.API/Features/Doors/Door.cs
+++ b/EXILED/Exiled.API/Features/Doors/Door.cs
@@ -624,7 +624,6 @@ private DoorType GetDoorType()
                         RoomType.HczEzCheckpointA => DoorType.CheckpointArmoryA,
                         RoomType.HczEzCheckpointB => DoorType.CheckpointArmoryB,
                         RoomType.EzGateA => DoorType.GateAArmory,
-                        RoomType.HczLoadingBay => DoorType.HczLoadingBay,
                         _ => DoorType.UnknownDoor,
                     },
                     "Unsecured Pryable GateDoor" => Room?.Type switch
diff --git a/EXILED/Exiled.API/Features/Effect.cs b/EXILED/Exiled.API/Features/Effect.cs
index 426b68dcdc..f901966917 100644
--- a/EXILED/Exiled.API/Features/Effect.cs
+++ b/EXILED/Exiled.API/Features/Effect.cs
@@ -35,7 +35,7 @@ public Effect(StatusEffectBase statusEffectBase)
             if (!statusEffectBase.TryGetEffectType(out EffectType effect))
                 Log.Error($"EffectType not found please report to Exiled BugReport : {statusEffectBase}");
             Type = effect;
-            Duration = statusEffectBase.TimeLeft;
+            Duration = statusEffectBase.Duration;
             Intensity = statusEffectBase.Intensity;
             IsEnabled = statusEffectBase.IsEnabled;
         }
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
index 8fb2688bb7..50a2538c64 100644
--- a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
+++ b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
@@ -11,8 +11,9 @@ namespace Exiled.API.Features.Items.FirearmModules
 
     using Exiled.API.Features.Items.FirearmModules.Barrel;
     using Exiled.API.Features.Items.FirearmModules.Primary;
+
     using InventorySystem.Items.Firearms.Modules;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
+
     using UnityEngine;
 
     /// <summary>
@@ -65,12 +66,8 @@ public static Magazine Get(IAmmoContainerModule module)
                 PumpActionModule pump => new PumpBarrelMagazine(pump),
                 IPrimaryAmmoContainerModule primary => primary switch
                 {
+                    MagazineModule magazine => new NormalMagazine(magazine),
                     CylinderAmmoModule cylinder => new CylinderMagazine(cylinder),
-                    MagazineModule magazine => magazine switch
-                    {
-                        Scp127MagazineModule scp127MagazineModule => new Scp127Magazine(scp127MagazineModule),
-                        _ => new NormalMagazine(magazine)
-                    },
                     _ => null,
                 },
                 _ => null,
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
deleted file mode 100644
index c3226169ea..0000000000
--- a/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127Magazine.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.API.Features.Items.FirearmModules.Primary
-{
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Represents a normal magazine for SCP-127.
-    /// </summary>
-    public class Scp127Magazine : NormalMagazine
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp127Magazine"/> class.
-        /// </summary>
-        /// <param name="magazine"><inheritdoc cref="MagazineModule"/></param>
-        public Scp127Magazine(Scp127MagazineModule magazine)
-            : base(magazine)
-        {
-            MagazineModule = magazine;
-        }
-
-        /// <inheritdoc cref="NormalMagazine.MagazineModule"/>
-        public new Scp127MagazineModule MagazineModule { get; }
-
-        /// <summary>
-        /// Gets or sets the kill bonus.
-        /// </summary>
-        public int KillBonus
-        {
-            get => MagazineModule.KillBonus;
-            set => MagazineModule.KillBonus = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the rank up bonus.
-        /// </summary>
-        public int RankUpBonus
-        {
-            get => MagazineModule.RankUpBonus;
-            set => MagazineModule.RankUpBonus = value;
-        }
-
-        /// <summary>
-        /// Gets or sets all settings.
-        /// </summary>
-        public Scp127MagazineModule.RegenerationSettings[] RegenerationPerTier
-        {
-            get => MagazineModule._regenerationPerTier;
-            set => MagazineModule._regenerationPerTier = value;
-        }
-
-        /// <summary>
-        /// Gets the current setting.
-        /// </summary>
-        public Scp127MagazineModule.RegenerationSettings ActiveSetting => MagazineModule.ActiveSettings;
-
-        /// <summary>
-        /// Gets or sets a pause in bullets regeneration process.
-        /// </summary>
-        public float RemainingRegenPause
-        {
-            get => MagazineModule._remainingRegenPause;
-            set => MagazineModule._remainingRegenPause = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the amount of bullets that should be regenerated.
-        /// </summary>
-        public float RegenProgress
-        {
-            get => MagazineModule._regenProgress;
-            set => MagazineModule._regenProgress = value;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Item.cs b/EXILED/Exiled.API/Features/Items/Item.cs
index 89bb189c42..f9d8a74a0d 100644
--- a/EXILED/Exiled.API/Features/Items/Item.cs
+++ b/EXILED/Exiled.API/Features/Items/Item.cs
@@ -22,7 +22,6 @@ namespace Exiled.API.Features.Items
     using InventorySystem.Items.Firearms.Ammo;
     using InventorySystem.Items.Jailbird;
     using InventorySystem.Items.Keycards;
-    using InventorySystem.Items.MarshmallowMan;
     using InventorySystem.Items.MicroHID;
     using InventorySystem.Items.Pickups;
     using InventorySystem.Items.Radio;
@@ -219,11 +218,7 @@ public static Item Get(ItemBase itemBase)
 
             return itemBase switch
             {
-                InventorySystem.Items.Firearms.Firearm firearm => firearm.ItemTypeId switch
-                {
-                    ItemType.GunSCP127 => new Scp127(firearm),
-                    _ => new Firearm(firearm),
-                },
+                InventorySystem.Items.Firearms.Firearm firearm => new Firearm(firearm),
                 KeycardItem keycard => keycard switch
                 {
                     ChaosKeycardItem chaosKeycardItem => new ChaosKeycard(chaosKeycardItem),
@@ -261,7 +256,6 @@ public static Item Get(ItemBase itemBase)
                     _ => new Throwable(throwable),
                 },
                 Scp1509Item scp1509 => new Scp1509(scp1509),
-                MarshmallowItem marshmallow => new Marshmallow(marshmallow),
                 _ => new(itemBase),
             };
         }
@@ -324,11 +318,7 @@ public static T Get<T>(ushort serial)
         /// <returns>The <see cref="Item"/> created. This can be cast as a subclass.</returns>
         public static Item Create(ItemType type, Player owner = null) => type.GetTemplate() switch
         {
-            InventorySystem.Items.Firearms.Firearm => type switch
-            {
-                ItemType.GunSCP127 => new Scp127(),
-                _ => new Firearm(type),
-            },
+            InventorySystem.Items.Firearms.Firearm => new Firearm(type),
             KeycardItem keycard => keycard switch
             {
                 ChaosKeycardItem => new ChaosKeycard(type),
@@ -366,7 +356,6 @@ public static T Get<T>(ushort serial)
                 _ => new Throwable(type, owner),
             },
             Scp1509Item => new Scp1509(),
-            MarshmallowItem => new Marshmallow(type, owner),
             _ => new(type),
         };
 
diff --git a/EXILED/Exiled.API/Features/Items/Jailbird.cs b/EXILED/Exiled.API/Features/Items/Jailbird.cs
index 4cc9a59c86..b68a3473c2 100644
--- a/EXILED/Exiled.API/Features/Items/Jailbird.cs
+++ b/EXILED/Exiled.API/Features/Items/Jailbird.cs
@@ -52,8 +52,8 @@ internal Jailbird()
         /// </summary>
         public float MeleeDamage
         {
-            get => Base.MeleeDamage;
-            set => Base.MeleeDamage = value;
+            get => Base._hitreg._damageMelee;
+            set => Base._hitreg._damageMelee = value;
         }
 
         /// <summary>
@@ -61,8 +61,8 @@ public float MeleeDamage
         /// </summary>
         public float ChargeDamage
         {
-            get => Base._chargeDamage;
-            set => Base._chargeDamage = value;
+            get => Base._hitreg._damageCharge;
+            set => Base._hitreg._damageCharge = value;
         }
 
         /// <summary>
@@ -70,8 +70,8 @@ public float ChargeDamage
         /// </summary>
         public float FlashDuration
         {
-            get => Base._flashedDuration;
-            set => Base._flashedDuration = value;
+            get => Base._hitreg._flashedDuration;
+            set => Base._hitreg._flashedDuration = value;
         }
 
         /// <summary>
@@ -79,17 +79,17 @@ public float FlashDuration
         /// </summary>
         public float ConcussionDuration
         {
-            get => Base._concussionDuration;
-            set => Base._concussionDuration = value;
+            get => Base._hitreg._concussionDuration;
+            set => Base._hitreg._concussionDuration = value;
         }
 
         /// <summary>
-        /// Gets or sets the radius of the Jailbird's hit radius.
+        /// Gets or sets the radius of the Jailbird's hit register.
         /// </summary>
         public float Radius
         {
-            get => Base._hitregRadius;
-            set => Base._hitregRadius = value;
+            get => Base._hitreg._hitregRadius;
+            set => Base._hitreg._hitregRadius = value;
         }
 
         /// <summary>
@@ -97,10 +97,10 @@ public float Radius
         /// </summary>
         public float TotalDamageDealt
         {
-            get => Base.TotalMeleeDamageDealt;
+            get => Base._hitreg.TotalMeleeDamageDealt;
             set
             {
-                Base.TotalMeleeDamageDealt = value;
+                Base._hitreg.TotalMeleeDamageDealt = value;
                 Base._deterioration.RecheckUsage();
             }
         }
diff --git a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
index bab50d19ce..8d8bdad39d 100644
--- a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
+++ b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
@@ -43,8 +43,7 @@ internal ChaosKeycard(ItemType type)
         /// <summary>
         /// Gets the <see cref="InventorySystem.Items.Keycards.Snake.SnakeEngine"/> this encapsulates.
         /// </summary>
-        /// <remarks>Can be null, but shouldn't be during usage.</remarks>
-        public SnakeEngine SnakeEngine => ChaosKeycardItem.SnakeSessions.TryGetValue(Serial, out SnakeEngine engine) ? engine : null;
+        public SnakeEngine SnakeEngine => Base._localEngine;
 
         /// <summary>
         /// Returns the Keycard in a human readable format.
diff --git a/EXILED/Exiled.API/Features/Items/Marshmallow.cs b/EXILED/Exiled.API/Features/Items/Marshmallow.cs
deleted file mode 100644
index 349fe342fb..0000000000
--- a/EXILED/Exiled.API/Features/Items/Marshmallow.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Marshmallow.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.API.Features.Items
-{
-    using CustomPlayerEffects;
-    using Exiled.API.Interfaces;
-    using InventorySystem.Items.MarshmallowMan;
-    using PlayerStatsSystem;
-    using UnityEngine;
-
-    /// <summary>
-    /// A wrapper class for <see cref="MarshmallowItem"/>.
-    /// </summary>
-    public class Marshmallow : Item, IWrapper<MarshmallowItem>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
-        /// </summary>
-        /// <param name="itemBase">The base <see cref="MarshmallowItem"/> class.</param>
-        public Marshmallow(MarshmallowItem itemBase)
-            : base(itemBase)
-        {
-            Base = itemBase;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
-        /// </summary>
-        /// <param name="type">The <see cref="ItemType"/> of the marshmallow item.</param>
-        /// <param name="owner">The owner of the marshmallow item. Leave <see langword="null"/> for no owner.</param>
-        internal Marshmallow(ItemType type, Player owner = null)
-            : base((MarshmallowItem)(owner ?? Server.Host).Inventory.CreateItemInstance(new(type, 0), false))
-        {
-        }
-
-        /// <summary>
-        /// Gets the <see cref="MarshmallowItem"/> that this class is encapsulating.
-        /// </summary>
-        public new MarshmallowItem Base { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this marshmallow man is evil.
-        /// </summary>
-        /// <remarks>See <see cref="MakeEvil"/> in regards to making a marshmallow evil.</remarks>
-        public bool Evil => Base.EvilMode;
-
-        /// <summary>
-        /// Gets or sets the <see cref="AhpStat.AhpProcess"/> of the marshmallow man that would be used if he was evil.
-        /// </summary>
-        public AhpStat.AhpProcess EvilAhpProcess
-        {
-            get => Base.EvilAHPProcess;
-            set
-            {
-                if (Evil && value is null)
-                    return;
-
-                Base.EvilAHPProcess = value;
-            }
-        }
-
-        /// <summary>
-        /// Cackles for the owner even if they are not evil.
-        /// </summary>
-        /// <param name="cooldown">How long until the player can cackle again (negative values do not affect current cooldown).</param>
-        /// <param name="duration">How long players near the marshmallow man get effected by <see cref="TraumatizedByEvil"/>.</param>
-        public void Cackle(double cooldown = -1, float duration = 5)
-        {
-            if (cooldown >= 0)
-                Base._cackleCooldown.Trigger(cooldown);
-
-            Base.ServerSendPublicRpc(writer =>
-            {
-                writer.WriteByte(4);
-                Base._cackleCooldown.WriteCooldown(writer);
-            });
-
-            foreach (Player player in Player.List)
-            {
-                if (Vector3.Distance(player.Position, Owner.Position) <= 5F && player.CurrentItem is not Marshmallow { Evil: true })
-                    player.EnableEffect<TraumatizedByEvil>(duration);
-            }
-        }
-
-        /// <summary>
-        /// Makes the owner of this marshmallow evil. You CANNOT undo this without resetting the player.
-        /// </summary>
-        /// <param name="evilProcess">The <see cref="AhpStat.AhpProcess"/> of the new evil player.</param>
-        public void MakeEvil(AhpStat.AhpProcess evilProcess = null)
-        {
-            if (Evil)
-                return;
-
-            Base.ReleaseEvil(evilProcess ?? EvilAhpProcess ?? Owner.GetModule<AhpStat>().ServerAddProcess(450F, 450F, 0F, 1F, 0F, true));
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Scp127.cs b/EXILED/Exiled.API/Features/Items/Scp127.cs
deleted file mode 100644
index 2c71fbe4bb..0000000000
--- a/EXILED/Exiled.API/Features/Items/Scp127.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.API.Features.Items
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using InventorySystem.Items.Firearms.Modules;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-    using UnityEngine;
-
-    /// <summary>
-    /// Represents SCP-127.
-    /// </summary>
-    public class Scp127 : Firearm
-    {
-        #pragma warning disable SA1401
-        /// <summary>
-        /// Custom amount of max HS.
-        /// </summary>
-        internal float? CustomHsMax;
-        #pragma warning restore SA1401
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp127"/> class.
-        /// </summary>
-        /// <param name="itemBase"><inheritdoc cref="Firearm.Base"/></param>
-        public Scp127(InventorySystem.Items.Firearms.Firearm itemBase)
-            : base(itemBase)
-        {
-            foreach (ModuleBase module in Base.Modules)
-            {
-                switch (module)
-                {
-                    case Scp127HumeModule humeModule:
-                        HumeModule = humeModule;
-                        break;
-                    case Scp127TierManagerModule tierManagerModule:
-                        TierManagerModule = tierManagerModule;
-                        break;
-                    case Scp127VoiceLineManagerModule voiceLineManagerModule:
-                        VoiceLineManagerModule = voiceLineManagerModule;
-                        break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp127"/> class.
-        /// </summary>
-        internal Scp127()
-            : this((InventorySystem.Items.Firearms.Firearm)Server.Host.Inventory.CreateItemInstance(new(ItemType.GunSCP127, 0), false))
-        {
-        }
-
-        /// <summary>
-        /// Gets a collection of all active HS sessions.
-        /// </summary>
-        public static List<Scp127HumeModule.HumeShieldSession> ActiveHumeShieldSessions => Scp127HumeModule.ServerActiveSessions;
-
-        /// <summary>
-        /// Gets the <see cref="Scp127HumeModule"/> instance.
-        /// </summary>
-        public Scp127HumeModule HumeModule { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Scp127TierManagerModule"/> instance.
-        /// </summary>
-        public Scp127TierManagerModule TierManagerModule { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Scp127VoiceLineManagerModule"/> instance.
-        /// </summary>
-        public Scp127VoiceLineManagerModule VoiceLineManagerModule { get; }
-
-        /// <summary>
-        /// Gets or sets the maximum amount of HS.
-        /// </summary>
-        /// <remarks>If setter is used, after tier chance this value won't be edited automatically.</remarks>
-        public float HsMax
-        {
-            get => CustomHsMax ?? HumeModule.HsMax;
-            set => CustomHsMax = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a shield regeneration rate.
-        /// </summary>
-        public float ShieldRegenRate
-        {
-            get => HumeModule.ShieldRegenRate;
-            set => HumeModule.ShieldRegenRate = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a shield decay time.
-        /// </summary>
-        public float ShieldDecayRate
-        {
-            get => HumeModule.ShieldDecayRate;
-            set => HumeModule.ShieldDecayRate = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a pause before HS starts regeneration after damage being taken.
-        /// </summary>
-        public float ShieldOnDamagePause
-        {
-            get => HumeModule.ShieldOnDamagePause;
-            set => HumeModule.ShieldOnDamagePause = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a delay before HS starts dropping after unequipment.
-        /// </summary>
-        public float UnequipDecayDelay
-        {
-            get => HumeModule.UnequipDecayDelay;
-            set => HumeModule.UnequipDecayDelay = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a HumeShield regeneration.
-        /// </summary>
-        public float HsRegeneration
-        {
-            get => HumeModule.HsRegeneration;
-            set => HumeModule.HsRegeneration = value;
-        }
-
-        /// <summary>
-        /// Gets or sets an experience bonus for kill.
-        /// </summary>
-        public float KillBonus
-        {
-            get => TierManagerModule.KillBonus;
-            set => TierManagerModule.KillBonus = value;
-        }
-
-        /// <summary>
-        /// Gets or sets an amount of passive experience increase.
-        /// </summary>
-        public float PassiveExpAmount
-        {
-            get => TierManagerModule.PassiveExpAmount;
-            set => TierManagerModule.PassiveExpAmount = value;
-        }
-
-        /// <summary>
-        /// Gets or sets an interval of passive experience increase.
-        /// </summary>
-        public float PassiveExpInterval
-        {
-            get => TierManagerModule.PassiveExpInterval;
-            set => TierManagerModule.PassiveExpInterval = value;
-        }
-
-        /// <summary>
-        /// Gets or sets a collection of all tier thresholds.
-        /// </summary>
-        public Scp127TierManagerModule.TierThreshold[] TierThresholds
-        {
-            get => TierManagerModule.Thresholds;
-            set => TierManagerModule.Thresholds = value;
-        }
-
-        /// <summary>
-        /// Gets or sets current tier.
-        /// </summary>
-        public Scp127Tier CurrentTier
-        {
-            get => TierManagerModule.CurTier;
-            set => TierManagerModule.CurTier = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the current experience amount.
-        /// </summary>
-        public float Experience
-        {
-            get => TierManagerModule.ServerExp;
-            set => TierManagerModule.ServerExp = value;
-        }
-
-        /// <summary>
-        /// Gets the instance record.
-        /// </summary>
-        public Scp127TierManagerModule.InstanceRecord InstanceRecord => Scp127TierManagerModule.GetRecord(Serial);
-
-        /// <summary>
-        /// Gets the Owner stats.
-        /// </summary>
-        public Scp127TierManagerModule.OwnerStats OwnerStats => Scp127TierManagerModule.GetStats(Base);
-
-        /// <summary>
-        /// Gets or sets all Voice Triggers.
-        /// </summary>
-        public Scp127VoiceTriggerBase[] VoiceTriggers
-        {
-            get => VoiceLineManagerModule._foundTriggers;
-            set => VoiceLineManagerModule._foundTriggers = value;
-        }
-
-        /// <summary>
-        /// Gets a collection of players that are friends with this SCP-127.
-        /// </summary>
-        public IEnumerable<Player> Friends
-        {
-            get
-            {
-                if (!Scp127VoiceLineManagerModule.FriendshipMemory.TryGetValue(Serial, out HashSet<uint> uintSet))
-                    return null;
-
-                return uintSet.Select(Player.Get);
-            }
-        }
-
-        /// <summary>
-        /// Increases experience.
-        /// </summary>
-        /// <param name="amount">Amount to add.</param>
-        public void IncreaseExperience(float amount) => TierManagerModule.ServerIncreaseExp(Base, amount);
-
-        /// <summary>
-        /// Sets owner stats.
-        /// </summary>
-        /// <param name="exp">New experience amount.</param>
-        public void SetOwnerStats(float exp) => TierManagerModule.ServerSetStats(exp);
-
-        /// <summary>
-        /// Sends tier stats.
-        /// </summary>
-        /// <param name="tier">New tier.</param>
-        /// <param name="progress">New progress.</param>
-        public void SendTierStats(Scp127Tier tier, byte progress) => TierManagerModule.ServerSendStats(Serial, Owner.ReferenceHub, tier, progress);
-
-        /// <summary>
-        /// Tries to play voice line.
-        /// </summary>
-        /// <param name="voiceLine">Voice line to play.</param>
-        /// <param name="priority">Priority of the play.</param>
-        /// <returns><c>true</c> if voice line has been played successfully. Otherwise, <c>false</c>.</returns>
-        public bool TryPlayVoiceLine(Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority priority = Scp127VoiceTriggerBase.VoiceLinePriority.Normal)
-        {
-            if (!VoiceLineManagerModule.TryFindVoiceLine(voiceLine, out Scp127VoiceTriggerBase triggerBase, out AudioClip audioClip))
-                return false;
-
-            VoiceLineManagerModule.ServerSendVoiceLine(triggerBase, null, audioClip, (byte)priority);
-            return true;
-        }
-
-        /// <summary>
-        /// Checks if this instance of SCP-127 and <paramref name="player"/> have friendship.
-        /// </summary>
-        /// <param name="player">Target to check.</param>
-        /// <returns><c>true</c> if this instance of SCP-127 and <paramref name="player"/> have friendship. Otherwise, <c>false</c>.</returns>
-        public bool HasFriendship(Player player) => Scp127VoiceLineManagerModule.HasFriendship(Serial, player.ReferenceHub);
-
-        /// <summary>
-        /// Adds player as a friend.
-        /// </summary>
-        /// <param name="player">Target to be added.</param>
-        public void AddFriend(Player player)
-        {
-            HashSet<uint> uints = Scp127VoiceLineManagerModule.FriendshipMemory.GetOrAddNew(Serial);
-            uints.Add(player.NetId);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Lift.cs b/EXILED/Exiled.API/Features/Lift.cs
index d191cd6764..469a33bd22 100644
--- a/EXILED/Exiled.API/Features/Lift.cs
+++ b/EXILED/Exiled.API/Features/Lift.cs
@@ -47,7 +47,6 @@ public class Lift : IWrapper<ElevatorChamber>, IWorldSpace
         internal Lift(ElevatorChamber elevator)
         {
             Base = elevator;
-            ElevatorAutoReturn = elevator.GetComponent<ElevatorAutoReturn>();
             ElevatorChamberToLift.Add(elevator, this);
 
             internalDoorsList.AddRange(Elevator.AllElevatorDoors[Group]);
@@ -74,12 +73,6 @@ internal Lift(ElevatorChamber elevator)
         /// </summary>
         public ElevatorChamber Base { get; }
 
-        /// <summary>
-        /// Gets the base <see cref="ElevatorAutoReturn"/>.
-        /// </summary>
-        /// <remarks>Would be null for any elevator that do not used <see cref="Interactables.Interobjects.ElevatorAutoReturn"/>.</remarks>
-        public ElevatorAutoReturn ElevatorAutoReturn { get; }
-
         /// <summary>
         /// Gets a value of the internal doors list.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
index eaaf77cb7a..0494d2e966 100644
--- a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
@@ -123,11 +123,11 @@ protected override void InitializeProperties(ItemBase itemBase)
             base.InitializeProperties(itemBase);
             if (itemBase is JailbirdItem jailbirdItem)
             {
-                MeleeDamage = jailbirdItem.MeleeDamage;
-                ChargeDamage = jailbirdItem._chargeDamage;
-                FlashDuration = jailbirdItem._flashedDuration;
-                ConcussionDuration = jailbirdItem._concussionDuration;
-                Radius = Radius;
+                MeleeDamage = jailbirdItem._hitreg._damageMelee;
+                ChargeDamage = jailbirdItem._hitreg._damageCharge;
+                FlashDuration = jailbirdItem._hitreg._flashedDuration;
+                ConcussionDuration = jailbirdItem._hitreg._concussionDuration;
+                Radius = jailbirdItem._hitreg._hitregRadius;
             }
         }
     }
diff --git a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
index 935bc636ca..b11c1cb0e9 100644
--- a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
@@ -15,7 +15,7 @@ namespace Exiled.API.Features.Pickups
     using BaseScp1509 = InventorySystem.Items.Scp1509.Scp1509Pickup;
 
     /// <summary>
-    /// A wrapper class for a Scp1509 pickup.
+    /// A wrapper class for a Radio pickup.
     /// </summary>
     public class Scp1509Pickup : Pickup, IWrapper<BaseScp1509>
     {
diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index 956fcf7f23..a61d640a84 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -648,7 +648,7 @@ public ScpSpawnPreferences.SpawnPreferences ScpPreferences
         /// <summary>
         /// Gets a value indicating whether the player is reloading a weapon.
         /// </summary>
-        public bool IsReloading => CurrentItem is Firearm firearm && firearm.IsReloading;
+        public bool IsReloading => CurrentItem is Firearm firearm && !firearm.IsReloading;
 
         /// <summary>
         /// Gets a value indicating whether the player is aiming with a weapon.
@@ -1982,24 +1982,10 @@ public void SetRank(string name, UserGroup group)
                 ReferenceHub.serverRoles.SetGroup(group, false, false);
             }
 
-            ServerStatic.PermissionsHandler.Members[UserId] = name;
-        }
-
-        /// <summary>
-        /// If the rank(group) exists in the remote admin config, it will assign it to the player.
-        /// </summary>
-        /// <param name="name">The rank name to be set.</param>
-        /// <returns><see langword="true"/> if the rank(group) was found and successfully assigned, <see langword="false"/> otherwise.</returns>
-        public bool TrySetRank(string name)
-        {
-            if (ServerStatic.PermissionsHandler.Groups.TryGetValue(name, out UserGroup userGroup))
-            {
-                ReferenceHub.serverRoles.SetGroup(userGroup, false, false);
+            if (ServerStatic.PermissionsHandler.Members.ContainsKey(UserId))
                 ServerStatic.PermissionsHandler.Members[UserId] = name;
-                return true;
-            }
-
-            return false;
+            else
+                ServerStatic.PermissionsHandler.Members.Add(UserId, name);
         }
 
         /// <summary>
@@ -2043,21 +2029,6 @@ public void Broadcast(Broadcast broadcast, bool shouldClearPrevious = false)
                 Broadcast(broadcast.Duration, broadcast.Content, broadcast.Type, shouldClearPrevious);
         }
 
-        /// <summary>
-        /// Send an <see cref="global::Cassie.CassieAnnouncement"/> to the player.
-        /// </summary>
-        /// <param name="cassieAnnouncement">The <see cref="global::Cassie.CassieAnnouncement"/> to be broadcasted.</param>
-        /// <returns><see langword="0"/> if Cassie failed to play it or it's play nothing, otherwise it's return the duration of the annoucement.</returns>
-        public float CassieAnnouncement(global::Cassie.CassieAnnouncement cassieAnnouncement)
-        {
-            global::Cassie.CassieAnnouncementDispatcher.CurrentAnnouncement.OnStartedPlaying();
-            global::Cassie.CassieTtsPayload payload = cassieAnnouncement.Payload;
-            if (!global::Cassie.CassieTtsAnnouncer.TryPlay(payload, out float totalduration))
-                return 0;
-            payload.SendToHubsConditionally(x => x == ReferenceHub);
-            return totalduration;
-        }
-
         /// <summary>
         /// Drops an item from the player's inventory.
         /// </summary>
@@ -2090,12 +2061,10 @@ public void DropItem(Item item, bool isThrown = false)
         /// <returns>Dropped item's <see cref="Pickup"/>.</returns>
         public Pickup DropHeldItem()
         {
-            Item item = CurrentItem;
-
-            if (item is null)
+            if (CurrentItem is null)
                 return null;
 
-            return DropItem(item);
+            return DropItem(CurrentItem);
         }
 
         /// <summary>
@@ -3480,7 +3449,10 @@ public void SyncEffect(Effect effect)
         {
             if (effect.IsEnabled)
             {
-                EnableEffect(effect.Type, effect.Intensity, effect.Duration, effect.AddDurationIfActive);
+                EnableEffect(effect.Type, effect.Duration, effect.AddDurationIfActive);
+
+                if (effect.Intensity > 0)
+                    ChangeEffectIntensity(effect.Type, effect.Intensity, effect.Duration);
             }
         }
 
@@ -3608,7 +3580,8 @@ public void ChangeEffectIntensity<T>(byte intensity, float duration = 0)
         {
             if (ReferenceHub.playerEffectsController.TryGetEffect(out T statusEffect))
             {
-                statusEffect.ServerSetState(intensity, duration, false);
+                statusEffect.Intensity = intensity;
+                statusEffect.ServerChangeDuration(duration, true);
             }
         }
 
@@ -3622,7 +3595,8 @@ public void ChangeEffectIntensity(EffectType type, byte intensity, float duratio
         {
             if (TryGetEffect(type, out StatusEffectBase statusEffect))
             {
-                statusEffect.ServerSetState(intensity, duration, false);
+                statusEffect.Intensity = intensity;
+                statusEffect.ServerChangeDuration(duration, false);
             }
         }
 
diff --git a/EXILED/Exiled.API/Features/Recontainer.cs b/EXILED/Exiled.API/Features/Recontainer.cs
index dbc31a35bf..17f59c97d5 100644
--- a/EXILED/Exiled.API/Features/Recontainer.cs
+++ b/EXILED/Exiled.API/Features/Recontainer.cs
@@ -7,7 +7,6 @@
 
 namespace Exiled.API.Features
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -34,8 +33,7 @@ public static class Recontainer
         /// <summary>
         /// Gets a value indicating whether the C.A.S.S.I.E is currently busy.
         /// </summary>
-        [Obsolete("Use Cassie.IsSpeaking instead")]
-        public static bool IsCassieBusy => Cassie.IsSpeaking;
+        public static bool IsCassieBusy => Base.CassieBusy;
 
         /// <summary>
         /// Gets a value about how many generator have been activated.
@@ -63,8 +61,11 @@ public static bool IsContainmentZoneLocked
         /// <summary>
         /// Gets or sets the delay to wait before overcharging.
         /// </summary>
-        [Obsolete("Will be removed in Exiled 10, patch the Cassie079RecontainAnnouncement ctor if you need this functionality")]
-        public static float OverchargeDelay { get; set; }
+        public static float OverchargeDelay
+        {
+            get => Base._activationDelay;
+            set => Base._activationDelay = value;
+        }
 
         /// <summary>
         /// Gets or sets the lockdown duration.
@@ -187,7 +188,7 @@ public static bool IsContainmentSequenceSuccessful
         /// </summary>
         /// <param name="announcement">The announcement to play.</param>
         /// <param name="glitchyMultiplier">The glitchy multiplier.</param>
-        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, false, false, null);
+        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, glitchyMultiplier);
 
         /// <summary>
         /// Begins the overcharge procedure.
@@ -198,6 +199,7 @@ public static void BeginOvercharge(bool endOvercharge = true)
             Base.BeginOvercharge();
             if (endOvercharge)
             {
+                Base._delayStopwatch.Stop();
                 Base._unlockStopwatch.Start();
             }
         }
@@ -226,7 +228,7 @@ public static void BeginOvercharge(bool endOvercharge = true)
         /// <summary>
         /// Begins the recontainment procedure.
         /// </summary>
-        public static void Recontain() => Base.Recontain(false);
+        public static void Recontain() => Base.Recontain();
 
         /// <summary>
         /// Refreshes the activator.
diff --git a/EXILED/Exiled.API/Features/Roles/FpcRole.cs b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
index 9a1156833e..2b0d75cf00 100644
--- a/EXILED/Exiled.API/Features/Roles/FpcRole.cs
+++ b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
@@ -300,30 +300,6 @@ public BasicRagdoll Ragdoll
         /// </summary>
         public SpectatableModuleBase SpectatableModuleBase => FirstPersonController.SpectatorModule;
 
-        /// <summary>
-        /// Tries to get the <see cref="Transform"/> of a specified <see cref="HumanBodyBones"/> bone.
-        /// </summary>
-        /// <param name="bone">The bone to get the <see cref="Transform"/> of.</param>
-        /// <param name="boneTransform">
-        /// When this method returns, contains the <see cref="Transform"/> of the specified bone, if found;
-        /// otherwise, <c>null</c>.
-        /// </param>
-        /// <returns><c>true</c> if the bone transform was found; otherwise, <c>false</c>.</returns>
-        public bool TryGetBoneTransform(HumanBodyBones bone, out Transform boneTransform)
-        {
-            boneTransform = null;
-
-            if (Model is not AnimatedCharacterModel animatedModel)
-                return false;
-
-            Animator animator = animatedModel.Animator;
-            if (animator == null || animator.avatar == null || !animator.avatar.isValid || !animator.avatar.isHuman)
-                return false;
-
-            boneTransform = animator.GetBoneTransform(bone);
-            return boneTransform != null;
-        }
-
         /// <summary>
         /// Resets the <see cref="Player"/>'s stamina.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
index 6283226eb4..1c015e2ff0 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
@@ -271,7 +271,8 @@ public void Attack(Player player)
             else
             {
                 cardiacArrest.SetAttacker(AttackAbility.Owner);
-                cardiacArrest.ServerSetState(1, AttackAbility._statusEffectDuration, false);
+                cardiacArrest.Intensity = 1;
+                cardiacArrest.ServerChangeDuration(AttackAbility._statusEffectDuration, false);
             }
 
             SenseAbility.OnServerHit(AttackAbility._target);
diff --git a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
index 6e78b6c662..a59e699ac9 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
@@ -16,8 +16,6 @@ namespace Exiled.API.Features.Roles
     using PlayerRoles.PlayableScps.Scp096;
     using PlayerRoles.Subroutines;
 
-    using UnityEngine;
-
     using Scp096GameRole = PlayerRoles.PlayableScps.Scp096.Scp096Role;
 
     /// <summary>
@@ -141,20 +139,6 @@ internal Scp096Role(Scp096GameRole baseRole)
         /// </summary>
         public bool AttackPossible => AttackAbility.AttackPossible;
 
-        /// <summary>
-        /// Gets the head transform of SCP-096's character model.
-        /// </summary>
-        public Transform HeadTransform
-        {
-            get
-            {
-                if (Model is not Scp096CharacterModel scp96AnimatedCharacterModel)
-                    return null;
-
-                return scp96AnimatedCharacterModel.Head;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the Charge Ability Cooldown.
         /// </summary>
@@ -322,4 +306,4 @@ public void Charge(float cooldown = 1f)
         /// <returns>The Spawn Chance.</returns>
         public float GetSpawnChance(List<RoleTypeId> alreadySpawned) => Base.GetSpawnChance(alreadySpawned);
     }
-}
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
index 170bda116a..a4c9ba78cf 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
@@ -20,7 +20,7 @@ namespace Exiled.API.Features.Roles
     /// <summary>
     /// Defines a role that represents SCP-1507.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp1507Role : FpcRole, ISubroutinedScpRole, IHumeShieldRole, ISpawnableScp
     {
         /// <summary>
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
index 846a76509c..a81a24173f 100644
--- a/EXILED/Exiled.API/Features/Room.cs
+++ b/EXILED/Exiled.API/Features/Room.cs
@@ -506,7 +506,6 @@ private static RoomType FindType(GameObject gameObject)
                 "HCZ_ChkpB" => RoomType.HczElevatorB,
                 "HCZ_127" => RoomType.Hcz127,
                 "HCZ_ServerRoom" => RoomType.HczServerRoom,
-                "HCZ_Intersection_Ramp" => RoomType.HczLoadingBay,
                 "EZ_GateA" => RoomType.EzGateA,
                 "EZ_GateB" => RoomType.EzGateB,
                 "EZ_ThreeWay" => RoomType.EzTCross,
diff --git a/EXILED/Exiled.API/Features/Scp559.cs b/EXILED/Exiled.API/Features/Scp559.cs
index d05702b351..08fc899047 100644
--- a/EXILED/Exiled.API/Features/Scp559.cs
+++ b/EXILED/Exiled.API/Features/Scp559.cs
@@ -18,7 +18,7 @@ namespace Exiled.API.Features
     /// <summary>
     /// Represents a cake.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp559 : IWrapper<Scp559Cake>, IPosition
     {
         /// <summary>
@@ -50,34 +50,20 @@ public Scp559(Scp559Cake cakeBase)
         /// <summary>
         /// Gets a <see cref="Dictionary{TKey,TValue}"/> with spawnpoint in rooms.
         /// </summary>
-        public static Dictionary<RoomName, Vector4> SpawnPositions { get; } = Scp559Spawnpoint.InstancesPerRoom.ToDictionary(kvp => kvp.Key.Name, kvp =>
-        {
-            Transform roomTransform = kvp.Key.transform;
-            Transform spawnTransform = kvp.Value.transform;
-
-            Vector3 localPos = roomTransform.InverseTransformPoint(spawnTransform.position);
-
-            return new Vector4(localPos.x, localPos.y, localPos.z, spawnTransform.eulerAngles.y);
-        });
+        public static Dictionary<RoomName, Vector4> SpawnPositions => Scp559Cake.Spawnpoints;
 
         /// <summary>
         /// Gets the list of all available spawnpoints.
         /// </summary>
-        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossibleSpawnpoints.Select(spawnpoint =>
-        {
-            Transform t = spawnpoint.transform;
-            return new Vector4(t.position.x, t.position.y, t.position.z, t.eulerAngles.y);
-        }).ToList();
+        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossiblePositions;
 
         /// <summary>
         /// Gets or sets offset for spawning near pedestals.
         /// </summary>
         public static Vector3 PedestalOffset
         {
-            get => new(0, -Scp559Spawnpoint.PedestalHeight, 0);
-
-            [Obsolete("Setter no longer works")]
-            set { }
+            get => Scp559Cake.PedestalOffset;
+            set => Scp559Cake.PedestalOffset.Set(value.x, value.y, value.z);
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.API/Features/Server.cs b/EXILED/Exiled.API/Features/Server.cs
index 825cfb3566..96b8311fdf 100644
--- a/EXILED/Exiled.API/Features/Server.cs
+++ b/EXILED/Exiled.API/Features/Server.cs
@@ -111,27 +111,7 @@ public static string Name
         /// <summary>
         /// Gets the actual ticks per second of the server.
         /// </summary>
-        public static double Tps
-        {
-            get
-            {
-                double delta = Time.deltaTime;
-
-                if (delta <= 0)
-                    return MaxTps;
-
-                double tps = 1d / delta;
-
-                tps = Math.Min(tps, MaxTps);
-
-                return tps;
-            }
-        }
-
-        /// <summary>
-        /// Gets the average ticks per second of the server.
-        /// </summary>
-        public static double SmoothTps => Math.Round(1f / Time.smoothDeltaTime);
+        public static double Tps => Math.Round(1f / Time.smoothDeltaTime);
 
         /// <summary>
         /// Gets or sets the max ticks per second of the server.
diff --git a/EXILED/Exiled.API/Features/Waves/TimedWave.cs b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
index 6e9a5c55bf..8856727c58 100644
--- a/EXILED/Exiled.API/Features/Waves/TimedWave.cs
+++ b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
@@ -193,13 +193,13 @@ public static List<TimedWave> GetTimedWaves()
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
-        public void PlayAnnouncement() => Announcement?.PlayAnnouncement([], Base as IAnnouncedWave);
+        public void PlayAnnouncement() => Announcement?.PlayAnnouncement(new());
 
         /// <summary>
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
         /// <param name="players">The list of Player to spawn.</param>
-        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList(), Base as IAnnouncedWave);
+        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList());
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Window.cs b/EXILED/Exiled.API/Features/Window.cs
index 2d327ff0c4..e5a1624e0d 100644
--- a/EXILED/Exiled.API/Features/Window.cs
+++ b/EXILED/Exiled.API/Features/Window.cs
@@ -231,7 +231,6 @@ public void DamageWindow(float amount, DamageHandlerBase handler)
                 RoomType.HczEzCheckpointB => GlassType.HczEzCheckpointB,
                 RoomType.EzGateA when Base.name[7] == '5' => GlassType.GateAArmory,
                 RoomType.EzGateA => GlassType.GateAPit,
-                RoomType.HczLoadingBay => GlassType.HczLoadingBay,
                 _ => GlassType.Unknown,
             },
             "Window" => Room?.Type switch
diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
index 182f47155e..fa39569e0a 100644
--- a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
@@ -1013,6 +1013,15 @@ private void OnInternalOwnerHandcuffing(HandcuffingEventArgs ev)
                     continue;
 
                 OnOwnerHandcuffing(new OwnerHandcuffingEventArgs(item, ev));
+
+                if (!ev.IsAllowed)
+                    continue;
+
+                ev.Target.RemoveItem(item);
+
+                TrackedSerials.Remove(item.Serial);
+
+                Spawn(ev.Target, item, ev.Target);
             }
         }
 
diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index afce01ccdf..f29e2d525c 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -790,12 +790,6 @@ public bool TryAddFriendlyFire(Dictionary<RoleTypeId, float> ffRules, bool overw
             return true;
         }
 
-        /// <summary>
-        /// Returns the CustomRole in a human-readable format.
-        /// </summary>
-        /// <returns>A string containing CustomRole-related data.</returns>
-        public override string ToString() => $"{Name} ({Id})";
-
         /// <summary>
         /// Tries to register this role.
         /// </summary>
diff --git a/EXILED/Exiled.CustomRoles/Commands/Get.cs b/EXILED/Exiled.CustomRoles/Commands/Get.cs
deleted file mode 100644
index 7d96d5f6b4..0000000000
--- a/EXILED/Exiled.CustomRoles/Commands/Get.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Get.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.CustomRoles.Commands
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Text;
-
-    using CommandSystem;
-    using Exiled.API.Extensions;
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.CustomRoles.API;
-    using Exiled.CustomRoles.API.Features;
-    using Exiled.Permissions.Extensions;
-    using HarmonyLib;
-
-    /// <summary>
-    /// The command to get specified player(s) current custom roles.
-    /// </summary>
-    internal sealed class Get : ICommand
-    {
-        private Get()
-        {
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Get"/> command instance.
-        /// </summary>
-        public static Get Instance { get; } = new();
-
-        /// <inheritdoc/>
-        public string Command => "get";
-
-        /// <inheritdoc/>
-        public string[] Aliases { get; } = Array.Empty<string>();
-
-        /// <inheritdoc/>
-        public string Description => "Gets the specified player(s)' current custom role(s).";
-
-        /// <inheritdoc/>
-        public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
-        {
-            if (!sender.CheckPermission("customroles.get"))
-            {
-                response = "Permission Denied, required: customroles.get";
-                return false;
-            }
-
-            List<Player> players = ListPool<Player>.Pool.Get();
-
-            if (arguments.Count > 0)
-            {
-                string identifier = string.Join(" ", arguments);
-
-                switch (identifier.ToLower())
-                {
-                    case "*":
-                    case "all":
-                        players.AddRange(Player.List);
-                        break;
-                    default:
-                        players.AddRange(Player.GetProcessedData(arguments));
-                        break;
-                }
-
-                if (players.IsEmpty())
-                {
-                    if (arguments.Count > 0 || !Player.TryGet(sender, out Player player))
-                    {
-                        response = $"Player not found: {identifier}";
-                        return false;
-                    }
-
-                    players.Add(player);
-                }
-            }
-            else
-            {
-                response = "get <Nickname/PlayerID/UserID/all/*>";
-                return false;
-            }
-
-            StringBuilder builder = StringBuilderPool.Pool.Get();
-
-            builder.AppendLine();
-            builder.AppendLine("====================== Custom Roles ======================");
-
-            foreach (Player target in players)
-            {
-                ReadOnlyCollection<CustomRole> roles = target.GetCustomRoles();
-                builder.Append((target.DisplayNickname + (target.HasCustomName ? $" ({target.Nickname})" : string.Empty)).PadRight(30 + (target.HasCustomName ? 23 : 0)));
-                builder.Append(" ");
-                builder.Append($"({target.Id})".PadRight(5));
-                if (roles.IsEmpty())
-                {
-                    builder.AppendLine(" | No Custom Role");
-                }
-                else
-                {
-                    // builder.Append($" | [{string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>"))}]");
-                    builder.Append(" | [");
-                    builder.Append(string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>")));
-                    builder.AppendLine("]");
-                }
-            }
-
-            builder.AppendLine("==========================================================");
-
-            ListPool<Player>.Pool.Return(players);
-
-            response = StringBuilderPool.Pool.ToStringReturn(builder);
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.CustomRoles/Commands/Give.cs b/EXILED/Exiled.CustomRoles/Commands/Give.cs
index 9666bff990..2f74b46498 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Give.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Give.cs
@@ -83,7 +83,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
 
                 string identifier = string.Join(" ", arguments.Skip(1));
 
-                switch (identifier.ToLower())
+                switch (identifier)
                 {
                     case "*":
                     case "all":
diff --git a/EXILED/Exiled.CustomRoles/Commands/Parent.cs b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
index fd42b5e497..f64facabec 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Parent.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
@@ -41,13 +41,12 @@ public override void LoadGeneratedCommands()
             RegisterCommand(Give.Instance);
             RegisterCommand(Info.Instance);
             RegisterCommand(List.List.Instance);
-            RegisterCommand(Get.Instance);
         }
 
         /// <inheritdoc/>
         protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            response = "Invalid subcommand! Available: give, info, list, get";
+            response = "Invalid subcommand! Available: give, info, list";
             return false;
         }
     }
diff --git a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
index cd1a8b4769..78b2030580 100644
--- a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
+++ b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
@@ -49,4 +49,4 @@
         <PostBuildEvent>if [[ ! -z "$EXILED_DEV_REFERENCES" ]]; then cp "$(OutputPath)$(AssemblyName).dll" "$EXILED_DEV_REFERENCES/Plugins/"; fi</PostBuildEvent>
     </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/EXILED/Exiled.Events/Commands/TpsCommand.cs b/EXILED/Exiled.Events/Commands/TpsCommand.cs
index 14c0def05e..722de3b61e 100644
--- a/EXILED/Exiled.Events/Commands/TpsCommand.cs
+++ b/EXILED/Exiled.Events/Commands/TpsCommand.cs
@@ -15,6 +15,7 @@ namespace Exiled.Events.Commands
     /// <summary>
     /// Command for showing current server TPS.
     /// </summary>
+    [CommandHandler(typeof(RemoteAdminCommandHandler))]
     [CommandHandler(typeof(GameConsoleCommandHandler))]
     public class TpsCommand : ICommand
     {
@@ -30,7 +31,7 @@ public class TpsCommand : ICommand
         /// <inheritdoc />
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            double diff = Server.SmoothTps / Server.MaxTps;
+            double diff = Server.Tps / Server.MaxTps;
             string color = diff switch
             {
                 > 0.9 => "green",
@@ -38,7 +39,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 _ => "red"
             };
 
-            response = $"<color={color}>{Server.SmoothTps}/{Server.MaxTps}</color>";
+            response = $"<color={color}>{Server.Tps}/{Server.MaxTps}</color>";
             return true;
         }
     }
diff --git a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
index abd2f4877f..a8b986c171 100644
--- a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
@@ -7,70 +7,39 @@
 
 namespace Exiled.Events.EventArgs.Cassie
 {
-    using System;
-    using System.Text;
-
-    using Exiled.API.Features.Pools;
-    using global::Cassie;
     using Interfaces;
-    using Subtitles;
 
     /// <summary>
     /// Contains all the information after sending a C.A.S.S.I.E. message.
     /// </summary>
     public class SendingCassieMessageEventArgs : IDeniableEvent
     {
-        private readonly CassieAnnouncement announcement;
-        private readonly CassieTtsPayload payload;
-
-        private string customSubtitles;
-        private float glitchScale;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="SendingCassieMessageEventArgs" /> class.
         /// </summary>
-        /// <param name="annc">The announcement to populate all properties from.</param>
-        /// <param name="isAllowed">
-        /// <inheritdoc cref="IsAllowed"/>
+        /// <param name="words">
+        /// <inheritdoc cref="Words" />
+        /// </param>
+        /// <param name="makeHold">
+        /// <inheritdoc cref="MakeHold" />
+        /// </param>
+        /// <param name="makeNoise">
+        /// <inheritdoc cref="MakeNoise" />
         /// </param>
-        public SendingCassieMessageEventArgs(CassieAnnouncement annc, bool isAllowed = true)
+        /// <param name="customAnnouncement">
+        /// <inheritdoc cref="IsCustomAnnouncement" />
+        /// </param>
+        /// <param name="customSubtitles">
+        /// <inheritdoc cref="CustomSubtitles" />
+        /// </param>
+        /// <param name="isAllowed">Indicates whether the event can be executed.</param>
+        public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise, bool customAnnouncement, string customSubtitles, bool isAllowed = true)
         {
-            announcement = annc;
-            payload = annc.Payload;
-
-            Words = payload.Content;
-            switch (payload.SubtitleSource)
-            {
-                case CassieTtsPayload.SubtitleMode.None:
-                case CassieTtsPayload.SubtitleMode.Automatic:
-                    CustomSubtitles = string.Empty;
-                    break;
-                case CassieTtsPayload.SubtitleMode.Custom:
-                    CustomSubtitles = payload._customSubtitle;
-                    break;
-                case CassieTtsPayload.SubtitleMode.FromTranslation:
-                    StringBuilder builder = StringBuilderPool.Pool.Get();
-                    SubtitleController controller = SubtitleController.Singleton;
-
-                    foreach (SubtitlePart part in payload._subtitleMessage.SubtitleParts)
-                    {
-                        Subtitle subtitle = controller.Subtitles[part.Subtitle];
-                        builder.Append(controller.GetTranslation(subtitle));
-                    }
-
-                    CustomSubtitles = StringBuilderPool.Pool.ToStringReturn(builder);
-
-                    break;
-                default:
-                    CustomSubtitles = string.Empty;
-                    break;
-            }
-
-            MakeHold = payload.PlayBackground;
-            GlitchScale = annc.GlitchScale;
-            MakeNoise = annc.GlitchScale is not 0;
-            SubtitleSource = payload.SubtitleSource;
-
+            Words = words;
+            CustomSubtitles = customSubtitles;
+            MakeHold = makeHold;
+            MakeNoise = makeNoise;
+            IsCustomAnnouncement = customAnnouncement;
             IsAllowed = isAllowed;
         }
 
@@ -82,38 +51,13 @@ public SendingCassieMessageEventArgs(CassieAnnouncement annc, bool isAllowed = t
         /// <summary>
         /// Gets or sets the message subtitles.
         /// </summary>
-        public string CustomSubtitles
-        {
-            get => customSubtitles;
-            set
-            {
-                if (customSubtitles != value)
-                    SubtitleSource = CassieTtsPayload.SubtitleMode.Custom;
-
-                customSubtitles = value;
-            }
-        }
+        public string CustomSubtitles { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the message should be held.
         /// </summary>
         public bool MakeHold { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value controlling how glitchy this CASSIE message is.
-        /// </summary>
-        public float GlitchScale
-        {
-            get => glitchScale;
-            set
-            {
-                if (!MakeNoise && value is not 0)
-                    MakeNoise = true;
-
-                glitchScale = value;
-            }
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether the message should make noise.
         /// </summary>
@@ -125,50 +69,8 @@ public float GlitchScale
         public bool IsAllowed { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the event can be executed.
+        /// Gets or sets a value indicating whether the message can be sent.
         /// </summary>
-        [Obsolete("Useless and will be removed in Exiled 10.")]
         public bool IsCustomAnnouncement { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating where the subtitles for this message came from.
-        /// </summary>
-        public CassieTtsPayload.SubtitleMode SubtitleSource { get; set; }
-
-        /// <summary>
-        /// Gets a <see cref="CassieAnnouncement"/> consisting of all properties in this event.
-        /// </summary>
-        public CassieAnnouncement Announcement
-        {
-            get
-            {
-                CassieTtsPayload newPayload;
-
-                // I love readonly fields :)
-                if (SubtitleSource is CassieTtsPayload.SubtitleMode.FromTranslation)
-                {
-                    newPayload = new CassieTtsPayload(Words, MakeHold, payload._subtitleMessage.SubtitleParts);
-                }
-                else
-                {
-                    if (SubtitleSource is CassieTtsPayload.SubtitleMode.Automatic)
-                        newPayload = new CassieTtsPayload(Words, true, MakeHold);
-                    else
-                        newPayload = new CassieTtsPayload(Words, CustomSubtitles, MakeHold);
-                }
-
-                return announcement switch
-                {
-                    CassieScpTerminationAnnouncement =>
-
-                        // this is disabled via patch b/c termination messages are not modifiable at the stage the SendCassieMessage patch is in.
-                        throw new InvalidOperationException("SendCassieMessage was called for a SCP termination message!"),
-
-                    CassieWaveAnnouncement waveAnnc => new CassieWaveAnnouncement(waveAnnc.Wave, newPayload),
-                    Cassie079RecontainAnnouncement recontainAnnc => new Cassie079RecontainAnnouncement(recontainAnnc._callback, false, newPayload),
-                    _ => new CassieAnnouncement(newPayload, 0, GlitchScale / (API.Features.Warhead.IsDetonated ? 2F : 1F) * (MakeNoise ? 1F : 0F)),
-                };
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
deleted file mode 100644
index fdd41cef5b..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="IMarshmallowEvent.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Interfaces
-{
-    using Exiled.API.Features.Items;
-
-    /// <summary>
-    /// Represents all events related to the marshmallow man.
-    /// </summary>
-    public interface IMarshmallowEvent : IItemEvent
-    {
-        /// <summary>
-        /// Gets the marshmallow item related to this event.
-        /// </summary>
-        public Marshmallow Marshmallow { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
deleted file mode 100644
index 616ad8f3e5..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="IScp127Event.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Interfaces
-{
-    /// <summary>
-    /// Represents all events related to SCP-127.
-    /// </summary>
-    public interface IScp127Event : IItemEvent
-    {
-        /// <summary>
-        /// Gets the SCP-127 instance, related to this event.
-        /// </summary>
-        public API.Features.Items.Scp127 Scp127 { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
index acb2463878..1d6dcf3add 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
@@ -14,7 +14,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Event args used for all <see cref="Scp1507Role"/> related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp1507Event : IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
index fc62383340..d8a5537257 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
@@ -12,7 +12,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Defines the base contract for all <see cref="Scp559Cake"/> related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp559Event : IExiledEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
deleted file mode 100644
index 8e491ee0b1..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="CacklingEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Item
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.MarshmallowMan;
-
-    /// <summary>
-    /// Contains all information before a marshmallow man punches.
-    /// </summary>
-    public class CacklingEventArgs : IMarshmallowEvent, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacklingEventArgs"/> class.
-        /// </summary>
-        /// <param name="marshmallow">The marshmallow item of the player cackling.</param>
-        /// <param name="isAllowed">Whether the player is allowed to cackle.</param>
-        public CacklingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
-        {
-            Marshmallow = Item.Get<Marshmallow>(marshmallow);
-            Player = Marshmallow.Owner;
-            IsAllowed = isAllowed;
-        }
-
-        /// <summary>
-        /// Gets the player cackling.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <inheritdoc />
-        public API.Features.Items.Item Item => Marshmallow;
-
-        /// <summary>
-        /// Gets the marshmallow item of the player cackling.
-        /// </summary>
-        public Marshmallow Marshmallow { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the player is allowed to cackle.
-        /// </summary>
-        public bool IsAllowed { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
deleted file mode 100644
index d2d927d95a..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="PunchingEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Item
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.MarshmallowMan;
-
-    /// <summary>
-    /// Contains all information before a marshmallow man punches.
-    /// </summary>
-    public class PunchingEventArgs : IMarshmallowEvent, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PunchingEventArgs"/> class.
-        /// </summary>
-        /// <param name="marshmallow">The marshmallow item of the player attacking.</param>
-        /// <param name="isAllowed">Whether the player is allowed to punch.</param>
-        public PunchingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
-        {
-            Marshmallow = Item.Get<Marshmallow>(marshmallow);
-            Player = Marshmallow.Owner;
-            IsAllowed = isAllowed;
-        }
-
-        /// <summary>
-        /// Gets the player punching.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <inheritdoc />
-        public Item Item => Marshmallow;
-
-        /// <summary>
-        /// Gets the marshmallow item of the player punching.
-        /// </summary>
-        public Marshmallow Marshmallow { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the punch is allowed.
-        /// </summary>
-        public bool IsAllowed { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
index d8d38cc474..4c43eb1df8 100644
--- a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
@@ -7,13 +7,15 @@
 
 namespace Exiled.Events.EventArgs.Map
 {
-    using System;
-
     using API.Features;
     using API.Features.DamageHandlers;
     using API.Features.Roles;
+
     using Interfaces;
 
+    using CustomAttackerHandler = API.Features.DamageHandlers.AttackerDamageHandler;
+    using DamageHandlerBase = PlayerStatsSystem.DamageHandlerBase;
+
     /// <summary>
     /// Contains all information before C.A.S.S.I.E announces an SCP termination.
     /// </summary>
@@ -25,14 +27,16 @@ public class AnnouncingScpTerminationEventArgs : IAttackerEvent, IDeniableEvent
         /// <param name="scp">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="terminationCause">
-        /// <inheritdoc cref="TerminationCause"/>
+        /// <param name="damageHandlerBase">
+        /// <inheritdoc cref="DamageHandler" />
         /// </param>
-        public AnnouncingScpTerminationEventArgs(Player scp, string terminationCause)
+        public AnnouncingScpTerminationEventArgs(Player scp, DamageHandlerBase damageHandlerBase)
         {
             Player = scp;
             Role = scp.Role;
-            TerminationCause = terminationCause;
+            DamageHandler = new CustomDamageHandler(scp, damageHandlerBase);
+            Attacker = DamageHandler.BaseIs(out CustomAttackerHandler customAttackerHandler) ? customAttackerHandler.Attacker : null;
+            TerminationCause = damageHandlerBase.CassieDeathAnnouncement.Announcement;
             IsAllowed = true;
         }
 
@@ -54,13 +58,11 @@ public AnnouncingScpTerminationEventArgs(Player scp, string terminationCause)
         /// <summary>
         /// Gets the player who killed the SCP.
         /// </summary>
-        [Obsolete("Attacker can no longer be acquired for this event. This will be readded in a different event.")]
         public Player Attacker { get; }
 
         /// <summary>
         /// Gets or sets the <see cref="CustomDamageHandler" />.
         /// </summary>
-        [Obsolete("DamageHandler can no longer be acquired for this event. This will be readded in a different event.")]
         public CustomDamageHandler DamageHandler { get; set; }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
index 038a3e16c4..168a0f578e 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
@@ -18,6 +18,8 @@ namespace Exiled.Events.EventArgs.Player
     /// </summary>
     public class ReceivingEffectEventArgs : IPlayerEvent, IDeniableEvent
     {
+        private byte intensity;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ReceivingEffectEventArgs" /> class.
         /// </summary>
@@ -30,9 +32,9 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         {
             Player = player;
             Effect = effect;
-            Intensity = intensity;
+            this.intensity = intensity;
             CurrentIntensity = currentIntensity;
-            Duration = intensity is 0 ? 0 : duration;
+            Duration = duration;
         }
 
         /// <summary>
@@ -51,9 +53,20 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         public float Duration { get; set; } = 0;
 
         /// <summary>
-        /// Gets or sets the value of the new intensity of the effect.
+        /// Gets or sets the value of the new intensity of the effect. Setting this to <c>0</c> is the same as setting IsAllowed to
+        /// <see langword="false" />.
         /// </summary>
-        public byte Intensity { get; set; }
+        public byte Intensity
+        {
+            get => intensity;
+            set
+            {
+                intensity = value;
+
+                if (intensity == 0)
+                    IsAllowed = false;
+            }
+        }
 
         /// <summary>
         /// Gets the value of the intensity of this effect on the player.
diff --git a/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
deleted file mode 100644
index 6dce01109c..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp1576TransmissionEndedEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Player
-{
-    using API.Features;
-    using API.Features.Items;
-    using Interfaces;
-    using InventorySystem.Items.Usables.Scp1576;
-
-    /// <summary>
-    /// Contains all information after a SCP-1576 transmission has ended.
-    /// </summary>
-    public class Scp1576TransmissionEndedEventArgs : IPlayerEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Scp1576TransmissionEndedEventArgs"/> class.
-        /// </summary>
-        /// <param name="player"><inheritdoc cref="Player"/></param>
-        /// <param name="scp1576Item"><inheritdoc cref="Scp1576"/></param>
-        public Scp1576TransmissionEndedEventArgs(Player player, Scp1576Item scp1576Item)
-        {
-            Player = player;
-            Scp1576 = Item.Get<Scp1576>(scp1576Item);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Exiled.API.Features.Player"/> that the transmission ended for.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Exiled.API.Features.Items.Scp1576"/> instance.
-        /// </summary>
-        public Exiled.API.Features.Items.Scp1576 Scp1576 { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
index c6aeed7ffb..e25e9fd728 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
@@ -28,14 +28,10 @@ public class UsedItemEventArgs : IPlayerEvent, IUsableEvent
         /// <param name="item">
         /// <inheritdoc cref="Item" />
         /// </param>
-        /// <param name="causedByHolstering">
-        /// <inheritdoc cref="CausedByHolstering"/>
-        /// </param>
-        public UsedItemEventArgs(ReferenceHub player, UsableItem item, bool causedByHolstering)
+        public UsedItemEventArgs(ReferenceHub player, UsableItem item)
         {
             Player = Player.Get(player);
-            Usable = Item.Get(item) as Usable;
-            CausedByHolstering = causedByHolstering;
+            Usable = Item.Get(item) is Usable usable ? usable : null;
         }
 
         /// <summary>
@@ -50,11 +46,5 @@ public UsedItemEventArgs(ReferenceHub player, UsableItem item, bool causedByHols
         /// Gets the player who used the item.
         /// </summary>
         public Player Player { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this event was triggered by a player switching items (true) or by waiting after using the item (false).
-        /// </summary>
-        /// <remarks>Use this value if you wish to keep the bug where you could switch items quickly to skip this event.</remarks>
-        public bool CausedByHolstering { get; }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
deleted file mode 100644
index 533ccbb5ce..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="GainedExperienceEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information before SCP-127 gains experience.
-    /// </summary>
-    public class GainedExperienceEventArgs : IScp127Event
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GainedExperienceEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="experience"><inheritdoc cref="Experience"/></param>
-        public GainedExperienceEventArgs(Scp127 scp127, float experience)
-        {
-            Scp127 = scp127;
-            Experience = experience;
-            Tier = Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
-        }
-
-        /// <inheritdoc />
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc />
-        public Item Item => Scp127;
-
-        /// <inheritdoc />
-        public Scp127 Scp127 { get; }
-
-        /// <summary>
-        /// Gets the experience that SCP-127 has gained.
-        /// </summary>
-        public float Experience { get; }
-
-        /// <summary>
-        /// Gets the tier.
-        /// </summary>
-        public Scp127Tier Tier { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
deleted file mode 100644
index 6a1d7b738b..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="GainingExperienceEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information before SCP-127 gains experience.
-    /// </summary>
-    public class GainingExperienceEventArgs : IScp127Event, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GainingExperienceEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="experience"><inheritdoc cref="Experience"/></param>
-        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
-        public GainingExperienceEventArgs(Scp127 scp127, float experience, bool isAllowed = true)
-        {
-            Scp127 = scp127;
-            Experience = experience;
-            IsAllowed = isAllowed;
-        }
-
-        /// <inheritdoc />
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc />
-        public Item Item => Scp127;
-
-        /// <inheritdoc />
-        public Scp127 Scp127 { get; }
-
-        /// <inheritdoc />
-        public bool IsAllowed { get; set; }
-
-        /// <summary>
-        /// Gets or sets the gaining experience.
-        /// </summary>
-        public float Experience { get; set; }
-
-        /// <summary>
-        /// Gets or sets the new tier.
-        /// </summary>
-        public Scp127Tier Tier
-        {
-            get => Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
-            set => Experience = Scp127.TierManagerModule.GetExpForTier(value) - Scp127.Experience;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
deleted file mode 100644
index 10810403d5..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="TalkedEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information after SCP-127 voice line is played.
-    /// </summary>
-    public class TalkedEventArgs : IScp127Event
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TalkedEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
-        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
-        public TalkedEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority)
-        {
-            Scp127 = scp127;
-            VoiceLine = voiceLine;
-            Priority = voiceLinePriority;
-        }
-
-        /// <inheritdoc/>
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc/>
-        public Item Item => Scp127;
-
-        /// <inheritdoc/>
-        public Scp127 Scp127 { get; }
-
-        /// <summary>
-        /// Gets a voice line which is played.
-        /// </summary>
-        public Scp127VoiceLinesTranslation VoiceLine { get; }
-
-        /// <summary>
-        /// Gets a priority for this play.
-        /// </summary>
-        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
deleted file mode 100644
index b8934566a8..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="TalkingEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp127
-{
-    using Exiled.API.Features;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Interfaces;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-    /// <summary>
-    /// Contains all information before SCP-127 voice line is played.
-    /// </summary>
-    public class TalkingEventArgs : IScp127Event, IDeniableEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TalkingEventArgs"/> class.
-        /// </summary>
-        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
-        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
-        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
-        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
-        public TalkingEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority, bool isAllowed = true)
-        {
-            Scp127 = scp127;
-            VoiceLine = voiceLine;
-            Priority = voiceLinePriority;
-            IsAllowed = isAllowed;
-        }
-
-        /// <inheritdoc/>
-        public Player Player => Scp127.Owner;
-
-        /// <inheritdoc/>
-        public Item Item => Scp127;
-
-        /// <inheritdoc/>
-        public Scp127 Scp127 { get; }
-
-        /// <inheritdoc/>
-        public bool IsAllowed { get; set; }
-
-        /// <summary>
-        /// Gets or sets a voice line which is played.
-        /// </summary>
-        public Scp127VoiceLinesTranslation VoiceLine { get; set; }
-
-        /// <summary>
-        /// Gets or sets a priority for this play.
-        /// </summary>
-        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
index c6ea947e55..c58330e252 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
@@ -18,7 +18,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 attacks door.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class AttackingDoorEventArgs : IScp1507Event, IDeniableEvent, IDoorEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
index 7ab56f98e2..ae5ebb8450 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class ScreamingEventArgs : IScp1507Event, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
index 5cc50f9352..376eba5abf 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
@@ -19,7 +19,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before flamingos get spawned.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningFlamingosEventArgs : IDeniableEvent, IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
index 10b713052e..0121d02d95 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class UsingTapeEventArgs : IPlayerEvent, IItemEvent, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
deleted file mode 100644
index d4935e6c92..0000000000
--- a/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FoundPositionEventArgs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.EventArgs.Scp2536
-{
-    using Christmas.Scp2536;
-    using Exiled.API.Features;
-    using Exiled.Events.EventArgs.Interfaces;
-
-    /// <summary>
-    /// Contains all information after SCP-2536 chooses target for spawning.
-    /// </summary>
-    public class FoundPositionEventArgs : IPlayerEvent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FoundPositionEventArgs"/> class.
-        /// </summary>
-        /// <param name="player"><inheritdoc cref="Player"/></param>
-        /// <param name="spawnpoint"><inheritdoc cref="Spawnpoint"/></param>
-        public FoundPositionEventArgs(Player player, Scp2536Spawnpoint spawnpoint)
-        {
-            Player = player;
-            Spawnpoint = spawnpoint;
-        }
-
-        /// <summary>
-        /// Gets the player near whom SCP-2536 will spawn.
-        /// </summary>
-        public Player Player { get; }
-
-        /// <summary>
-        /// Gets or sets the spawn point where SCP will spawn.
-        /// </summary>
-        public Scp2536Spawnpoint Spawnpoint { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
index 1a4a7408dc..b8b99f9ac9 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
@@ -15,7 +15,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before a player interacts with SCP-559.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerEvent
     {
         /// <summary>
@@ -23,11 +23,12 @@ public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerE
         /// </summary>
         /// <param name="scp559"><inheritdoc cref="Scp559"/></param>
         /// <param name="player"><inheritdoc cref="Player"/></param>
-        public InteractingScp559EventArgs(Scp559 scp559, Player player)
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public InteractingScp559EventArgs(Scp559 scp559, Player player, bool isAllowed = true)
         {
             Player = player;
             Scp559 = scp559;
-            IsAllowed = scp559.RemainingSlices > 0 && PlayerRoles.PlayerRolesUtils.IsHuman(player.Role.Type);
+            IsAllowed = isAllowed;
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
index c83baddd2c..6e3a81f06a 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before SCP-559 spawns.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningEventArgs : IDeniableEvent, IScp559Event
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Events.cs b/EXILED/Exiled.Events/Events.cs
index adae6e21a8..a1bdd040a2 100644
--- a/EXILED/Exiled.Events/Events.cs
+++ b/EXILED/Exiled.Events/Events.cs
@@ -21,7 +21,6 @@ namespace Exiled.Events
     using PlayerRoles.FirstPersonControl.NetworkMessages;
     using PlayerRoles.Ragdolls;
     using PlayerRoles.RoleAssign;
-
     using Respawning;
     using UnityEngine.SceneManagement;
     using UserSettings.ServerSpecific;
@@ -74,7 +73,6 @@ public override void OnEnabled()
             Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
             Handlers.Map.ChangedIntoGrenade += Handlers.Internal.ExplodingGrenade.OnChangedIntoGrenade;
-            Handlers.Warhead.Detonated += Handlers.Internal.Round.OnWarheadDetonated;
 
             RoleAssigner.OnPlayersSpawned += Handlers.Server.OnAllPlayersSpawned;
             CharacterClassManager.OnRoundStarted += Handlers.Server.OnRoundStarted;
@@ -97,11 +95,6 @@ public override void OnEnabled()
 
             FpcServerPositionDistributor.RoleSyncEvent += Handlers.Internal.Round.OnRoleSyncEvent;
 
-            LabApi.Events.Handlers.Scp127Events.Talking += Handlers.Scp127.OnTalking;
-            LabApi.Events.Handlers.Scp127Events.Talked += Handlers.Scp127.OnTalked;
-            LabApi.Events.Handlers.Scp127Events.GainingExperience += Handlers.Scp127.OnGainingExperience;
-            LabApi.Events.Handlers.Scp127Events.GainExperience += Handlers.Scp127.OnGainedExperience;
-
             ServerConsole.ReloadServerName();
         }
 
@@ -142,11 +135,6 @@ public override void OnDisabled()
             LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon -= Handlers.Player.OnUnloadingWeapon;
 
             FpcServerPositionDistributor.RoleSyncEvent -= Handlers.Internal.Round.OnRoleSyncEvent;
-
-            LabApi.Events.Handlers.Scp127Events.Talking -= Handlers.Scp127.OnTalking;
-            LabApi.Events.Handlers.Scp127Events.Talked -= Handlers.Scp127.OnTalked;
-            LabApi.Events.Handlers.Scp127Events.GainingExperience -= Handlers.Scp127.OnGainingExperience;
-            LabApi.Events.Handlers.Scp127Events.GainExperience -= Handlers.Scp127.OnGainedExperience;
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 26ff90342a..4cedb7a21e 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -29,7 +29,6 @@ namespace Exiled.Events.Handlers.Internal
     using InventorySystem.Items.Firearms.Attachments.Components;
     using InventorySystem.Items.Usables;
     using InventorySystem.Items.Usables.Scp244.Hypothermia;
-    using InventorySystem.Items.Usables.Scp330;
     using Mirror;
     using PlayerRoles;
     using PlayerRoles.FirstPersonControl;
@@ -109,9 +108,6 @@ public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
             if (ev.Role.IsDead() || !ev.Role.IsFpcRole())
                 ev.IsAllowed = false;
-
-            if (ev.DamageHandlerBase is Exiled.Events.Patches.Fixes.FixMarshmallowManFF fixMarshamllowManFf)
-                ev.DamageHandlerBase = fixMarshamllowManFf.MarshmallowItem.NewDamageHandler;
         }
 
         /// <inheritdoc cref="Scp049.OnActivatingSense(ActivatingSenseEventArgs)" />
@@ -140,7 +136,7 @@ public static void OnVerified(VerifiedEventArgs ev)
             }
 
             // Fix bug that player that Join do not receive information about other players Scale
-            foreach (Player player in ReferenceHub.AllHubs.Select(Player.Get))
+            foreach (Player player in Player.Enumerable)
             {
                 player.SetFakeScale(player.Scale, new List<Player>() { ev.Player });
 
@@ -182,13 +178,6 @@ public static RoleTypeId OnRoleSyncEvent(ReferenceHub viewerHub, ReferenceHub ow
             return actualRole;
         }
 
-        /// <inheritdoc cref="Handlers.Warhead.OnDetonated()"/>
-        public static void OnWarheadDetonated()
-        {
-            // fix for black candy
-            CandyBlack.Outcomes.RemoveAll(outcome => outcome is TeleportOutcome);
-        }
-
         private static void GenerateAttachments()
         {
             foreach (FirearmType firearmType in EnumUtils<FirearmType>.Values)
diff --git a/EXILED/Exiled.Events/Handlers/Item.cs b/EXILED/Exiled.Events/Handlers/Item.cs
index b1ca257f09..9ac83aafd3 100644
--- a/EXILED/Exiled.Events/Handlers/Item.cs
+++ b/EXILED/Exiled.Events/Handlers/Item.cs
@@ -89,16 +89,6 @@ public static class Item
         /// </summary>
         public static Event<JailbirdChangedWearStateEventArgs> JailbirdChangedWearState { get; set; } = new();
 
-        /// <summary>
-        /// Invoked before a marshmallow man punches.
-        /// </summary>
-        public static Event<PunchingEventArgs> Punching { get; set; } = new();
-
-        /// <summary>
-        /// Invoked before a marshmallow man cackles.
-        /// </summary>
-        public static Event<CacklingEventArgs> Cackling { get; set; } = new();
-
         /// <summary>
         /// Called before the Jailbird's <see cref="InventorySystem.Items.Jailbird.JailbirdWearState"/> is changed.
         /// </summary>
@@ -183,17 +173,5 @@ public static class Item
         /// </summary>
         /// <param name="ev">The <see cref="InspectedItemEventArgs"/> instance.</param>
         public static void OnInspectedItem(InspectedItemEventArgs ev) => InspectedItem.InvokeSafely(ev);
-
-        /// <summary>
-        /// Called before a marshmallow man punches.
-        /// </summary>
-        /// <param name="ev">The <see cref="PunchingEventArgs"/> instance.</param>
-        public static void OnPunching(PunchingEventArgs ev) => Punching.InvokeSafely(ev);
-
-        /// <summary>
-        /// Called before a marshmallow man cackles.
-        /// </summary>
-        /// <param name="ev">The <see cref="CacklingEventArgs"/> instance.</param>
-        public static void OnCackling(CacklingEventArgs ev) => Cackling.InvokeSafely(ev);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs
index 998b54f813..97e6137003 100644
--- a/EXILED/Exiled.Events/Handlers/Player.cs
+++ b/EXILED/Exiled.Events/Handlers/Player.cs
@@ -621,11 +621,6 @@ public class Player
         /// </summary>
         public static Event<InteractingEmergencyButtonEventArgs> InteractingEmergencyButton { get; set; } = new();
 
-        /// <summary>
-        /// Invoked after transmission has ended.
-        /// </summary>
-        public static Event<Scp1576TransmissionEndedEventArgs> Scp1576TransmissionEnded { get; set; } = new();
-
         /// <summary>
         /// Called before a player's emotion changed.
         /// </summary>
@@ -1361,11 +1356,5 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item
         /// </summary>
         /// <param name="ev">The <see cref="InteractingEmergencyButtonEventArgs"/> instance.</param>
         public static void OnInteractingEmergencyButton(InteractingEmergencyButtonEventArgs ev) => InteractingEmergencyButton.InvokeSafely(ev);
-
-        /// <summary>
-        /// Called after a 1576 transmisiion has ended.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp1576TransmissionEndedEventArgs"/> instance.</param>
-        public static void OnScp1576TransmissionEnded(Scp1576TransmissionEndedEventArgs ev) => Scp1576TransmissionEnded.InvokeSafely(ev);
     }
 }
diff --git a/EXILED/Exiled.Events/Handlers/Scp127.cs b/EXILED/Exiled.Events/Handlers/Scp127.cs
deleted file mode 100644
index b3f86534d3..0000000000
--- a/EXILED/Exiled.Events/Handlers/Scp127.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Handlers
-{
-    using Exiled.Events.EventArgs.Scp127;
-    using Exiled.Events.Features;
-    using LabApi.Events.Arguments.Scp127Events;
-
-#pragma warning disable SA1623
-    /// <summary>
-    /// SCP-127 event handlers.
-    /// </summary>
-    public static class Scp127
-    {
-        /// <summary>
-        /// Invoked before SCP-127 voice line is played.
-        /// </summary>
-        public static Event<TalkingEventArgs> Talking { get; set; } = new();
-
-        /// <summary>
-        /// Invoked after SCP-127 voice line is played.
-        /// </summary>
-        public static Event<TalkedEventArgs> Talked { get; set; } = new();
-
-        /// <summary>
-        /// Invoked before SCP-127 gains experience.
-        /// </summary>
-        public static Event<GainingExperienceEventArgs> GainingExperience { get; set; } = new();
-
-        /// <summary>
-        /// Invoked after SCP-127 gains experience.
-        /// </summary>
-        public static Event<GainedExperienceEventArgs> GainedExperience { get; set; } = new();
-
-        /// <summary>
-        /// Called before SCP-127 voice line is played.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127TalkingEventArgs"/> instance.</param>
-        public static void OnTalking(Scp127TalkingEventArgs ev)
-        {
-            TalkingEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority, ev.IsAllowed);
-            Talking.InvokeSafely(eventArgs);
-
-            ev.Priority = eventArgs.Priority;
-            ev.VoiceLine = eventArgs.VoiceLine;
-            ev.IsAllowed = eventArgs.IsAllowed;
-        }
-
-        /// <summary>
-        /// Called after SCP-127 voice line is played.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127TalkedEventArgs"/> instance.</param>
-        public static void OnTalked(Scp127TalkedEventArgs ev)
-            => Talked.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority));
-
-        /// <summary>
-        /// Called before SCP-127 gains experience.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127GainingExperienceEventArgs"/> instance.</param>
-        public static void OnGainingExperience(Scp127GainingExperienceEventArgs ev)
-        {
-            GainingExperienceEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain, ev.IsAllowed);
-            GainingExperience.InvokeSafely(eventArgs);
-
-            ev.ExperienceGain = eventArgs.Experience;
-            ev.IsAllowed = eventArgs.IsAllowed;
-        }
-
-        /// <summary>
-        /// Called after SCP-127 gains experience.
-        /// </summary>
-        /// <param name="ev">The <see cref="Scp127GainExperienceEventArgs"/> instance.</param>
-        public static void OnGainedExperience(Scp127GainExperienceEventArgs ev) =>
-            GainedExperience.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain));
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Scp1507.cs b/EXILED/Exiled.Events/Handlers/Scp1507.cs
index f36b16d633..63e4536d2c 100644
--- a/EXILED/Exiled.Events/Handlers/Scp1507.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp1507.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// SCP-1507 related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp1507
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp2536.cs b/EXILED/Exiled.Events/Handlers/Scp2536.cs
index 8c0d272583..3f7dfd1c58 100644
--- a/EXILED/Exiled.Events/Handlers/Scp2536.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp2536.cs
@@ -21,11 +21,6 @@ public static class Scp2536
         /// </summary>
         public static Event<FindingPositionEventArgs> FindingPosition { get; set; } = new();
 
-        /// <summary>
-        /// Invoked once SCP-2536 has found a spawn location.
-        /// </summary>
-        public static Event<FoundPositionEventArgs> FoundPosition { get; set; } = new();
-
         /// <summary>
         /// Invoked before SCP-2536 gives a gift to a player.
         /// </summary>
@@ -42,12 +37,6 @@ public static class Scp2536
         /// <param name="ev">The <see cref="FindingPositionEventArgs"/> instance.</param>
         public static void OnFindingPosition(FindingPositionEventArgs ev) => FindingPosition.InvokeSafely(ev);
 
-        /// <summary>
-        /// Called after SCP-2536 chooses a target.
-        /// </summary>
-        /// <param name="ev">The <see cref="FoundPositionEventArgs"/> instance.</param>
-        public static void OnFoundPosition(FoundPositionEventArgs ev) => FoundPosition.InvokeSafely(ev);
-
         /// <summary>
         /// Called before SCP-2536 gives a gift to a player.
         /// </summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp559.cs b/EXILED/Exiled.Events/Handlers/Scp559.cs
index 70d5387520..b17f520c9d 100644
--- a/EXILED/Exiled.Events/Handlers/Scp559.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp559.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// All SCP-559 related events.
     /// </summary>
-    // [Obsolete("Only availaible for Christmas and AprilFools.")]
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp559
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
index 1e7b55e3a8..0cb378ac02 100644
--- a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
@@ -8,61 +8,87 @@
 namespace Exiled.Events.Patches.Events.Cassie
 {
     using System.Collections.Generic;
-    using System.Linq;
     using System.Reflection.Emit;
 
     using API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Cassie;
-    using global::Cassie;
+
     using Handlers;
+
     using HarmonyLib;
     using Respawning;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="global::Cassie.CassieAnnouncementDispatcher.PlayNewAnnouncement(CassieAnnouncement)" />.
+    /// Patches <see cref="RespawnEffectsController.PlayCassieAnnouncement(string, bool, bool, bool, string)" />.
     /// Adds the <see cref="Cassie.SendingCassieMessage" /> event.
     /// </summary>
     [EventPatch(typeof(Cassie), nameof(Cassie.SendingCassieMessage))]
-    [HarmonyPatch(typeof(CassieAnnouncementDispatcher), nameof(CassieAnnouncementDispatcher.PlayNewAnnouncement))]
+    [HarmonyPatch(typeof(RespawnEffectsController), nameof(RespawnEffectsController.PlayCassieAnnouncement))]
     internal static class SendingCassieMessage
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            Label skipLabel = generator.DefineLabel();
             Label returnLabel = generator.DefineLabel();
 
-            newInstructions[0].WithLabels(skipLabel);
-
             newInstructions.InsertRange(
                 0,
                 new CodeInstruction[]
                 {
+                    // words
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Isinst, typeof(CassieScpTerminationAnnouncement)),
-                    new(OpCodes.Brtrue_S, skipLabel),
 
-                    new(OpCodes.Ldarg_0),
+                    // makeHold
+                    new(OpCodes.Ldarg_1),
+
+                    // makeNoise
+                    new(OpCodes.Ldarg_2),
+
+                    // customAnnouncement
+                    new(OpCodes.Ldarg_3),
+
+                    // customSubtitles
+                    new(OpCodes.Ldarg_S, 4),
 
                     // isAllowed
                     new(OpCodes.Ldc_I4_1),
 
-                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(CassieAnnouncement, bool);
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs)).Single(ctor => ctor.GetParameters().Length == 2)),
+                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(string, bool, bool, bool, string, bool);
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs))[0]),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),
 
                     // Cassie.OnSendingCassieMessage(ev);
                     new(OpCodes.Call, Method(typeof(Cassie), nameof(Cassie.OnSendingCassieMessage))),
 
-                    // annc = ev.Announcement
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Announcement))),
+                    // words = ev.Words
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Words))),
                     new(OpCodes.Starg_S, 0),
 
+                    // makeHold = ev.MakeHold
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeHold))),
+                    new(OpCodes.Starg_S, 1),
+
+                    // makeNoise = ev.MakeNoise
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeNoise))),
+                    new(OpCodes.Starg_S, 2),
+
+                    // customAnnouncement = ev.IsCustomAnnouncement
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsCustomAnnouncement))),
+                    new(OpCodes.Starg_S, 3),
+
+                    // customSubtitles = ev.CustomSubtitles
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.CustomSubtitles))),
+                    new(OpCodes.Starg_S, 4),
+
                     // if (!IsAllowed)
                     //   return;
                     new(OpCodes.Callvirt, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsAllowed))),
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs b/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
deleted file mode 100644
index fec7811ecf..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Cackling.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Item
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Item;
-    using HarmonyLib;
-    using InventorySystem.Items.MarshmallowMan;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
-    /// Adds the <see cref="Handlers.Item.Cackling" /> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Cackling))]
-    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCackle))]
-    public class Cackling
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label retLabel = generator.DefineLabel();
-
-            int offset = 1;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // this;
-                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // ev = new CacklingEventArgs(MarshmallowItem, bool);
-                new(OpCodes.Newobj, Constructor(typeof(CacklingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnCackling))),
-
-                // if (!ev.IsAllowed) return
-                new(OpCodes.Callvirt, PropertyGetter(typeof(CacklingEventArgs), nameof(CacklingEventArgs.IsAllowed))),
-                new(OpCodes.Brfalse_S, retLabel),
-            });
-
-            newInstructions[newInstructions.Count - 1].WithLabels(retLabel);
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs b/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
deleted file mode 100644
index 15c74b57b1..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Punching.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Item
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Item;
-    using HarmonyLib;
-    using InventorySystem.Items.MarshmallowMan;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
-    /// Adds the <see cref="Handlers.Item.Punching" /> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Punching))]
-    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCmd))]
-    public class Punching
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label retLabel = generator.DefineLabel();
-
-            int offset = 1;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
-
-            newInstructions[^1].WithLabels(retLabel);
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // this;
-                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // ev = new PunchingEventArgs(MarshmallowItem, bool);
-                new(OpCodes.Newobj, Constructor(typeof(PunchingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnPunching))),
-
-                // if (!ev.IsAllowed) return
-                new(OpCodes.Callvirt, PropertyGetter(typeof(PunchingEventArgs), nameof(PunchingEventArgs.IsAllowed))),
-                new(OpCodes.Brfalse_S, retLabel),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
index 3033a0327d..0d53ebeefb 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
@@ -7,7 +7,6 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
-    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -18,12 +17,11 @@ namespace Exiled.Events.Patches.Events.Map
     using Exiled.Events.EventArgs.Map;
     using HarmonyLib;
     using Respawning.Announcements;
-    using Subtitles;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncement"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncement"/>
+    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncementString"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncementString"/>
     /// to add <see cref="Handlers.Map.AnnouncingChaosEntrance"/> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
@@ -32,8 +30,8 @@ internal static class AnnouncingChaosEntrance
     {
         private static IEnumerable<MethodBase> TargetMethods()
         {
-            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncement));
-            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncement));
+            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncementString));
+            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncementString));
         }
 
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instruction, ILGenerator generator)
@@ -72,9 +70,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldarg_1),
                 new(OpCodes.Callvirt, Method(typeof(StringBuilder), nameof(StringBuilder.Clear))),
                 new(OpCodes.Pop),
-                new(OpCodes.Ldarg_3),
-                new(OpCodes.Call, Method(typeof(Array), nameof(Array.Empty), new Type[] { }, new[] { typeof(SubtitlePart) })),
-                new(OpCodes.Stind_Ref),
                 new(OpCodes.Ret),
 
                 new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel),
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
index 75cf10177c..bf59ef0103 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
@@ -7,7 +7,6 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
-    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -24,11 +23,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncement" />
+    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncementString" />
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncement))]
+    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncementString))]
     internal static class AnnouncingNtfEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -40,8 +39,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = 2;
-            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie)))) + offset;
+            int offset = 1;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_3) + offset;
 
             newInstructions.InsertRange(
                 index,
@@ -51,10 +50,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_3),
-
-                    // string[] unitInformation = lastGeneratedName.Split('-');
                     new(OpCodes.Ldloc_2),
+
+                    // string[] unitInformation = unitNameClear.Split('-');
+                    new(OpCodes.Ldloc_1),
                     new(OpCodes.Ldstr, "<[^>]*?>"),
                     new(OpCodes.Ldsfld, Field(typeof(string), nameof(string.Empty))),
                     new(OpCodes.Call, Method(typeof(Regex), nameof(Regex.Replace), new System.Type[] { typeof(string), typeof(string), typeof(string) })),
@@ -64,9 +63,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldc_I4_0),
                     new(OpCodes.Ldc_I4_S, 45),
                     new(OpCodes.Stelem_I2),
-                    new(OpCodes.Callvirt, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
+                    new(OpCodes.Call, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
 
-                    // AnnouncingNtfEntranceEventArgs ev = new(this, scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
+                    // AnnouncingNtfEntranceEventArgs ev = new(scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
                     //
                     // Map.OnAnnouncingNtfEntrance(ev);
                     new(OpCodes.Dup),
@@ -99,14 +98,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Box, typeof(int)),
                     new(OpCodes.Call, Method(typeof(string), nameof(string.Format), new[] { typeof(string), typeof(object), typeof(object) })),
                     new(OpCodes.Dup),
-                    new(OpCodes.Stloc_2),
+                    new(OpCodes.Stloc_1),
                     new(OpCodes.Callvirt, Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie))),
-                    new(OpCodes.Stloc_3),
+                    new(OpCodes.Stloc_2),
 
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_3),
+                    new(OpCodes.Stloc_2),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
index 018362acde..8bb3389fdd 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
@@ -20,11 +20,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncement"/>
+    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncementString"/>
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncement))]
+    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncementString))]
     internal static class AnnouncingNtfMiniEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -35,17 +35,15 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_1) + 1;
-
             newInstructions.InsertRange(
-                index,
+                0,
                 new CodeInstruction[]
                 {
                     // WaveAnnouncementBase
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_1),
+                    new(OpCodes.Ldloc_0),
 
                     // null
                     new(OpCodes.Ldnull),
@@ -68,7 +66,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_1),
+                    new(OpCodes.Stloc_0),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
index 5064239e03..71363142ff 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
@@ -7,102 +7,78 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
-    using System;
-    using System.Collections;
     using System.Collections.Generic;
+    using System.Reflection;
     using System.Reflection.Emit;
 
+    using API.Features.DamageHandlers;
     using API.Features.Pools;
-    using Exiled.API.Features;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Map;
     using Exiled.Events.Handlers;
-    using Footprinting;
-    using global::Cassie;
+
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
 
-    using Map = Exiled.Events.Handlers.Map;
     using Player = API.Features.Player;
 
     /// <summary>
     /// Patches
-    /// <see cref="CassieScpTerminationAnnouncement.OnStartedPlaying()" />.
+    /// <see cref="NineTailedFoxAnnouncer.AnnounceScpTermination(ReferenceHub, PlayerStatsSystem.DamageHandlerBase)" />.
     /// Adds the <see cref="Map.AnnouncingScpTermination" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingScpTermination))]
-    [HarmonyPatch(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.OnStartedPlaying))]
+    [HarmonyPatch(typeof(NineTailedFoxAnnouncer), nameof(NineTailedFoxAnnouncer.AnnounceScpTermination))]
     internal static class AnnouncingScpTermination
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            LocalBuilder cause = generator.DeclareLocal(typeof(string));
-            LocalBuilder enumerator = generator.DeclareLocal(typeof(IEnumerator<Footprint>));
-
-            ExceptionBlock beginTry = new(ExceptionBlockType.BeginExceptionBlock);
-            ExceptionBlock beginFinally = new(ExceptionBlockType.BeginFinallyBlock);
-            ExceptionBlock endFinally = new(ExceptionBlockType.EndExceptionBlock);
+            LocalBuilder ev = generator.DeclareLocal(typeof(AnnouncingScpTerminationEventArgs));
 
             Label ret = generator.DefineLabel();
-            Label entryLabel = generator.DefineLabel();
-            Label loopLabel = generator.DefineLabel();
-            Label leaveLabel = generator.DefineLabel();
-            Label endFinallyLabel = generator.DefineLabel();
-
-            int offset = -1;
-            int index = newInstructions.FindIndex(i => i.LoadsField(Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts)))) + offset;
-
-            newInstructions.RemoveRange(index, 2);
-            newInstructions.Insert(index, new CodeInstruction(OpCodes.Ldloc_S, cause));
 
-            newInstructions[0].WithLabels(leaveLabel);
+            int offset = -4;
+            int index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.CassieQueuingScpTerminationEventArgs))[0]) + offset;
 
             newInstructions.InsertRange(
-                0,
+                index,
                 new[]
-            {
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Ldfld, Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts))),
-                new(OpCodes.Stloc_S, cause),
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.Victims))),
-                new(OpCodes.Callvirt, Method(typeof(IEnumerable<Footprint>), nameof(IEnumerable<Footprint>.GetEnumerator))),
-                new(OpCodes.Stloc_S, enumerator),
-
-                // start of try
-                new CodeInstruction(OpCodes.Br_S, entryLabel).WithBlocks(beginTry),
-
-                // start of loop
-                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(loopLabel),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(IEnumerator<Footprint>), nameof(IEnumerator<Footprint>.Current))),
-                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(Footprint) })),
-                new(OpCodes.Ldloc_S, cause),
-                new(OpCodes.Newobj, Constructor(typeof(AnnouncingScpTerminationEventArgs), new[] { typeof(Player), typeof(string) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
-                new(OpCodes.Stloc_S, cause),
-
-                // entry point
-                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(entryLabel),
-                new(OpCodes.Callvirt, Method(typeof(IEnumerator), nameof(IEnumerator.MoveNext))),
-                new(OpCodes.Brtrue_S, loopLabel),
-
-                // end of loop
-                new(OpCodes.Leave, leaveLabel),
-
-                // begin finally
-                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithBlocks(beginFinally),
-                new(OpCodes.Brfalse, endFinallyLabel),
-                new(OpCodes.Ldloc_S, enumerator),
-                new(OpCodes.Callvirt, Method(typeof(IDisposable), nameof(IDisposable.Dispose))),
-
-                // end of finally
-                new CodeInstruction(OpCodes.Endfinally).WithLabels(endFinallyLabel).WithBlocks(endFinally),
-            });
+                {
+                    // Player.Get(scp)
+                    new CodeInstruction(OpCodes.Ldarg_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // hit
+                    new(OpCodes.Ldarg_1),
+
+                    // AnnouncingScpTerminationEventArgs ev = new(Player, DamageHandlerBase)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(AnnouncingScpTerminationEventArgs))[0]),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Stloc_S, ev.LocalIndex),
+
+                    // Map.OnAnnouncingScpTermination(ev)
+                    new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
+
+                    // if (!ev.IsAllowed)
+                    //    return;
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.IsAllowed))),
+                    new(OpCodes.Brfalse_S, ret),
+
+                    // hit = ev.DamageHandler.Base
+                    new(OpCodes.Ldloc_S, ev.LocalIndex),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.DamageHandler))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(CustomDamageHandler), nameof(CustomDamageHandler.Base))),
+                    new(OpCodes.Starg, 1),
+
+                    // announcement = ev.TerminationCause
+                    new(OpCodes.Ldloc_S, ev.LocalIndex),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
+                    new(OpCodes.Stloc_0),
+                });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
new file mode 100644
index 0000000000..7193f8d17f
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
@@ -0,0 +1,68 @@
+// -----------------------------------------------------------------------
+// <copyright file="AnnouncingTeamEntrance.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Map
+{
+    using System.Collections.Generic;
+    using System.Reflection;
+    using System.Reflection.Emit;
+    using System.Text;
+
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Map;
+    using HarmonyLib;
+    using Respawning.Announcements;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="WaveAnnouncementBase.PlayAnnouncement"/> to prevent cassie from playing empty string.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingNtfEntrance))]
+    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
+    [HarmonyPatch(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.PlayAnnouncement))]
+    internal static class AnnouncingTeamEntrance
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label returnLabel = generator.DefineLabel();
+
+            // the instruction that sends subtitles is called before stringReturn is created (and thus checked) so we need to move it so that empty (or disallowed) message's subtitles are not sent.
+            // this removes the Ldarg_0 and the CallVirt
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.SendSubtitles))));
+            CodeInstruction sendSubtitlesInstruction = newInstructions[index];
+            newInstructions.RemoveRange(index - 2, 3);
+
+            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldsfld);
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // if (stringReturn == "")
+                //     return;
+                new(OpCodes.Ldloc_S, 4),
+                new(OpCodes.Ldstr, string.Empty),
+                new(OpCodes.Ceq),
+                new(OpCodes.Brtrue_S, returnLabel),
+
+                // send subtitles before cassie message, but after our check.
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Ldarg_1),
+                sendSubtitlesInstruction,
+            });
+
+            newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
index 4af8bd4e11..b379bdec1a 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
@@ -89,13 +89,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))));
-            List<Label> labels = newInstructions[index].ExtractLabels();
-            List<CodeInstruction> codeInstructionsCopy = newInstructions.GetRange(index, 4);
-            newInstructions.RemoveRange(index, 4);
-            newInstructions[index].labels.AddRange(labels);
+            List<Label> label = newInstructions[index].labels;
+
+            newInstructions.RemoveAt(index);
+
+            int offset = -1;
+            index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.MapGeneratedEventArgs))[0]) + offset;
+            newInstructions.Insert(index, new CodeInstruction(OpCodes.Call, Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))).WithLabels(label));
 
-            index = newInstructions.FindIndex(x => x.OperandIs(Field(typeof(SeedSynchronizer), nameof(SeedSynchronizer.MapGenerated))));
-            newInstructions.InsertRange(index, codeInstructionsCopy);
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
index ac28cd901a..6f70c4b8b0 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
@@ -14,34 +14,36 @@ namespace Exiled.Events.Patches.Events.Player
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Player;
     using Exiled.Events.Handlers;
+
     using HarmonyLib;
-    using PlayerRoles.FirstPersonControl;
+
     using PlayerRoles.FirstPersonControl.Thirdperson;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="FirstPersonMovementModule.IsGrounded" />
+    /// Patches <see cref="AnimatedCharacterModel.OnGrounded" />
     /// Adds the <see cref="Player.Landing" /> event.
     /// </summary>
     [EventPatch(typeof(Player), nameof(Player.Landing))]
-    [HarmonyPatch(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.IsGrounded), MethodType.Setter)]
+    [HarmonyPatch(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.OnGrounded))]
     internal static class Landing
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            const int offset = 2;
-            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Ldarg_1) + offset;
+            const int offset = -1;
+            int index = newInstructions.FindIndex(
+                instruction => instruction.Calls(Method(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.PlayFootstep)))) + offset;
 
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
-                    // Player.Get(this.Hub)
+                    // Player.Get(base.OwnerHub)
                     new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.Hub))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(CharacterModel), nameof(CharacterModel.OwnerHub))),
                     new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // LandingEventArgs ev = new(Player)
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
index 707743a243..9d22a80b67 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
@@ -23,9 +23,9 @@ namespace Exiled.Events.Patches.Events.Player
 
     /// <summary>
     /// Patches the <see cref="StatusEffectBase.Intensity"/> method.
-    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event and fix NW Duration not being correctly set to 0 when effect is Reset.
+    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event.
     /// </summary>
-    // [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
     [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ForceIntensity))]
     internal static class ReceivingStatusEffect
     {
@@ -74,9 +74,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._intensity))),
 
-                    // this._timeLeft
+                    // this.Duration
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
 
                     // ReceivingEventArgs ev = new(Player, StatusEffectBase, byte, byte, float)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ReceivingEffectEventArgs))[0]),
@@ -95,11 +95,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Intensity))),
                     new(OpCodes.Starg_S, 1),
 
-                    // this._timeLeft = ev.Duration
+                    // this.Duration = ev.Duration
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Duration))),
-                    new(OpCodes.Stfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
+                    new(OpCodes.Callvirt, PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
                 });
 
             newInstructions[newInstructions.Count - 1].WithLabels(returnLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs b/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
deleted file mode 100644
index 2f81bec7c7..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp1576TransmissionEnded.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Player
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Player;
-    using HarmonyLib;
-    using InventorySystem.Items.Usables.Scp1576;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Scp1576Item.ServerStopTransmitting"/> to add <see cref="Handlers.Player.Scp1576TransmissionEnded"/> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.Scp1576TransmissionEnded))]
-    [HarmonyPatch(typeof(InventorySystem.Items.Usables.Scp1576.Scp1576Item), nameof(Scp1576Item.ServerStopTransmitting))]
-    public class Scp1576TransmissionEnded
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-                List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-                int index = newInstructions.Count - 1;
-
-                newInstructions.InsertRange(
-                    index,
-                    new[]
-                    {
-                        // Player.Get(base.Owner)
-                        new CodeInstruction(OpCodes.Ldarg_0),
-                        new CodeInstruction(OpCodes.Callvirt, PropertyGetter(typeof(Scp1576Item), nameof(Scp1576Item.Owner))),
-                        new CodeInstruction(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
-
-                        // this
-                        new CodeInstruction(OpCodes.Ldarg_0),
-
-                        // Scp1576TransmissionEndedEventArgs ev = new(Player, this)
-                        new CodeInstruction(OpCodes.Newobj, GetDeclaredConstructors(typeof(Scp1576TransmissionEndedEventArgs))[0]),
-
-                        // OnScp1576TransmissionEnded(ev)
-                        new CodeInstruction(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnScp1576TransmissionEnded))),
-                    });
-
-                for (int i = 0; i < newInstructions.Count; i++)
-                    yield return newInstructions[i];
-
-                ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs b/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
deleted file mode 100644
index d83af6e966..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="UsedItemByHolstering.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Player
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Player;
-    using HarmonyLib;
-    using InventorySystem.Items.Usables;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Consumable.OnHolstered" />.
-    /// Adds an alternative trigger of the <see cref="Handlers.Player.UsedItem" /> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.UsedItem))]
-    [HarmonyPatch(typeof(Consumable), nameof(Consumable.OnHolstered))]
-    public class UsedItemByHolstering
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            // after ServerRemoveSelf, which lines up with before the ret
-            newInstructions.InsertRange(newInstructions.Count - 1, new CodeInstruction[]
-            {
-                // this.Owner
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(Consumable), nameof(Consumable.Owner))),
-
-                // this (Consumable inherits UsableItem)
-                new(OpCodes.Ldarg_0),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // OnUsedItem(new UsedItemEventArgs(ReferenceHub, UsableItem, bool));
-                new(OpCodes.Newobj, Constructor(typeof(UsedItemEventArgs), new[] { typeof(ReferenceHub), typeof(UsableItem), typeof(bool) })),
-                new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnUsedItem))),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
index 680bbbf0dd..d2efcd3fd3 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
@@ -31,18 +31,17 @@ internal class Recontaining
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
+            int index = 0;
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             LocalBuilder ev = generator.DeclareLocal(typeof(RecontainingEventArgs));
 
             Label returnLabel = generator.DefineLabel();
 
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + 1;
-
-            newInstructions.InsertRange(index, new[]
+            newInstructions.InsertRange(index, new CodeInstruction[]
             {
                 // RecontainingEventArgs ev = new(this._activatorGlass)
-                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+                new(OpCodes.Ldarg_0),
                 new(OpCodes.Ldfld, Field(typeof(Scp079Recontainer), nameof(Scp079Recontainer._activatorGlass))),
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RecontainingEventArgs))[0]),
                 new(OpCodes.Stloc_S, ev.LocalIndex),
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
deleted file mode 100644
index dd942042fb..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FoundPosition.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Scp2536
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using Christmas.Scp2536;
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Scp2536;
-    using HarmonyLib;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Scp2536Controller.ServerFindTarget"/>
-    /// to add <see cref="Handlers.Scp2536.FoundPosition"/> event.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.FoundPosition))]
-    [HarmonyPatch(typeof(Scp2536Controller), nameof(Scp2536Controller.ServerFindTarget))]
-    public class FoundPosition
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label retLabel = generator.DefineLabel();
-
-            int index = newInstructions.Count - 1;
-
-            newInstructions[index].WithLabels(retLabel);
-
-            newInstructions.InsertRange(index, new CodeInstruction[]
-            {
-                // dupe the result (true / false if found)
-                new(OpCodes.Dup),
-
-                // return w result if failed
-                new(OpCodes.Brfalse_S, retLabel),
-                new(OpCodes.Pop),
-
-                // load ADDRESS of parameter "out Scp2536Spawnpoint spawnpoint" onto stack (so not actual value but address)
-                // this is used at end of transpiler
-                new(OpCodes.Ldarg_2),
-
-                // load address of parameter "out ReferenceHub target"
-                new(OpCodes.Ldarg_1),
-
-                // load value at address
-                new(OpCodes.Ldind_Ref),
-
-                // player = Player.Get(target);
-                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
-
-                // load address of parameter "out Scp2536Spawnpoint spawnpoint"
-                new(OpCodes.Ldarg_2),
-
-                // load value at address
-                new(OpCodes.Ldind_Ref),
-
-                // ev = new FoundPositionEventArgs(player, spawnpoint);
-                new(OpCodes.Newobj, Constructor(typeof(FoundPositionEventArgs), new[] { typeof(Player), typeof(Scp2536Spawnpoint) })),
-                new(OpCodes.Dup),
-                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnFoundPosition))),
-
-                // spawnpoint = ev.Spawnpoint;
-                new(OpCodes.Callvirt, PropertyGetter(typeof(FoundPositionEventArgs), nameof(FoundPositionEventArgs.Spawnpoint))),
-
-                // this uses the address already on stack (see 3rd comment) with the value from the event args
-                new(OpCodes.Stind_Ref),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
index 855523f1e3..9389addfa5 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
@@ -11,7 +11,6 @@ namespace Exiled.Events.Patches.Events.Scp2536
     using System.Reflection.Emit;
 
     using Christmas.Scp2536;
-    using Christmas.Scp2536.Gifts;
     using Exiled.API.Features;
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
@@ -35,7 +34,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label retLabel = generator.DefineLabel();
 
             LocalBuilder ev = generator.DeclareLocal(typeof(GrantingGiftEventArgs));
-            LocalBuilder naughty = generator.DeclareLocal(typeof(Naughty));
 
             int offset = -1;
             int index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp2536GiftBase), nameof(Scp2536GiftBase.ObtainedBy)))) + offset;
@@ -47,7 +45,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                 // gift
-                new(OpCodes.Ldloc_2),
+                new(OpCodes.Ldloc_1),
 
                 // true
                 new(OpCodes.Ldc_I4_1),
@@ -69,45 +67,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // gift = ev.Gift;
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
-                new(OpCodes.Stloc_2),
-            });
-
-            offset = 1;
-            index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(Scp2536GiftController), nameof(Scp2536GiftController.ServerGetGift), null, new[] { typeof(Naughty) }))) + offset;
-
-            newInstructions.InsertRange(index, new CodeInstruction[]
-            {
-                // naughty is already on the stack
-                // naughty = this.ServerGetGift<Naught>();
-                new(OpCodes.Stloc_S, naughty),
-
-                // Player.Get(hub);
-                new(OpCodes.Ldarg_1),
-                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
-
-                // naughty
-                new(OpCodes.Ldloc_S, naughty),
-
-                // true
-                new(OpCodes.Ldc_I4_1),
-
-                // GrantingGiftEventArgs ev = new(Player, Scp2536GiftBase, true);
-                new(OpCodes.Newobj, GetDeclaredConstructors(typeof(GrantingGiftEventArgs))[0]),
-                new(OpCodes.Dup),
-                new(OpCodes.Dup),
-                new(OpCodes.Stloc_S, ev.LocalIndex),
-
-                // Handlers.Scp2536.OnGrantingGift(ev);
-                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnGrantingGift))),
-
-                // if (!ev.IsAllowed)
-                //   goto retLabel;
-                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.IsAllowed))),
-                new(OpCodes.Brfalse_S, retLabel),
-
-                // load naughty onto stack
-                new(OpCodes.Ldloc_S, ev.LocalIndex),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
+                new(OpCodes.Stloc_1),
             });
 
             newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
index dcf788f079..1c0f3442e3 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
@@ -30,13 +30,9 @@ internal class Interacting
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Brfalse_S);
 
-            newInstructions.RemoveRange(index, 6);
-            newInstructions[index].opcode = OpCodes.Brtrue_S;
-            int offset = -2;
-
-            index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp559Cake), nameof(Scp559Cake._remainingSlices)))) + offset;
+            int offset = 1;
+            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ret) + offset;
 
             Label retLabel = generator.DefineLabel();
 
@@ -52,7 +48,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                    // InteractingScp559EventArgs ev = new(Scp559, Player);
+                    // true
+                    new(OpCodes.Ldc_I4_1),
+
+                    // InteractingScp559EventArgs ev = new(Scp559, Player, true);
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingScp559EventArgs))[0]),
                     new(OpCodes.Dup),
 
@@ -69,8 +68,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
index cd52be3cc0..8027c34ad9 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
@@ -76,8 +76,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
index defc59b9b6..c042b65f9e 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
@@ -14,7 +14,9 @@ namespace Exiled.Events.Patches.Events.Scp914
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp914;
+
     using global::Scp914;
+
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
@@ -37,8 +39,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = -3;
-            int index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914KnobChangingEventArgs))[0])) + offset;
+            int offset = 1;
+            int index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Stloc_1) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
@@ -73,7 +75,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             });
 
             offset = -3;
-            index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914ActivatingEventArgs))[0])) + offset;
+            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Newobj) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs b/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
deleted file mode 100644
index 6ea4a5ac08..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixEffectOrder.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Reflection.Emit;
-
-    using API.Features.Pools;
-    using CustomPlayerEffects;
-    using Exiled.API.Features;
-    using HarmonyLib;
-    using InventorySystem.Items.Usables.Scp330;
-    using PlayerRoles.PlayableScps.Scp049;
-
-    using static HarmonyLib.AccessTools;
-
-#pragma warning disable SA1402 // File may only contain a single type
-
-    /// <summary>
-    /// Patches <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
-    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
-    /// </summary>
-    [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState))]
-    internal class FixEffectOrder
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            // Find the setter call index
-            int offset = -2;
-            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity)))) + offset;
-
-            // Extract: ldarg.0, ldarg.1, call set_Intensity
-            List<CodeInstruction> intensityBlock = newInstructions.GetRange(intensityCallIndex, 3);
-
-            // Remove it from original location
-            newInstructions.RemoveRange(intensityCallIndex, 3);
-            newInstructions[intensityCallIndex].WithLabels(intensityBlock[0].ExtractLabels());
-
-            // Find ServerChangeDuration call
-            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
-
-            // Insert AFTER ServerChangeDuration
-            newInstructions.InsertRange(serverChangeIndex + 1, intensityBlock);
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-
-    /// <summary>
-    /// Patches Method that should use <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
-    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
-    /// </summary>
-    [HarmonyPatch]
-    internal class FixEffectOrder2
-    {
-        private static IEnumerable<MethodBase> TargetMethods()
-        {
-            yield return Method(typeof(CandyYellow), nameof(CandyYellow.ServerApplyEffects));
-            yield return Method(typeof(Scp049AttackAbility), nameof(Scp049AttackAbility.ServerProcessCmd));
-            yield return Method(typeof(SugarCrave), nameof(SugarCrave.Disabled));
-        }
-
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity))));
-
-            int offset = 6;
-            if (newInstructions[intensityCallIndex - offset].opcode == OpCodes.Dup)
-            {
-                // specific to Yellow candy that get it's Instance from a OpCodes.Dup
-                newInstructions.RemoveAt(intensityCallIndex);
-                newInstructions.RemoveAt(intensityCallIndex - offset);
-            }
-            else
-            {
-                newInstructions.RemoveRange(intensityCallIndex, 2);
-            }
-
-            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
-
-            newInstructions[serverChangeIndex] = new CodeInstruction(OpCodes.Callvirt, Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState)));
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs b/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
deleted file mode 100644
index 51dab211b3..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixMarshmallowManFF.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using CustomPlayerEffects;
-    using Exiled.API.Features;
-    using Exiled.API.Features.Pools;
-    using Footprinting;
-    using HarmonyLib;
-    using InventorySystem.Items.MarshmallowMan;
-    using InventorySystem.Items.Pickups;
-    using InventorySystem.Items.ThrowableProjectiles;
-    using Mirror;
-    using PlayerRoles;
-    using PlayerRoles.FirstPersonControl;
-    using PlayerStatsSystem;
-    using Respawning.NamingRules;
-    using Subtitles;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches the <see cref="MarshmallowItem.ServerAttack"/> delegate.
-    /// </summary>
-    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerAttack))]
-    internal class FixMarshmallowManFF : AttackerDamageHandler
-    {
-#pragma warning disable SA1600 // Elements should be documented
-        public FixMarshmallowManFF(MarshmallowItem marshmallowItem, bool isEvilMode)
-        {
-            MarshmallowItem = marshmallowItem;
-            Attacker = new(marshmallowItem.Owner);
-            Damage = marshmallowItem._attackDamage;
-            ForceFullFriendlyFire = isEvilMode;
-        }
-
-        public MarshmallowItem MarshmallowItem { get; set; }
-
-        public override Footprint Attacker { get; set; }
-
-        public override bool AllowSelfDamage { get; } = false;
-
-        public override float Damage { get; set; }
-
-        public override string RagdollInspectText { get; } = DeathTranslations.MarshmallowMan.RagdollTranslation;
-
-        public override CassieAnnouncement CassieDeathAnnouncement { get; } = new()
-        {
-            Announcement = "TERMINATED BY MARSHMALLOW MAN",
-            SubtitleParts =
-            [
-                new SubtitlePart(SubtitleType.TerminatedByMarshmallowMan, null),
-            ],
-        };
-
-        public override string DeathScreenText { get; } = DeathTranslations.MarshmallowMan.DeathscreenTranslation;
-
-        public override string ServerLogsText => "Stabbed with Marshmallow Item by " + Attacker.Nickname;
-#pragma warning restore SA1600 // Elements should be documented
-#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
-
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int index = newInstructions.FindIndex(instruction => instruction.Calls(PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.NewDamageHandler))));
-
-            // replace the getter for NewDamageHandler with ctor of FixMarshmallowManFF
-            newInstructions.RemoveAt(index);
-            newInstructions.InsertRange(index, new List<CodeInstruction>
-            {
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.EvilMode))),
-                new(OpCodes.Newobj, Constructor(typeof(FixMarshmallowManFF), new[] { typeof(MarshmallowItem), typeof(bool) })),
-            });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs b/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
deleted file mode 100644
index fde6bfd51a..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixNWFlashbangDuration.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using CustomPlayerEffects;
-    using Exiled.API.Features.Items;
-    using Exiled.Events.EventArgs.Player;
-    using HarmonyLib;
-    using InventorySystem;
-
-    /// <summary>
-    /// Patches <see cref="Flashed.IntensityChanged"/> to fix NW overwritting value multiple time.
-    /// </summary>
-    [HarmonyPatch(typeof(Flashed), nameof(Flashed.IntensityChanged))]
-    internal class FixNWFlashbangDuration
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-        {
-            yield return new CodeInstruction(OpCodes.Ret);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs b/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
deleted file mode 100644
index c40037f4b9..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="FixScp1507DestroyingDoor.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using API.Features.Pools;
-    using Footprinting;
-    using HarmonyLib;
-    using Interactables.Interobjects.DoorUtils;
-    using PlayerRoles.PlayableScps.Scp1507;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="Scp1507AttackAbility.TryAttackDoor()"/> delegate.
-    /// Fix than NW don't set the footprint argument <see cref="IDamageableDoor.ServerDamage(float, DoorDamageType, Footprint)"/>.
-    /// </summary>
-    [HarmonyPatch(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.TryAttackDoor))]
-    internal class FixScp1507DestroyingDoor
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int offset = -1;
-            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Initobj) + offset;
-
-            newInstructions.RemoveRange(index, 3);
-
-            newInstructions.InsertRange(
-                index,
-                new CodeInstruction[]
-                {
-                    new(OpCodes.Ldarg_0),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.Owner))),
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(Footprint))[0]),
-                });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
index 17bdf5e142..1f6a8ee431 100644
--- a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
+++ b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
@@ -22,7 +22,7 @@ namespace Exiled.Events.Patches.Fixes
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem)" />.
+    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem, JailbirdHitreg)" />.
     /// Bug reported to NW (https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/88).
     /// </summary>
     [HarmonyPatch(typeof(JailbirdDeteriorationTracker), nameof(JailbirdDeteriorationTracker.Setup))]
diff --git a/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs b/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
new file mode 100644
index 0000000000..46151c7577
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
@@ -0,0 +1,61 @@
+// -----------------------------------------------------------------------
+// <copyright file="JailbirdHitRegFix.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using API.Features.Pools;
+
+    using HarmonyLib;
+    using InventorySystem.Items.Jailbird;
+    using Mirror;
+    using Utils.Networking;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="JailbirdHitreg.ServerAttack(bool, NetworkReader)" />.
+    /// </summary>
+    [HarmonyPatch(typeof(JailbirdHitreg), nameof(JailbirdHitreg.ServerAttack))]
+    internal static class JailbirdHitRegFix
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(ReferenceHubReaderWriter), nameof(ReferenceHubReaderWriter.TryReadReferenceHub)))) - 2;
+
+            int breakIndex = newInstructions.FindIndex(i => i.Calls(Method(typeof(JailbirdHitreg), nameof(JailbirdHitreg.DetectDestructibles)))) - 1;
+            Label breakLabel = generator.DefineLabel();
+            newInstructions[breakIndex].WithLabels(breakLabel);
+
+            List<Label> loopBeginingLabels = newInstructions[index].ExtractLabels();
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // reader.Remaining
+                new CodeInstruction(OpCodes.Ldarg_2),
+                new CodeInstruction(OpCodes.Call, PropertyGetter(typeof(NetworkReader), nameof(NetworkReader.Remaining))),
+
+                // if (reader.Remaining == 0)
+                //     break;
+                new CodeInstruction(OpCodes.Ldc_I4_0),
+                new CodeInstruction(OpCodes.Ceq),
+                new CodeInstruction(OpCodes.Brtrue, breakLabel),
+            });
+
+            newInstructions[index].WithLabels(loopBeginingLabels);
+
+            foreach (CodeInstruction instruction in newInstructions)
+                yield return instruction;
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
index 574c0d856a..bafb4a2847 100644
--- a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
+++ b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
@@ -16,7 +16,6 @@ namespace Exiled.Events.Patches.Generic
 
     using API.Features;
     using API.Features.Pools;
-    using Exiled.API.Features.Items;
 
     using Footprinting;
 
@@ -126,12 +125,6 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref
                     return true;
                 }
 
-                if (victim.CurrentItem is Marshmallow { Evil: true })
-                {
-                    Log.Debug("CheckFriendlyFirePlayerRules, NW Fix victim not getting hit");
-                    return true;
-                }
-
                 Log.Debug($"CheckFriendlyFirePlayerRules, Attacker role {attacker.Role} and Victim {victim.Role}");
 
                 // Check victim's UniqueRole for custom FF multiplier
diff --git a/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs b/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
deleted file mode 100644
index c98d2d57c2..0000000000
--- a/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="Scp127MaxHs.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Generic
-{
-    using Exiled.API.Features.Items;
-    using HarmonyLib;
-    using InventorySystem.Items.Firearms.Modules.Scp127;
-
-#pragma warning disable SA1313
-    /// <summary>
-    /// Patches <see cref="Scp127HumeModule.HsMax"/> to implement <see cref="Scp127.HsMax"/> setter.
-    /// </summary>
-    [HarmonyPatch(typeof(Scp127HumeModule), nameof(Scp127HumeModule.HsMax), MethodType.Getter)]
-    internal class Scp127MaxHs
-    {
-        private static void Postfix(Scp127HumeModule __instance, ref float __result)
-        {
-            Scp127 item = Item.Get<Scp127>(__instance.ItemSerial);
-
-            if (item == null || !item.CustomHsMax.HasValue)
-                return;
-
-            __result = item.CustomHsMax.Value;
-            return;
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Installer/Program.cs b/EXILED/Exiled.Installer/Program.cs
index 6ea75b0df0..1924fc369d 100644
--- a/EXILED/Exiled.Installer/Program.cs
+++ b/EXILED/Exiled.Installer/Program.cs
@@ -172,7 +172,7 @@ private static async Task<IEnumerable<Release>> GetReleases()
                     r => Version.TryParse(r.TagName, out Version version)
                          && version > VersionLimit);
 
-            return releases.OrderByDescending(r => r.PublishedAt);
+            return releases.OrderByDescending(r => r.CreatedAt.Ticks);
         }
 
         private static string FormatRelease(Release r)
diff --git a/EXILED/Exiled.Loader/AutoUpdateFiles.cs b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
index 3ad56c5c95..a4e454cb3a 100644
--- a/EXILED/Exiled.Loader/AutoUpdateFiles.cs
+++ b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
@@ -17,6 +17,6 @@ public static class AutoUpdateFiles
         /// <summary>
         /// Gets which SCP: SL version generated Exiled.
         /// </summary>
-        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 4);
+        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 1);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Loader/ConfigManager.cs b/EXILED/Exiled.Loader/ConfigManager.cs
index 706924ee45..f04835e61c 100644
--- a/EXILED/Exiled.Loader/ConfigManager.cs
+++ b/EXILED/Exiled.Loader/ConfigManager.cs
@@ -446,10 +446,7 @@ public static bool LoadLabAPIProperties(LabPlugin plugin)
             ISerializer serializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Serializer;
             IDeserializer deserializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Deserializer;
 
-            string directory = Path.Combine(Paths.IndividualConfigs, plugin.Name);
-            string configPath = Path.Combine(directory, $"{Server.Port}-properties.yml");
-
-            Directory.CreateDirectory(directory);
+            string configPath = Path.Combine(Paths.IndividualConfigs, plugin.Name, $"{Server.Port}-properties.yml");
 
             if (!File.Exists(configPath))
             {
diff --git a/EXILED/Exiled.Loader/Loader.cs b/EXILED/Exiled.Loader/Loader.cs
index 1a30436669..b8a8883fa3 100644
--- a/EXILED/Exiled.Loader/Loader.cs
+++ b/EXILED/Exiled.Loader/Loader.cs
@@ -635,10 +635,7 @@ private static void LoadPluginsFromDirectory(string dir = null)
                     continue;
 
                 if (PluginLoader.EnabledPlugins.Any(p => p.Name == plugin.Name) || Plugins.Any(p => p.Name == plugin.Name) || LabAPIPlugins.Keys.Any(p => p.Name == plugin.Name))
-                {
-                    Log.Info("Skipping loading duplicate LabAPI plugin " + plugin.Name);
                     continue;
-                }
 
                 Log.Info("Successfully loaded LabAPI plugin " + plugin.Name);
                 LabAPIPlugins.Add(plugin, attempt);
diff --git a/EXILED/Exiled.Loader/Updater.cs b/EXILED/Exiled.Loader/Updater.cs
index a2a3863597..672c17063a 100644
--- a/EXILED/Exiled.Loader/Updater.cs
+++ b/EXILED/Exiled.Loader/Updater.cs
@@ -229,7 +229,7 @@ private void Update(HttpClient client, NewVersion newVersion)
                     FileName = installerPath,
                     UseShellExecute = false,
                     CreateNoWindow = true,
-                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{Path.Combine(config.ExiledDirectoryPath, "..")}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
+                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{config.ExiledDirectoryPath}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     StandardErrorEncoding = ProcessEncoding,
diff --git a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
index faeda9462e..f797797370 100644
--- a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
+++ b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
@@ -17,7 +17,7 @@
 title: NW Documentation
 ---
 
-Last Update (14.2.0.4)
+Last Update (14.2.0.1)
 
 ### Index
 
@@ -56,7 +56,6 @@ Last Update (14.2.0.4)
 - [CallType](#calltype)
 - [CandyKindID](#candykindid)
 - [CassieAnnouncementType](#cassieannouncementtype)
-- [CassieClipCategory](#cassieclipcategory)
 - [Category](#category)
 - [CentralAuthPreauthFlags](#centralauthpreauthflags)
 - [ChallengeState](#challengestate)
@@ -90,6 +89,7 @@ Last Update (14.2.0.4)
 - [DecalPoolType](#decalpooltype)
 - [DecontaminationStatus](#decontaminationstatus)
 - [DeliveryMethod](#deliverymethod)
+- [DetectionStatus](#detectionstatus)
 - [DiodeType](#diodetype)
 - [DisconnectReason](#disconnectreason)
 - [DisconnectResult](#disconnectresult)
@@ -206,7 +206,6 @@ Last Update (14.2.0.4)
 - [NatAddressType](#nataddresstype)
 - [NetLogLevel](#netloglevel)
 - [NetworkProtocolType](#networkprotocoltype)
-- [NextAction](#nextaction)
 - [NextRoundAction](#nextroundaction)
 - [NotificationSound](#notificationsound)
 - [NtpLeapIndicator](#ntpleapindicator)
@@ -221,7 +220,6 @@ Last Update (14.2.0.4)
 - [OtherAudioSetting](#otheraudiosetting)
 - [OtherCondition](#othercondition)
 - [OutputCodes](#outputcodes)
-- [OverwatchSettings](#overwatchsettings)
 - [PacketProperty](#packetproperty)
 - [PanelColliderId](#panelcolliderid)
 - [ParameterMixingMode](#parametermixingmode)
@@ -319,7 +317,6 @@ Last Update (14.2.0.4)
 - [SteamLobbyPrivacy](#steamlobbyprivacy)
 - [StorageLocation](#storagelocation)
 - [StructureType](#structuretype)
-- [SubtitleMode](#subtitlemode)
 - [SubtitleType](#subtitletype)
 - [SyncData](#syncdata)
 - [SyncDataFlags](#syncdataflags)
@@ -961,18 +958,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### CassieClipCategory
-
-<details><summary><b>Cassie.CassieClipCategory</b></summary>
-
-```
- [0] = Word
- [1] = Glitch
- [2] = Other
-```
-
-</details>
-
 ### Category
 
 <details><summary><b>PlayerRoles.PlayableScps.Scp079.Scp079KeyAbilityBase+Category</b></summary>
@@ -1466,6 +1451,18 @@ Last Update (14.2.0.4)
 
 </details>
 
+### DetectionStatus
+
+<details><summary><b>InventorySystem.Items.Firearms.Modules.Scp127.Scp127CassieBasedVoiceTriggerBase+DetectionStatus</b></summary>
+
+```
+ [0] = Idle
+ [1] = WaitingForTrigger
+ [2] = AnnouncementStartedPlaying
+```
+
+</details>
+
 ### DiodeType
 
 <details><summary><b>AlphaWarheadNukesitePanel+DiodeType</b></summary>
@@ -2415,7 +2412,7 @@ Last Update (14.2.0.4)
 
 ### HitResult
 
-<details><summary><b>InventorySystem.Items.Autosync.MeleeAutoSync+HitResult</b></summary>
+<details><summary><b>InventorySystem.Items.Scp1509.Scp1509Hitreg+HitResult</b></summary>
 
 ```
  [0] = HitPlayer
@@ -2772,7 +2769,6 @@ Last Update (14.2.0.4)
  [66] = KeycardCustomMetalCase
  [67] = MarshmallowItem
  [68] = SCP1509
- [69] = Scp021J
  [-1] = None
 ```
 
@@ -3298,17 +3294,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### NextAction
-
-<details><summary><b>Cassie.Interpreters.CassieInterpreter+NextAction</b></summary>
-
-```
- [0] = Continue
- [1] = Halt
-```
-
-</details>
-
 ### NextRoundAction
 
 <details><summary><b>ServerStatic+NextRoundAction</b></summary>
@@ -3515,18 +3500,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### OverwatchSettings
-
-<details><summary><b>PlayerRoles.Spectating.OverwatchSettings</b></summary>
-
-```
- [0] = PlayerInfoToggle
- [1] = HitRegisterToggle
- [2] = DebugLines
-```
-
-</details>
-
 ### PacketProperty
 
 <details><summary><b>LiteNetLib.PacketProperty</b></summary>
@@ -4081,8 +4054,6 @@ Last Update (14.2.0.4)
  [25] = Flamingo
  [26] = AlphaFlamingo
  [27] = ZombieFlamingo
- [28] = NtfFlamingo
- [29] = ChaosFlamingo
  [-1] = None
 ```
 
@@ -4146,7 +4117,6 @@ Last Update (14.2.0.4)
  [38] = Hcz127
  [39] = HczAcroamaticAbatement
  [40] = HczWaysideIncinerator
- [41] = HczRampTunnel
 ```
 
 </details>
@@ -4211,9 +4181,7 @@ Last Update (14.2.0.4)
  [0] = TargetResync
  [1] = TargetKilled
  [2] = AttackInterrupted
- [3] = AttackCancelled
- [4] = OutOfRange
- [5] = StrangleTimer
+ [3] = OutOfRange
 ```
 
 </details>
@@ -5232,19 +5200,6 @@ Last Update (14.2.0.4)
 
 </details>
 
-### SubtitleMode
-
-<details><summary><b>Cassie.CassieTtsPayload+SubtitleMode</b></summary>
-
-```
- [0] = None
- [1] = Automatic
- [2] = Custom
- [3] = FromTranslation
-```
-
-</details>
-
 ### SubtitleType
 
 <details><summary><b>Subtitles.SubtitleType</b></summary>
@@ -5479,7 +5434,6 @@ Last Update (14.2.0.4)
  [8] = Tokens
  [11] = All
  [16] = Spawn
- [32] = Max
 ```
 
 </details>
@@ -5544,8 +5498,6 @@ Last Update (14.2.0.4)
  [3] = Two
  [4] = Three
  [5] = Four
- [6] = Five
- [7] = Six
 ```
 
 </details>
@@ -5724,7 +5676,6 @@ Last Update (14.2.0.4)
  [5] = Scp127Voice
  [6] = Scp3114Voice
  [7] = ChaseThemes
- [8] = SoundEffectsWhileSpectating
 ```
 
 </details>
@@ -5833,11 +5784,9 @@ Last Update (14.2.0.4)
 | 22  | Filmmaker      | Dead             | None             | Draw            |
 | 23  | Scp3114        | SCPs             | Scp              | Anomalies       |
 | 24  | Destroyed      | Dead             | None             | Draw            |
-| 25  | Flamingo       | Flamingos        | Flamingos        | Flamingo        |
-| 26  | AlphaFlamingo  | Flamingos        | Flamingos        | Flamingo        |
-| 27  | ZombieFlamingo | SCPs             | Scp              | Anomalies       |
-| 28  | NtfFlamingo    | FoundationForces | Mtf              | FacilityForces  |
-| 29  | ChaosFlamingo  | ChaosInsurgency  | ChaosInsurgency  | ChaosInsurgency |
+| 25  | Flamingo       | Dead             | None             | Draw            |
+| 26  | AlphaFlamingo  | Dead             | None             | Draw            |
+| 27  | ZombieFlamingo | Dead             | None             | Draw            |
 ```
 
 </details>
@@ -5848,7 +5797,7 @@ Last Update (14.2.0.4)
 
 <details><summary> <b>Damage Handlers</b></summary>
 
-```md title="Latest Updated: 14.2.0.4"
+```md title="Latest Updated: 14.2.0.1"
 All available DamageHandlers
 
 + Symbol ':' literally means "inherits from"

From 6d5d52c164a83c62ef196df40e648a3447a2aab4 Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Mon, 5 Jan 2026 13:42:55 -0500
Subject: [PATCH 06/10] Reapply "Merge branch 'dev' into fake-role-API"

This reverts commit e13aaaa907e8f776af5eb36c51e5e93a7cbdc21f.
---
 EXILED/EXILED.props                           |   2 +-
 EXILED/Exiled.API/Enums/CameraType.cs         |   5 +
 EXILED/Exiled.API/Enums/DoorType.cs           |   5 +
 EXILED/Exiled.API/Enums/EffectType.cs         |  57 ++--
 EXILED/Exiled.API/Enums/GlassType.cs          |   5 +
 EXILED/Exiled.API/Enums/PrefabType.cs         |  42 +++
 EXILED/Exiled.API/Enums/ProjectileType.cs     |   6 +-
 EXILED/Exiled.API/Enums/RoomType.cs           |   5 +
 EXILED/Exiled.API/Enums/Side.cs               |   5 +
 EXILED/Exiled.API/Exiled.API.csproj           |   1 +
 .../Extensions/DamageTypeExtensions.cs        |   7 +
 .../Extensions/EffectTypeExtension.cs         |   3 +
 .../Exiled.API/Extensions/MirrorExtensions.cs |  33 +--
 .../Exiled.API/Extensions/RoleExtensions.cs   |   9 +-
 EXILED/Exiled.API/Features/Camera.cs          |   5 +
 EXILED/Exiled.API/Features/Cassie.cs          | 116 +++++---
 .../DamageHandlers/CustomDamageHandler.cs     |  12 +-
 .../DamageHandlers/DamageHandlerBase.cs       |   7 +
 EXILED/Exiled.API/Features/Doors/Door.cs      |   1 +
 EXILED/Exiled.API/Features/Effect.cs          |   2 +-
 .../Features/Items/FirearmModules/Magazine.cs |   9 +-
 .../FirearmModules/Primary/Scp127Magazine.cs  |  80 +++++
 EXILED/Exiled.API/Features/Items/Item.cs      |  15 +-
 EXILED/Exiled.API/Features/Items/Jailbird.cs  |  26 +-
 .../Features/Items/Keycards/ChaosKeycard.cs   |   3 +-
 .../Exiled.API/Features/Items/Marshmallow.cs  | 102 +++++++
 EXILED/Exiled.API/Features/Items/Scp127.cs    | 274 ++++++++++++++++++
 EXILED/Exiled.API/Features/Lift.cs            |   7 +
 .../Features/Pickups/JailbirdPickup.cs        |  10 +-
 .../Features/Pickups/Scp1509Pickup.cs         |   2 +-
 EXILED/Exiled.API/Features/Player.cs          |  54 +++-
 EXILED/Exiled.API/Features/Recontainer.cs     |  16 +-
 EXILED/Exiled.API/Features/Roles/FpcRole.cs   |  24 ++
 .../Exiled.API/Features/Roles/Scp049Role.cs   |   3 +-
 .../Exiled.API/Features/Roles/Scp096Role.cs   |  18 +-
 .../Exiled.API/Features/Roles/Scp1507Role.cs  |   2 +-
 EXILED/Exiled.API/Features/Room.cs            |   1 +
 EXILED/Exiled.API/Features/Scp559.cs          |  24 +-
 EXILED/Exiled.API/Features/Server.cs          |  22 +-
 EXILED/Exiled.API/Features/Waves/TimedWave.cs |   4 +-
 EXILED/Exiled.API/Features/Window.cs          |   1 +
 .../API/Features/CustomItem.cs                |   9 -
 .../API/Features/CustomRole.cs                |   6 +
 EXILED/Exiled.CustomRoles/Commands/Get.cs     | 123 ++++++++
 EXILED/Exiled.CustomRoles/Commands/Give.cs    |   2 +-
 EXILED/Exiled.CustomRoles/Commands/Parent.cs  |   3 +-
 .../Exiled.CustomRoles.csproj                 |   2 +-
 EXILED/Exiled.Events/Commands/TpsCommand.cs   |   5 +-
 .../Cassie/SendingCassieMessageEventArgs.cs   | 144 +++++++--
 .../EventArgs/Interfaces/IMarshmallowEvent.cs |  22 ++
 .../EventArgs/Interfaces/IScp127Event.cs      |  20 ++
 .../EventArgs/Interfaces/IScp1507Event.cs     |   2 +-
 .../EventArgs/Interfaces/IScp559Event.cs      |   2 +-
 .../EventArgs/Item/CacklingEventArgs.cs       |  50 ++++
 .../EventArgs/Item/PunchingEventArgs.cs       |  50 ++++
 .../Map/AnnouncingScpTerminationEventArgs.cs  |  18 +-
 .../Player/ReceivingEffectEventArgs.cs        |  21 +-
 .../Scp1576TransmissionEndedEventArgs.cs      |  41 +++
 .../EventArgs/Player/UsedItemEventArgs.cs     |  14 +-
 .../Scp127/GainedExperienceEventArgs.cs       |  51 ++++
 .../Scp127/GainingExperienceEventArgs.cs      |  59 ++++
 .../EventArgs/Scp127/TalkedEventArgs.cs       |  52 ++++
 .../EventArgs/Scp127/TalkingEventArgs.cs      |  57 ++++
 .../Scp1507/AttackingDoorEventArgs.cs         |   2 +-
 .../EventArgs/Scp1507/ScreamingEventArgs.cs   |   2 +-
 .../Scp1507/SpawningFlamingosEventArgs.cs     |   2 +-
 .../EventArgs/Scp1507/UsingTapeEventArgs.cs   |   2 +-
 .../Scp2536/FoundPositionEventArgs.cs         |  40 +++
 .../Scp559/InteractingScp559EventArgs.cs      |   7 +-
 .../EventArgs/Scp559/SpawningEventArgs.cs     |   2 +-
 EXILED/Exiled.Events/Events.cs                |  12 +
 .../Exiled.Events/Handlers/Internal/Round.cs  |  13 +-
 EXILED/Exiled.Events/Handlers/Item.cs         |  22 ++
 EXILED/Exiled.Events/Handlers/Player.cs       |  11 +
 EXILED/Exiled.Events/Handlers/Scp127.cs       |  81 ++++++
 EXILED/Exiled.Events/Handlers/Scp1507.cs      |   2 +-
 EXILED/Exiled.Events/Handlers/Scp2536.cs      |  11 +
 EXILED/Exiled.Events/Handlers/Scp559.cs       |   2 +-
 .../Events/Cassie/SendingCassieMessage.cs     |  54 +---
 .../Patches/Events/Item/Cackling.cs           |  65 +++++
 .../Patches/Events/Item/Punching.cs           |  65 +++++
 .../Events/Map/AnnouncingChaosEntrance.cs     |  11 +-
 .../Events/Map/AnnouncingNtfEntrance.cs       |  25 +-
 .../Events/Map/AnnouncingNtfMiniEntrance.cs   |  12 +-
 .../Events/Map/AnnouncingScpTermination.cs    | 108 ++++---
 .../Events/Map/AnnouncingTeamEntrance.cs      |  68 -----
 .../Events/Map/SpawningRoomConnector.cs       |  13 +-
 .../Patches/Events/Player/Landing.cs          |  16 +-
 .../Events/Player/ReceivingStatusEffect.cs    |  12 +-
 .../Events/Player/Scp1576TransmissionEnded.cs |  59 ++++
 .../Events/Player/UsedItemByHolstering.cs     |  58 ++++
 .../Patches/Events/Scp079/Recontaining.cs     |   7 +-
 .../Patches/Events/Scp2536/FoundPosition.cs   |  86 ++++++
 .../Patches/Events/Scp2536/GrantingGift.cs    |  44 ++-
 .../Patches/Events/Scp559/Interacting.cs      |  15 +-
 .../Patches/Events/Scp559/Spawning.cs         |   2 +
 .../Events/Scp914/InteractingEvents.cs        |   8 +-
 .../Patches/Fixes/FixEffectOrder.cs           | 101 +++++++
 .../Patches/Fixes/FixMarshmallowManFF.cs      |  91 ++++++
 .../Patches/Fixes/FixNWFlashbangDuration.cs   |  30 ++
 .../Patches/Fixes/FixScp1507DestroyingDoor.cs |  52 ++++
 .../Patches/Fixes/Jailbird914CoarseFix.cs     |   2 +-
 .../Patches/Fixes/JailbirdHitRegFix.cs        |  61 ----
 .../Patches/Generic/IndividualFriendlyFire.cs |   7 +
 .../Patches/Generic/Scp127MaxHs.cs            |  32 ++
 EXILED/Exiled.Installer/Program.cs            |   2 +-
 EXILED/Exiled.Loader/AutoUpdateFiles.cs       |   2 +-
 EXILED/Exiled.Loader/ConfigManager.cs         |   5 +-
 EXILED/Exiled.Loader/Loader.cs                |   3 +
 EXILED/Exiled.Loader/Updater.cs               |   2 +-
 .../SCPSLRessources/NW_Documentation.md       |  91 ++++--
 111 files changed, 2675 insertions(+), 523 deletions(-)
 create mode 100644 EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
 create mode 100644 EXILED/Exiled.API/Features/Items/Marshmallow.cs
 create mode 100644 EXILED/Exiled.API/Features/Items/Scp127.cs
 create mode 100644 EXILED/Exiled.CustomRoles/Commands/Get.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
 create mode 100644 EXILED/Exiled.Events/Handlers/Scp127.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
 delete mode 100644 EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
 create mode 100644 EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs

diff --git a/EXILED/EXILED.props b/EXILED/EXILED.props
index f67ef6f8da..edc17d4fb2 100644
--- a/EXILED/EXILED.props
+++ b/EXILED/EXILED.props
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">9.10.1</Version>
+    <Version Condition="$(Version) == ''">9.12.2</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 
diff --git a/EXILED/Exiled.API/Enums/CameraType.cs b/EXILED/Exiled.API/Enums/CameraType.cs
index 535e7366ce..292da90b2d 100644
--- a/EXILED/Exiled.API/Enums/CameraType.cs
+++ b/EXILED/Exiled.API/Enums/CameraType.cs
@@ -159,6 +159,11 @@ public enum CameraType
         EzGateAElevators,
         EzGateBInterior,
         EzGateBSide,
+        EzGateAStairwell,
+        EzGateAUpper,
+        HczLoadingBay,
+        HczLoadingBayRamp,
+        HczLoadingBayStairwell,
         #endregion
     }
 }
diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs
index 87e0de99a5..5863d6e79a 100644
--- a/EXILED/Exiled.API/Enums/DoorType.cs
+++ b/EXILED/Exiled.API/Enums/DoorType.cs
@@ -369,5 +369,10 @@ public enum DoorType
         /// Represents the door in the <see cref="RoomType.EzGateA"/> Armory.
         /// </summary>
         GateAArmory,
+
+        /// <summary>
+        /// Represents the door in <see cref="RoomType.HczLoadingBay"/>.
+        /// </summary>
+        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/EffectType.cs b/EXILED/Exiled.API/Enums/EffectType.cs
index e70e273e77..9bed0519c9 100644
--- a/EXILED/Exiled.API/Enums/EffectType.cs
+++ b/EXILED/Exiled.API/Enums/EffectType.cs
@@ -216,7 +216,7 @@ public enum EffectType
         /// <summary>
         /// Makes you a marshmallow guy.
         /// </summary>
-        [Obsolete("Not functional in-game")]
+        // [Obsolete("Not functional in-game")]
         Marshmallow,
 
         /// <summary>
@@ -261,27 +261,27 @@ public enum EffectType
         Blurred,
 
         /// <summary>
-        /// Makes you a flamingo.
+        /// Makes you a flamingo <see cref="CustomPlayerEffects.BecomingFlamingo"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         BecomingFlamingo,
 
         /// <summary>
-        /// Makes you a Child after eating Cake.
+        /// Makes you a Child after eating Cake <see cref="Scp559Effect"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp559,
 
         /// <summary>
-        /// Scp956 found you.
+        /// Scp956 found you <see cref="global::Scp956Target"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp956Target,
 
         /// <summary>
-        /// you are snowed.
+        /// you are snowed <see cref="global::Snowed"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Snowed,
 
         /// <summary>
@@ -317,78 +317,93 @@ public enum EffectType
         /// <summary>
         /// <see cref="CustomPlayerEffects.Metal"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         Metal,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeCandy"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         OrangeCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.OrangeWitness"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         OrangeWitness,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Prismatic"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         Prismatic,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SlowMetabolism"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         SlowMetabolism,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Spicy"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         Spicy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarCrave"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        // [Obsolete("Only availaible for Halloween or Christmas.")]
         SugarCrave,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarHigh"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         SugarHigh,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.SugarRush"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         SugarRush,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TemporaryBypass"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         TemporaryBypass,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.TraumatizedByEvil"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         TraumatizedByEvil,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.WhiteCandy"/>.
         /// </summary>
-        // [Obsolete("Only availaible for Halloween.")]
+        [Obsolete("Only availaible for Halloween.")]
         WhiteCandy,
 
         /// <summary>
         /// <see cref="CustomPlayerEffects.Scp1509Resurrected"/>.
         /// </summary>
         Scp1509Resurrected,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.FocusedVision"/>.
+        /// </summary>
+        FocusedVision,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.AnomalousRegeneration"/>.
+        /// </summary>
+        AnomalousRegeneration,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.AnomalousTarget"/>.
+        /// </summary>
+        AnomalousTarget,
     }
 }
diff --git a/EXILED/Exiled.API/Enums/GlassType.cs b/EXILED/Exiled.API/Enums/GlassType.cs
index 85c068108f..fef4d59f44 100644
--- a/EXILED/Exiled.API/Enums/GlassType.cs
+++ b/EXILED/Exiled.API/Enums/GlassType.cs
@@ -84,5 +84,10 @@ public enum GlassType
         /// Represents the window in <see cref="RoomType.EzGateA"/>.
         /// </summary>
         GateAArmory,
+
+        /// <summary>
+        /// Represents the window in <see cref="RoomType.HczLoadingBay"/>
+        /// </summary>
+        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/PrefabType.cs b/EXILED/Exiled.API/Enums/PrefabType.cs
index 6a52ce7995..43936f1d80 100644
--- a/EXILED/Exiled.API/Enums/PrefabType.cs
+++ b/EXILED/Exiled.API/Enums/PrefabType.cs
@@ -417,5 +417,47 @@ public enum PrefabType
 
         [Prefab(213466224, "SCP-939 Ragdoll Halloween")]
         Scp939RagdollHalloween,
+
+        [Prefab(689741320, "SCP-559 Cake")]
+        Scp559Cake,
+
+        [Prefab(2657863153, "SCP-956")]
+        Scp956,
+
+        [Prefab(1205960739, "SCP-2536 Tree")]
+        Scp2536,
+
+        [Prefab(2102014206, "Snowpile")]
+        Snowpile,
+
+        [Prefab(3401975113, "Scp018Projectile Christmas")]
+        Scp018ProjectileChristmas,
+
+        [Prefab(3223468476, "SnowballProjectile")]
+        SnowballProjectile,
+
+        [Prefab(296717882, "CoalPickup")]
+        CoalPickup,
+
+        [Prefab(409273101, "TapePlayerPickup")]
+        Scp1507TapePickup,
+
+        [Prefab(3971391978, "Scp021JPickup")]
+        Scp021JPickup,
+
+        [Prefab(142820664, "CoalProjectile")]
+        CoalProjectile,
+
+        [Prefab(2405470903, "Scp2536Projectile")]
+        Scp2536Projectile,
+
+        [Prefab(1496232901, "SCP-173 Ragdoll Variant")]
+        Scp173RagdollChristmas,
+
+        [Prefab(6069361, "SnowPoop - TantrumObj")]
+        SnowTantrum,
+
+        [Prefab(3654754970, "SCP-1507 Ragdoll")]
+        Scp1507Ragdoll,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/ProjectileType.cs b/EXILED/Exiled.API/Enums/ProjectileType.cs
index a8072ed48e..2d95210924 100644
--- a/EXILED/Exiled.API/Enums/ProjectileType.cs
+++ b/EXILED/Exiled.API/Enums/ProjectileType.cs
@@ -51,21 +51,21 @@ public enum ProjectileType
         /// Coal.
         /// Used by <see cref="ItemType.Coal"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         Coal,
 
         /// <summary>
         /// SpecialCoal.
         /// Used by <see cref="ItemType.SpecialCoal"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas and AprilFools.")]
+        // [Obsolete("Only availaible for Christmas and AprilFools.")]
         SpecialCoal,
 
         /// <summary>
         /// Snowball.
         /// Used by <see cref="ItemType.Snowball"/>.
         /// </summary>
-        [Obsolete("Only availaible for Christmas.")]
+        // [Obsolete("Only availaible for Christmas.")]
         Snowball,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/RoomType.cs b/EXILED/Exiled.API/Enums/RoomType.cs
index 0b7737c193..6dceeea6e2 100644
--- a/EXILED/Exiled.API/Enums/RoomType.cs
+++ b/EXILED/Exiled.API/Enums/RoomType.cs
@@ -353,5 +353,10 @@ public enum RoomType
         /// Heavy Containment Zone's straight hall room with lava.
         /// </summary>
         HczDss12 = HczIncineratorWayside,
+
+        /// <summary>
+        /// Heavy Containment Zone's T-intersection with a ramp in it.
+        /// </summary>
+        HczLoadingBay,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Enums/Side.cs b/EXILED/Exiled.API/Enums/Side.cs
index 5e9c063be7..5accace2f3 100644
--- a/EXILED/Exiled.API/Enums/Side.cs
+++ b/EXILED/Exiled.API/Enums/Side.cs
@@ -52,5 +52,10 @@ public enum Side
         /// No team. Same as <see cref="Team.Dead"/>.
         /// </summary>
         None,
+
+        /// <summary>
+        /// Contains <see cref="RoleTypeId.Flamingo"/> and <see cref="RoleTypeId.AlphaFlamingo"/>. Same as <see cref="Team.Flamingos"/>.
+        /// </summary>
+        Flamingos,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Exiled.API.csproj b/EXILED/Exiled.API/Exiled.API.csproj
index 31fe36e002..70f81bf0d1 100644
--- a/EXILED/Exiled.API/Exiled.API.csproj
+++ b/EXILED/Exiled.API/Exiled.API.csproj
@@ -34,6 +34,7 @@
         <Reference Include="Snake" HintPath="$(EXILED_REFERENCES)\Snake.dll" Private="false" />
         <Reference Include="Unity.TextMeshPro" HintPath="$(EXILED_REFERENCES)\Unity.TextMeshPro.dll" Private="false" />
         <Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
+        <Reference Include="UnityEngine.AnimationModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.AnimationModule.dll" Private="false" />
         <Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />
         <Reference Include="UnityEngine.ParticleSystemModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.ParticleSystemModule.dll" Private="false" />
         <Reference Include="UnityEngine.PhysicsModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.PhysicsModule.dll" Private="false" />
diff --git a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
index 95dfc33727..6fde63477d 100644
--- a/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
@@ -204,6 +204,13 @@ public static DamageType GetDamageType(DamageHandlerBase damageHandlerBase)
                         Log.Warn($"{nameof(DamageTypeExtensions)}.{nameof(damageHandlerBase)}: No matching {nameof(DamageType)} for {nameof(UniversalDamageHandler)} with ID {translation.Id}, type will be reported as {DamageType.Unknown}. Report this to EXILED Devs.");
                         return DamageType.Unknown;
                     }
+
+                case AttackerDamageHandler attackerDamageHandler:
+                    {
+                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
+                            return DamageType.Marshmallow;
+                        return DamageType.Unknown;
+                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
index c44a32362d..088438e085 100644
--- a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
+++ b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
@@ -101,6 +101,9 @@ public static class EffectTypeExtension
             { EffectType.TraumatizedByEvil, typeof(TraumatizedByEvil) },
             { EffectType.WhiteCandy, typeof(WhiteCandy) },
             { EffectType.Scp1509Resurrected, typeof(Scp1509Resurrected) },
+            { EffectType.FocusedVision, typeof(FocusedVision) },
+            { EffectType.AnomalousRegeneration, typeof(AnomalousRegeneration) },
+            { EffectType.AnomalousTarget, typeof(AnomalousTarget) },
             #pragma warning restore CS0618
         });
 
diff --git a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
index 605e6466c0..3ba47fd9a8 100644
--- a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs
@@ -17,6 +17,7 @@ namespace Exiled.API.Extensions
 
     using AdminToys;
     using AudioPooling;
+    using Cassie;
     using CustomPlayerEffects;
     using Exiled.API.Enums;
     using Exiled.API.Features.Items;
@@ -512,13 +513,12 @@ public static void ResyncKeycardPickup(CustomKeycardPickup customKeycard)
         /// <param name="isSubtitles">Same on <see cref="Cassie.Message(string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void PlayCassieAnnouncement(this Player player, string words, bool makeHold = false, bool makeNoise = true, bool isSubtitles = false)
         {
-            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
-            {
-                if (controller != null)
-                {
-                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), words, makeHold, makeNoise, isSubtitles);
-                }
-            }
+            CassieAnnouncement announcement = new(new CassieTtsPayload(words, isSubtitles, makeHold), 0, makeNoise ? 1 : 0);
+
+            // processes makeNoise
+            announcement.OnStartedPlaying();
+
+            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
         }
 
         /// <summary>
@@ -533,23 +533,12 @@ public static void PlayCassieAnnouncement(this Player player, string words, bool
         /// <param name="isSubtitles">Same on <see cref="Cassie.MessageTranslated(string, string, bool, bool, bool)"/>'s isSubtitles.</param>
         public static void MessageTranslated(this Player player, string words, string translation, string customSubtitles, bool makeHold = false, bool makeNoise = true, bool isSubtitles = true)
         {
-            StringBuilder announcement = StringBuilderPool.Pool.Get();
+            CassieAnnouncement announcement = new(new CassieTtsPayload(words, customSubtitles, makeHold), 0, makeNoise ? 1 : 0);
 
-            string[] cassies = words.Split('\n');
-            string[] translations = translation.Split('\n');
+            // processes makeNoise
+            announcement.OnStartedPlaying();
 
-            for (int i = 0; i < cassies.Length; i++)
-                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
-
-            string message = StringBuilderPool.Pool.ToStringReturn(announcement);
-
-            foreach (RespawnEffectsController controller in RespawnEffectsController.AllControllers)
-            {
-                if (controller != null)
-                {
-                    SendFakeTargetRpc(player, controller.netIdentity, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), message, makeHold, makeNoise, isSubtitles, customSubtitles);
-                }
-            }
+            announcement.Payload.SendToHubsConditionally(hub => hub == player.ReferenceHub);
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.API/Extensions/RoleExtensions.cs b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
index 369910654a..db1a7c99a9 100644
--- a/EXILED/Exiled.API/Extensions/RoleExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/RoleExtensions.cs
@@ -70,6 +70,7 @@ public static class RoleExtensions
             Team.FoundationForces or Team.Scientists => Side.Mtf,
             Team.ChaosInsurgency or Team.ClassD => Side.ChaosInsurgency,
             Team.OtherAlive => Side.Tutorial,
+            Team.Flamingos => Side.Flamingos,
             _ => Side.None,
         };
 
@@ -80,12 +81,13 @@ public static class RoleExtensions
         /// <returns><see cref="Team"/>.</returns>
         public static Team GetTeam(this RoleTypeId roleType) => roleType switch
         {
-            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman => Team.ChaosInsurgency,
+            RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman or RoleTypeId.ChaosFlamingo => Team.ChaosInsurgency,
             RoleTypeId.Scientist => Team.Scientists,
             RoleTypeId.ClassD => Team.ClassD,
-            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 => Team.SCPs,
-            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist => Team.FoundationForces,
+            RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 or RoleTypeId.ZombieFlamingo=> Team.SCPs,
+            RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist or RoleTypeId.NtfFlamingo => Team.FoundationForces,
             RoleTypeId.Tutorial => Team.OtherAlive,
+            RoleTypeId.Flamingo or RoleTypeId.AlphaFlamingo => Team.Flamingos,
             _ => Team.Dead,
         };
 
@@ -131,6 +133,7 @@ public static bool TryGetRoleBase<T>(this RoleTypeId roleType, out T roleBase)
             Team.ClassD or Team.ChaosInsurgency => LeadingTeam.ChaosInsurgency,
             Team.FoundationForces or Team.Scientists => LeadingTeam.FacilityForces,
             Team.SCPs => LeadingTeam.Anomalies,
+            Team.Flamingos => LeadingTeam.Flamingo,
             _ => LeadingTeam.Draw,
         };
 
diff --git a/EXILED/Exiled.API/Features/Camera.cs b/EXILED/Exiled.API/Features/Camera.cs
index fca5cbbc73..fa17a77540 100644
--- a/EXILED/Exiled.API/Features/Camera.cs
+++ b/EXILED/Exiled.API/Features/Camera.cs
@@ -143,6 +143,11 @@ public class Camera : IWrapper<Scp079Camera>, IWorldSpace
             ["GATE A ELEVATORS"] = CameraType.EzGateAElevators,
             ["GATE B INTERIOR"] = CameraType.EzGateBInterior,
             ["GATE B SIDE"] = CameraType.EzGateBSide,
+            ["GATE A STAIRWELL"] = CameraType.EzGateAStairwell,
+            ["GATE A UPPER"] = CameraType.EzGateAUpper,
+            ["LOADING BAY"] = CameraType.HczLoadingBay,
+            ["HCZ LOADING RAMP"] = CameraType.HczLoadingBayRamp,
+            ["STAIRWELL"] = CameraType.HczLoadingBayStairwell,
 
             // CustomCamera
             ["EZ ARM CAMERA TOY"] = CameraType.EzArmCameraToy,
diff --git a/EXILED/Exiled.API/Features/Cassie.cs b/EXILED/Exiled.API/Features/Cassie.cs
index 0730f9a5a9..475e68ad4e 100644
--- a/EXILED/Exiled.API/Features/Cassie.cs
+++ b/EXILED/Exiled.API/Features/Cassie.cs
@@ -7,19 +7,19 @@
 
 namespace Exiled.API.Features
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
 
     using Exiled.API.Features.Pools;
-
+    using global::Cassie;
+    using global::Cassie.Interpreters;
     using MEC;
-
     using PlayerRoles;
-
     using PlayerStatsSystem;
-
     using Respawning;
+    using Respawning.NamingRules;
 
     using CustomFirearmHandler = DamageHandlers.FirearmDamageHandler;
     using CustomHandlerBase = DamageHandlers.DamageHandlerBase;
@@ -29,20 +29,15 @@ namespace Exiled.API.Features
     /// </summary>
     public static class Cassie
     {
-        /// <summary>
-        /// Gets the <see cref="NineTailedFoxAnnouncer"/> singleton.
-        /// </summary>
-        public static NineTailedFoxAnnouncer Announcer => NineTailedFoxAnnouncer.singleton;
-
         /// <summary>
         /// Gets a value indicating whether C.A.S.S.I.E is currently announcing. Does not include decontamination or Alpha Warhead Messages.
         /// </summary>
-        public static bool IsSpeaking => Announcer.queue.Count != 0;
+        public static bool IsSpeaking => CassieAnnouncementDispatcher.AllAnnouncements.Count != 0;
 
         /// <summary>
-        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="NineTailedFoxAnnouncer.VoiceLine"/> objects that C.A.S.S.I.E recognizes.
+        /// Gets a <see cref="IReadOnlyCollection{T}"/> of <see cref="CassieAnnouncementDispatcher.AllAnnouncements"/> objects that C.A.S.S.I.E recognizes.
         /// </summary>
-        public static IReadOnlyCollection<NineTailedFoxAnnouncer.VoiceLine> VoiceLines => Announcer.voiceLines;
+        public static IReadOnlyCollection<CassieAnnouncement> VoiceLines => CassieAnnouncementDispatcher.AllAnnouncements;
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message.
@@ -52,7 +47,7 @@ public static class Cassie
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void Message(string message, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles);
+            new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message with a possibility to custom the subtitles.
@@ -64,14 +59,7 @@ public static void Message(string message, bool isHeld = false, bool isNoisy = t
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void MessageTranslated(string message, string translation, bool isHeld = false, bool isNoisy = true, bool isSubtitles = true)
         {
-            StringBuilder announcement = StringBuilderPool.Pool.Get();
-            string[] cassies = message.Split('\n');
-            string[] translations = translation.Split('\n');
-            for (int i = 0; i < cassies.Length; i++)
-                announcement.Append($"{translations[i].Replace(' ', ' ')}<size=0> {cassies[i]} </size><split>");
-
-            RespawnEffectsController.PlayCassieAnnouncement(announcement.ToString(), isHeld, isNoisy, isSubtitles);
-            StringBuilderPool.Pool.Return(announcement);
+            new CassieAnnouncement(new CassieTtsPayload(message, translation, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue();
         }
 
         /// <summary>
@@ -81,7 +69,7 @@ public static void MessageTranslated(string message, string translation, bool is
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void GlitchyMessage(string message, float glitchChance, float jamChance) =>
-            Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance);
+            new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue();
 
         /// <summary>
         /// Reproduce a non-glitched C.A.S.S.I.E message after a certain amount of seconds.
@@ -92,7 +80,7 @@ public static void GlitchyMessage(string message, float glitchChance, float jamC
         /// <param name="isNoisy">Indicates whether C.A.S.S.I.E has to make noises during the message.</param>
         /// <param name="isSubtitles">Indicates whether C.A.S.S.I.E has to make subtitles.</param>
         public static void DelayedMessage(string message, float delay, bool isHeld = false, bool isNoisy = true, bool isSubtitles = false) =>
-            Timing.CallDelayed(delay, () => RespawnEffectsController.PlayCassieAnnouncement(message, isHeld, isNoisy, isSubtitles));
+            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(message, isSubtitles, isHeld), 0f, isNoisy ? 1 : 0).AddToQueue());
 
         /// <summary>
         /// Reproduce a glitchy C.A.S.S.I.E announcement after a certain period of seconds.
@@ -102,17 +90,53 @@ public static void DelayedMessage(string message, float delay, bool isHeld = fal
         /// <param name="glitchChance">The chance of placing a glitch between each word.</param>
         /// <param name="jamChance">The chance of jamming each word.</param>
         public static void DelayedGlitchyMessage(string message, float delay, float glitchChance, float jamChance) =>
-            Timing.CallDelayed(delay, () => Announcer.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance));
+            Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue());
+
+        /// <summary>
+        /// Calculates the duration of a C.A.S.S.I.E message.
+        /// </summary>
+        /// <param name="message">The message, which duration will be calculated.</param>
+        /// <param name="obsolete1">An obsolete parameter.</param>
+        /// <param name="obsolete2">Another obsolete parameter.</param>
+        /// <returns>Duration (in seconds) of specified message.</returns>
+        [Obsolete("Please use CalculateDuration(string)", true)]
+        public static float CalculateDuration(string message, bool obsolete1, float obsolete2) => CalculateDuration(message);
 
         /// <summary>
         /// Calculates the duration of a C.A.S.S.I.E message.
         /// </summary>
         /// <param name="message">The message, which duration will be calculated.</param>
-        /// <param name="rawNumber">Determines if a number won't be converted to its full pronunciation.</param>
-        /// <param name="speed">The speed of the message.</param>
         /// <returns>Duration (in seconds) of specified message.</returns>
-        public static float CalculateDuration(string message, bool rawNumber = false, float speed = 1f)
-            => Announcer.CalculateDuration(message, rawNumber, speed);
+        public static float CalculateDuration(string message)
+        {
+            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
+            {
+                return 0;
+            }
+
+            float value = 0;
+            string[] lines = message.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+
+            CassiePlaybackModifiers modifiers = new();
+            StringBuilder builder = StringBuilderPool.Pool.Get();
+
+            for (int i = 0; i < lines.Length; i++)
+            {
+                foreach (CassieInterpreter interpreter in CassieTtsAnnouncer.Interpreters)
+                {
+                    bool halt;
+                    foreach (CassieInterpreter.Result result in interpreter.GetResults(cassieLineDatabase, ref modifiers, lines[i], builder, out halt))
+                    {
+                        value += (float)result.Modifiers.GetTimeUntilNextWord(result.Line);
+                    }
+
+                    if (halt)
+                        break;
+                }
+            }
+
+            return value;
+        }
 
         /// <summary>
         /// Converts a <see cref="Team"/> into a Cassie-Readable <c>CONTAINMENTUNIT</c>.
@@ -120,8 +144,16 @@ public static float CalculateDuration(string message, bool rawNumber = false, fl
         /// <param name="team"><see cref="Team"/>.</param>
         /// <param name="unitName">Unit Name.</param>
         /// <returns><see cref="string"/> Containment Unit text.</returns>
-        public static string ConvertTeam(Team team, string unitName)
-            => NineTailedFoxAnnouncer.ConvertTeam(team, unitName);
+        public static string ConvertTeam(Team team, string unitName) => team switch
+        {
+            Team.FoundationForces when NamingRulesManager.TryGetNamingRule(team, out UnitNamingRule unitNamingRule) => "CONTAINMENTUNIT " + unitNamingRule.TranslateToCassie(unitName),
+            Team.FoundationForces => "CONTAINMENTUNIT UNKNOWN",
+            Team.ChaosInsurgency => "BY CHAOSINSURGENCY",
+            Team.Scientists => "BY SCIENCE PERSONNEL",
+            Team.ClassD => "BY CLASSD PERSONNEL",
+            Team.Flamingos => "BY SCP 1 5 0 7",
+            _ => "UNKNOWN",
+        };
 
         /// <summary>
         /// Converts a number into a Cassie-Readable String.
@@ -129,7 +161,23 @@ public static string ConvertTeam(Team team, string unitName)
         /// <param name="num">Number to convert.</param>
         /// <returns>A CASSIE-readable <see cref="string"/> representing the number.</returns>
         public static string ConvertNumber(int num)
-            => NineTailedFoxAnnouncer.ConvertNumber(num);
+        {
+            if (!CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase))
+            {
+                return string.Empty;
+            }
+
+            NumberInterpreter numberInterpreter = (NumberInterpreter)CassieTtsAnnouncer.Interpreters.FirstOrDefault((CassieInterpreter x) => x is NumberInterpreter);
+            if (numberInterpreter == null)
+            {
+                return string.Empty;
+            }
+
+            CassiePlaybackModifiers cassiePlaybackModifiers = default;
+            StringBuilder stringBuilder = new();
+            numberInterpreter.GetResults(cassieLineDatabase, ref cassiePlaybackModifiers, num.ToString(), stringBuilder, out bool flag);
+            return stringBuilder.ToString();
+        }
 
         /// <summary>
         /// Announce a SCP Termination.
@@ -137,7 +185,7 @@ public static string ConvertNumber(int num)
         /// <param name="scp">SCP to announce termination of.</param>
         /// <param name="info">HitInformation.</param>
         public static void ScpTermination(Player scp, DamageHandlerBase info)
-            => NineTailedFoxAnnouncer.AnnounceScpTermination(scp.ReferenceHub, info);
+            => CassieScpTerminationAnnouncement.AnnounceScpTermination(scp.ReferenceHub, info);
 
         /// <summary>
         /// Announces the termination of a custom SCP name.
@@ -167,14 +215,14 @@ public static void CustomScpTermination(string scpName, CustomHandlerBase info)
         /// <summary>
         /// Clears the C.A.S.S.I.E queue.
         /// </summary>
-        public static void Clear() => RespawnEffectsController.ClearQueue();
+        public static void Clear() => CassieAnnouncementDispatcher.ClearAll();
 
         /// <summary>
         /// Gets a value indicating whether the given word is a valid C.A.S.S.I.E word.
         /// </summary>
         /// <param name="word">The word to check.</param>
         /// <returns><see langword="true"/> if the word is valid; otherwise, <see langword="false"/>.</returns>
-        public static bool IsValid(string word) => Announcer.voiceLines.Any(line => line.apiName.ToUpper() == word.ToUpper());
+        public static bool IsValid(string word) => CassieTtsAnnouncer.TryGetDatabase(out CassieLineDatabase cassieLineDatabase) ? cassieLineDatabase.AllLines.Any(line => line.ApiName.ToUpper() == word.ToUpper()) : false;
 
         /// <summary>
         /// Gets a value indicating whether the given sentence is all valid C.A.S.S.I.E word.
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
index 67b464474f..fde6e9e00a 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
@@ -39,11 +39,17 @@ public CustomDamageHandler(Player target, BaseHandler baseHandler)
             if (Attacker is not null)
             {
                 if (baseHandler is BaseScpDamageHandler)
+                {
                     CustomBase = new ScpDamageHandler(target, baseHandler);
-                else if (Attacker.CurrentItem is not null && Attacker.CurrentItem.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
-                    CustomBase = new FirearmDamageHandler(Attacker.CurrentItem, target, baseHandler);
+                }
                 else
-                    CustomBase = new DamageHandler(target, Attacker);
+                {
+                    Item item = Attacker.CurrentItem;
+                    if (item is not null && item.Type.IsWeapon() && baseHandler is BaseFirearmHandler)
+                        CustomBase = new FirearmDamageHandler(item, target, baseHandler);
+                    else
+                        CustomBase = new DamageHandler(target, Attacker);
+                }
             }
             else
             {
diff --git a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
index ec59d5ee5a..248e89452b 100644
--- a/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
+++ b/EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
@@ -271,6 +271,13 @@ protected DamageType GetDamageType(BaseHandler damageHandler = null)
                         FirearmType.FRMG0 => DamageType.Frmg0,
                         _ => DamageType.Firearm
                     };
+
+                case PlayerStatsSystem.AttackerDamageHandler attackerDamageHandler:
+                    {
+                        if (Player.TryGet(attackerDamageHandler.Attacker, out Player attacker) && attacker.CurrentItem?.Type == ItemType.MarshmallowItem)
+                            return DamageType.Marshmallow;
+                        return DamageType.Unknown;
+                    }
             }
 
             return DamageType.Unknown;
diff --git a/EXILED/Exiled.API/Features/Doors/Door.cs b/EXILED/Exiled.API/Features/Doors/Door.cs
index 19718900a7..a8163f207c 100644
--- a/EXILED/Exiled.API/Features/Doors/Door.cs
+++ b/EXILED/Exiled.API/Features/Doors/Door.cs
@@ -624,6 +624,7 @@ private DoorType GetDoorType()
                         RoomType.HczEzCheckpointA => DoorType.CheckpointArmoryA,
                         RoomType.HczEzCheckpointB => DoorType.CheckpointArmoryB,
                         RoomType.EzGateA => DoorType.GateAArmory,
+                        RoomType.HczLoadingBay => DoorType.HczLoadingBay,
                         _ => DoorType.UnknownDoor,
                     },
                     "Unsecured Pryable GateDoor" => Room?.Type switch
diff --git a/EXILED/Exiled.API/Features/Effect.cs b/EXILED/Exiled.API/Features/Effect.cs
index f901966917..426b68dcdc 100644
--- a/EXILED/Exiled.API/Features/Effect.cs
+++ b/EXILED/Exiled.API/Features/Effect.cs
@@ -35,7 +35,7 @@ public Effect(StatusEffectBase statusEffectBase)
             if (!statusEffectBase.TryGetEffectType(out EffectType effect))
                 Log.Error($"EffectType not found please report to Exiled BugReport : {statusEffectBase}");
             Type = effect;
-            Duration = statusEffectBase.Duration;
+            Duration = statusEffectBase.TimeLeft;
             Intensity = statusEffectBase.Intensity;
             IsEnabled = statusEffectBase.IsEnabled;
         }
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
index 50a2538c64..8fb2688bb7 100644
--- a/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
+++ b/EXILED/Exiled.API/Features/Items/FirearmModules/Magazine.cs
@@ -11,9 +11,8 @@ namespace Exiled.API.Features.Items.FirearmModules
 
     using Exiled.API.Features.Items.FirearmModules.Barrel;
     using Exiled.API.Features.Items.FirearmModules.Primary;
-
     using InventorySystem.Items.Firearms.Modules;
-
+    using InventorySystem.Items.Firearms.Modules.Scp127;
     using UnityEngine;
 
     /// <summary>
@@ -66,8 +65,12 @@ public static Magazine Get(IAmmoContainerModule module)
                 PumpActionModule pump => new PumpBarrelMagazine(pump),
                 IPrimaryAmmoContainerModule primary => primary switch
                 {
-                    MagazineModule magazine => new NormalMagazine(magazine),
                     CylinderAmmoModule cylinder => new CylinderMagazine(cylinder),
+                    MagazineModule magazine => magazine switch
+                    {
+                        Scp127MagazineModule scp127MagazineModule => new Scp127Magazine(scp127MagazineModule),
+                        _ => new NormalMagazine(magazine)
+                    },
                     _ => null,
                 },
                 _ => null,
diff --git a/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs b/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
new file mode 100644
index 0000000000..c3226169ea
--- /dev/null
+++ b/EXILED/Exiled.API/Features/Items/FirearmModules/Primary/Scp127Magazine.cs
@@ -0,0 +1,80 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127Magazine.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Items.FirearmModules.Primary
+{
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Represents a normal magazine for SCP-127.
+    /// </summary>
+    public class Scp127Magazine : NormalMagazine
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp127Magazine"/> class.
+        /// </summary>
+        /// <param name="magazine"><inheritdoc cref="MagazineModule"/></param>
+        public Scp127Magazine(Scp127MagazineModule magazine)
+            : base(magazine)
+        {
+            MagazineModule = magazine;
+        }
+
+        /// <inheritdoc cref="NormalMagazine.MagazineModule"/>
+        public new Scp127MagazineModule MagazineModule { get; }
+
+        /// <summary>
+        /// Gets or sets the kill bonus.
+        /// </summary>
+        public int KillBonus
+        {
+            get => MagazineModule.KillBonus;
+            set => MagazineModule.KillBonus = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the rank up bonus.
+        /// </summary>
+        public int RankUpBonus
+        {
+            get => MagazineModule.RankUpBonus;
+            set => MagazineModule.RankUpBonus = value;
+        }
+
+        /// <summary>
+        /// Gets or sets all settings.
+        /// </summary>
+        public Scp127MagazineModule.RegenerationSettings[] RegenerationPerTier
+        {
+            get => MagazineModule._regenerationPerTier;
+            set => MagazineModule._regenerationPerTier = value;
+        }
+
+        /// <summary>
+        /// Gets the current setting.
+        /// </summary>
+        public Scp127MagazineModule.RegenerationSettings ActiveSetting => MagazineModule.ActiveSettings;
+
+        /// <summary>
+        /// Gets or sets a pause in bullets regeneration process.
+        /// </summary>
+        public float RemainingRegenPause
+        {
+            get => MagazineModule._remainingRegenPause;
+            set => MagazineModule._remainingRegenPause = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of bullets that should be regenerated.
+        /// </summary>
+        public float RegenProgress
+        {
+            get => MagazineModule._regenProgress;
+            set => MagazineModule._regenProgress = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Item.cs b/EXILED/Exiled.API/Features/Items/Item.cs
index f9d8a74a0d..89bb189c42 100644
--- a/EXILED/Exiled.API/Features/Items/Item.cs
+++ b/EXILED/Exiled.API/Features/Items/Item.cs
@@ -22,6 +22,7 @@ namespace Exiled.API.Features.Items
     using InventorySystem.Items.Firearms.Ammo;
     using InventorySystem.Items.Jailbird;
     using InventorySystem.Items.Keycards;
+    using InventorySystem.Items.MarshmallowMan;
     using InventorySystem.Items.MicroHID;
     using InventorySystem.Items.Pickups;
     using InventorySystem.Items.Radio;
@@ -218,7 +219,11 @@ public static Item Get(ItemBase itemBase)
 
             return itemBase switch
             {
-                InventorySystem.Items.Firearms.Firearm firearm => new Firearm(firearm),
+                InventorySystem.Items.Firearms.Firearm firearm => firearm.ItemTypeId switch
+                {
+                    ItemType.GunSCP127 => new Scp127(firearm),
+                    _ => new Firearm(firearm),
+                },
                 KeycardItem keycard => keycard switch
                 {
                     ChaosKeycardItem chaosKeycardItem => new ChaosKeycard(chaosKeycardItem),
@@ -256,6 +261,7 @@ public static Item Get(ItemBase itemBase)
                     _ => new Throwable(throwable),
                 },
                 Scp1509Item scp1509 => new Scp1509(scp1509),
+                MarshmallowItem marshmallow => new Marshmallow(marshmallow),
                 _ => new(itemBase),
             };
         }
@@ -318,7 +324,11 @@ public static T Get<T>(ushort serial)
         /// <returns>The <see cref="Item"/> created. This can be cast as a subclass.</returns>
         public static Item Create(ItemType type, Player owner = null) => type.GetTemplate() switch
         {
-            InventorySystem.Items.Firearms.Firearm => new Firearm(type),
+            InventorySystem.Items.Firearms.Firearm => type switch
+            {
+                ItemType.GunSCP127 => new Scp127(),
+                _ => new Firearm(type),
+            },
             KeycardItem keycard => keycard switch
             {
                 ChaosKeycardItem => new ChaosKeycard(type),
@@ -356,6 +366,7 @@ public static T Get<T>(ushort serial)
                 _ => new Throwable(type, owner),
             },
             Scp1509Item => new Scp1509(),
+            MarshmallowItem => new Marshmallow(type, owner),
             _ => new(type),
         };
 
diff --git a/EXILED/Exiled.API/Features/Items/Jailbird.cs b/EXILED/Exiled.API/Features/Items/Jailbird.cs
index b68a3473c2..4cc9a59c86 100644
--- a/EXILED/Exiled.API/Features/Items/Jailbird.cs
+++ b/EXILED/Exiled.API/Features/Items/Jailbird.cs
@@ -52,8 +52,8 @@ internal Jailbird()
         /// </summary>
         public float MeleeDamage
         {
-            get => Base._hitreg._damageMelee;
-            set => Base._hitreg._damageMelee = value;
+            get => Base.MeleeDamage;
+            set => Base.MeleeDamage = value;
         }
 
         /// <summary>
@@ -61,8 +61,8 @@ public float MeleeDamage
         /// </summary>
         public float ChargeDamage
         {
-            get => Base._hitreg._damageCharge;
-            set => Base._hitreg._damageCharge = value;
+            get => Base._chargeDamage;
+            set => Base._chargeDamage = value;
         }
 
         /// <summary>
@@ -70,8 +70,8 @@ public float ChargeDamage
         /// </summary>
         public float FlashDuration
         {
-            get => Base._hitreg._flashedDuration;
-            set => Base._hitreg._flashedDuration = value;
+            get => Base._flashedDuration;
+            set => Base._flashedDuration = value;
         }
 
         /// <summary>
@@ -79,17 +79,17 @@ public float FlashDuration
         /// </summary>
         public float ConcussionDuration
         {
-            get => Base._hitreg._concussionDuration;
-            set => Base._hitreg._concussionDuration = value;
+            get => Base._concussionDuration;
+            set => Base._concussionDuration = value;
         }
 
         /// <summary>
-        /// Gets or sets the radius of the Jailbird's hit register.
+        /// Gets or sets the radius of the Jailbird's hit radius.
         /// </summary>
         public float Radius
         {
-            get => Base._hitreg._hitregRadius;
-            set => Base._hitreg._hitregRadius = value;
+            get => Base._hitregRadius;
+            set => Base._hitregRadius = value;
         }
 
         /// <summary>
@@ -97,10 +97,10 @@ public float Radius
         /// </summary>
         public float TotalDamageDealt
         {
-            get => Base._hitreg.TotalMeleeDamageDealt;
+            get => Base.TotalMeleeDamageDealt;
             set
             {
-                Base._hitreg.TotalMeleeDamageDealt = value;
+                Base.TotalMeleeDamageDealt = value;
                 Base._deterioration.RecheckUsage();
             }
         }
diff --git a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
index 8d8bdad39d..bab50d19ce 100644
--- a/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
+++ b/EXILED/Exiled.API/Features/Items/Keycards/ChaosKeycard.cs
@@ -43,7 +43,8 @@ internal ChaosKeycard(ItemType type)
         /// <summary>
         /// Gets the <see cref="InventorySystem.Items.Keycards.Snake.SnakeEngine"/> this encapsulates.
         /// </summary>
-        public SnakeEngine SnakeEngine => Base._localEngine;
+        /// <remarks>Can be null, but shouldn't be during usage.</remarks>
+        public SnakeEngine SnakeEngine => ChaosKeycardItem.SnakeSessions.TryGetValue(Serial, out SnakeEngine engine) ? engine : null;
 
         /// <summary>
         /// Returns the Keycard in a human readable format.
diff --git a/EXILED/Exiled.API/Features/Items/Marshmallow.cs b/EXILED/Exiled.API/Features/Items/Marshmallow.cs
new file mode 100644
index 0000000000..349fe342fb
--- /dev/null
+++ b/EXILED/Exiled.API/Features/Items/Marshmallow.cs
@@ -0,0 +1,102 @@
+// -----------------------------------------------------------------------
+// <copyright file="Marshmallow.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Items
+{
+    using CustomPlayerEffects;
+    using Exiled.API.Interfaces;
+    using InventorySystem.Items.MarshmallowMan;
+    using PlayerStatsSystem;
+    using UnityEngine;
+
+    /// <summary>
+    /// A wrapper class for <see cref="MarshmallowItem"/>.
+    /// </summary>
+    public class Marshmallow : Item, IWrapper<MarshmallowItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
+        /// </summary>
+        /// <param name="itemBase">The base <see cref="MarshmallowItem"/> class.</param>
+        public Marshmallow(MarshmallowItem itemBase)
+            : base(itemBase)
+        {
+            Base = itemBase;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Marshmallow"/> class.
+        /// </summary>
+        /// <param name="type">The <see cref="ItemType"/> of the marshmallow item.</param>
+        /// <param name="owner">The owner of the marshmallow item. Leave <see langword="null"/> for no owner.</param>
+        internal Marshmallow(ItemType type, Player owner = null)
+            : base((MarshmallowItem)(owner ?? Server.Host).Inventory.CreateItemInstance(new(type, 0), false))
+        {
+        }
+
+        /// <summary>
+        /// Gets the <see cref="MarshmallowItem"/> that this class is encapsulating.
+        /// </summary>
+        public new MarshmallowItem Base { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this marshmallow man is evil.
+        /// </summary>
+        /// <remarks>See <see cref="MakeEvil"/> in regards to making a marshmallow evil.</remarks>
+        public bool Evil => Base.EvilMode;
+
+        /// <summary>
+        /// Gets or sets the <see cref="AhpStat.AhpProcess"/> of the marshmallow man that would be used if he was evil.
+        /// </summary>
+        public AhpStat.AhpProcess EvilAhpProcess
+        {
+            get => Base.EvilAHPProcess;
+            set
+            {
+                if (Evil && value is null)
+                    return;
+
+                Base.EvilAHPProcess = value;
+            }
+        }
+
+        /// <summary>
+        /// Cackles for the owner even if they are not evil.
+        /// </summary>
+        /// <param name="cooldown">How long until the player can cackle again (negative values do not affect current cooldown).</param>
+        /// <param name="duration">How long players near the marshmallow man get effected by <see cref="TraumatizedByEvil"/>.</param>
+        public void Cackle(double cooldown = -1, float duration = 5)
+        {
+            if (cooldown >= 0)
+                Base._cackleCooldown.Trigger(cooldown);
+
+            Base.ServerSendPublicRpc(writer =>
+            {
+                writer.WriteByte(4);
+                Base._cackleCooldown.WriteCooldown(writer);
+            });
+
+            foreach (Player player in Player.List)
+            {
+                if (Vector3.Distance(player.Position, Owner.Position) <= 5F && player.CurrentItem is not Marshmallow { Evil: true })
+                    player.EnableEffect<TraumatizedByEvil>(duration);
+            }
+        }
+
+        /// <summary>
+        /// Makes the owner of this marshmallow evil. You CANNOT undo this without resetting the player.
+        /// </summary>
+        /// <param name="evilProcess">The <see cref="AhpStat.AhpProcess"/> of the new evil player.</param>
+        public void MakeEvil(AhpStat.AhpProcess evilProcess = null)
+        {
+            if (Evil)
+                return;
+
+            Base.ReleaseEvil(evilProcess ?? EvilAhpProcess ?? Owner.GetModule<AhpStat>().ServerAddProcess(450F, 450F, 0F, 1F, 0F, true));
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Items/Scp127.cs b/EXILED/Exiled.API/Features/Items/Scp127.cs
new file mode 100644
index 0000000000..2c71fbe4bb
--- /dev/null
+++ b/EXILED/Exiled.API/Features/Items/Scp127.cs
@@ -0,0 +1,274 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Items
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using InventorySystem.Items.Firearms.Modules;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+    using UnityEngine;
+
+    /// <summary>
+    /// Represents SCP-127.
+    /// </summary>
+    public class Scp127 : Firearm
+    {
+        #pragma warning disable SA1401
+        /// <summary>
+        /// Custom amount of max HS.
+        /// </summary>
+        internal float? CustomHsMax;
+        #pragma warning restore SA1401
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp127"/> class.
+        /// </summary>
+        /// <param name="itemBase"><inheritdoc cref="Firearm.Base"/></param>
+        public Scp127(InventorySystem.Items.Firearms.Firearm itemBase)
+            : base(itemBase)
+        {
+            foreach (ModuleBase module in Base.Modules)
+            {
+                switch (module)
+                {
+                    case Scp127HumeModule humeModule:
+                        HumeModule = humeModule;
+                        break;
+                    case Scp127TierManagerModule tierManagerModule:
+                        TierManagerModule = tierManagerModule;
+                        break;
+                    case Scp127VoiceLineManagerModule voiceLineManagerModule:
+                        VoiceLineManagerModule = voiceLineManagerModule;
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp127"/> class.
+        /// </summary>
+        internal Scp127()
+            : this((InventorySystem.Items.Firearms.Firearm)Server.Host.Inventory.CreateItemInstance(new(ItemType.GunSCP127, 0), false))
+        {
+        }
+
+        /// <summary>
+        /// Gets a collection of all active HS sessions.
+        /// </summary>
+        public static List<Scp127HumeModule.HumeShieldSession> ActiveHumeShieldSessions => Scp127HumeModule.ServerActiveSessions;
+
+        /// <summary>
+        /// Gets the <see cref="Scp127HumeModule"/> instance.
+        /// </summary>
+        public Scp127HumeModule HumeModule { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Scp127TierManagerModule"/> instance.
+        /// </summary>
+        public Scp127TierManagerModule TierManagerModule { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Scp127VoiceLineManagerModule"/> instance.
+        /// </summary>
+        public Scp127VoiceLineManagerModule VoiceLineManagerModule { get; }
+
+        /// <summary>
+        /// Gets or sets the maximum amount of HS.
+        /// </summary>
+        /// <remarks>If setter is used, after tier chance this value won't be edited automatically.</remarks>
+        public float HsMax
+        {
+            get => CustomHsMax ?? HumeModule.HsMax;
+            set => CustomHsMax = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a shield regeneration rate.
+        /// </summary>
+        public float ShieldRegenRate
+        {
+            get => HumeModule.ShieldRegenRate;
+            set => HumeModule.ShieldRegenRate = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a shield decay time.
+        /// </summary>
+        public float ShieldDecayRate
+        {
+            get => HumeModule.ShieldDecayRate;
+            set => HumeModule.ShieldDecayRate = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a pause before HS starts regeneration after damage being taken.
+        /// </summary>
+        public float ShieldOnDamagePause
+        {
+            get => HumeModule.ShieldOnDamagePause;
+            set => HumeModule.ShieldOnDamagePause = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a delay before HS starts dropping after unequipment.
+        /// </summary>
+        public float UnequipDecayDelay
+        {
+            get => HumeModule.UnequipDecayDelay;
+            set => HumeModule.UnequipDecayDelay = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a HumeShield regeneration.
+        /// </summary>
+        public float HsRegeneration
+        {
+            get => HumeModule.HsRegeneration;
+            set => HumeModule.HsRegeneration = value;
+        }
+
+        /// <summary>
+        /// Gets or sets an experience bonus for kill.
+        /// </summary>
+        public float KillBonus
+        {
+            get => TierManagerModule.KillBonus;
+            set => TierManagerModule.KillBonus = value;
+        }
+
+        /// <summary>
+        /// Gets or sets an amount of passive experience increase.
+        /// </summary>
+        public float PassiveExpAmount
+        {
+            get => TierManagerModule.PassiveExpAmount;
+            set => TierManagerModule.PassiveExpAmount = value;
+        }
+
+        /// <summary>
+        /// Gets or sets an interval of passive experience increase.
+        /// </summary>
+        public float PassiveExpInterval
+        {
+            get => TierManagerModule.PassiveExpInterval;
+            set => TierManagerModule.PassiveExpInterval = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a collection of all tier thresholds.
+        /// </summary>
+        public Scp127TierManagerModule.TierThreshold[] TierThresholds
+        {
+            get => TierManagerModule.Thresholds;
+            set => TierManagerModule.Thresholds = value;
+        }
+
+        /// <summary>
+        /// Gets or sets current tier.
+        /// </summary>
+        public Scp127Tier CurrentTier
+        {
+            get => TierManagerModule.CurTier;
+            set => TierManagerModule.CurTier = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the current experience amount.
+        /// </summary>
+        public float Experience
+        {
+            get => TierManagerModule.ServerExp;
+            set => TierManagerModule.ServerExp = value;
+        }
+
+        /// <summary>
+        /// Gets the instance record.
+        /// </summary>
+        public Scp127TierManagerModule.InstanceRecord InstanceRecord => Scp127TierManagerModule.GetRecord(Serial);
+
+        /// <summary>
+        /// Gets the Owner stats.
+        /// </summary>
+        public Scp127TierManagerModule.OwnerStats OwnerStats => Scp127TierManagerModule.GetStats(Base);
+
+        /// <summary>
+        /// Gets or sets all Voice Triggers.
+        /// </summary>
+        public Scp127VoiceTriggerBase[] VoiceTriggers
+        {
+            get => VoiceLineManagerModule._foundTriggers;
+            set => VoiceLineManagerModule._foundTriggers = value;
+        }
+
+        /// <summary>
+        /// Gets a collection of players that are friends with this SCP-127.
+        /// </summary>
+        public IEnumerable<Player> Friends
+        {
+            get
+            {
+                if (!Scp127VoiceLineManagerModule.FriendshipMemory.TryGetValue(Serial, out HashSet<uint> uintSet))
+                    return null;
+
+                return uintSet.Select(Player.Get);
+            }
+        }
+
+        /// <summary>
+        /// Increases experience.
+        /// </summary>
+        /// <param name="amount">Amount to add.</param>
+        public void IncreaseExperience(float amount) => TierManagerModule.ServerIncreaseExp(Base, amount);
+
+        /// <summary>
+        /// Sets owner stats.
+        /// </summary>
+        /// <param name="exp">New experience amount.</param>
+        public void SetOwnerStats(float exp) => TierManagerModule.ServerSetStats(exp);
+
+        /// <summary>
+        /// Sends tier stats.
+        /// </summary>
+        /// <param name="tier">New tier.</param>
+        /// <param name="progress">New progress.</param>
+        public void SendTierStats(Scp127Tier tier, byte progress) => TierManagerModule.ServerSendStats(Serial, Owner.ReferenceHub, tier, progress);
+
+        /// <summary>
+        /// Tries to play voice line.
+        /// </summary>
+        /// <param name="voiceLine">Voice line to play.</param>
+        /// <param name="priority">Priority of the play.</param>
+        /// <returns><c>true</c> if voice line has been played successfully. Otherwise, <c>false</c>.</returns>
+        public bool TryPlayVoiceLine(Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority priority = Scp127VoiceTriggerBase.VoiceLinePriority.Normal)
+        {
+            if (!VoiceLineManagerModule.TryFindVoiceLine(voiceLine, out Scp127VoiceTriggerBase triggerBase, out AudioClip audioClip))
+                return false;
+
+            VoiceLineManagerModule.ServerSendVoiceLine(triggerBase, null, audioClip, (byte)priority);
+            return true;
+        }
+
+        /// <summary>
+        /// Checks if this instance of SCP-127 and <paramref name="player"/> have friendship.
+        /// </summary>
+        /// <param name="player">Target to check.</param>
+        /// <returns><c>true</c> if this instance of SCP-127 and <paramref name="player"/> have friendship. Otherwise, <c>false</c>.</returns>
+        public bool HasFriendship(Player player) => Scp127VoiceLineManagerModule.HasFriendship(Serial, player.ReferenceHub);
+
+        /// <summary>
+        /// Adds player as a friend.
+        /// </summary>
+        /// <param name="player">Target to be added.</param>
+        public void AddFriend(Player player)
+        {
+            HashSet<uint> uints = Scp127VoiceLineManagerModule.FriendshipMemory.GetOrAddNew(Serial);
+            uints.Add(player.NetId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Lift.cs b/EXILED/Exiled.API/Features/Lift.cs
index 469a33bd22..d191cd6764 100644
--- a/EXILED/Exiled.API/Features/Lift.cs
+++ b/EXILED/Exiled.API/Features/Lift.cs
@@ -47,6 +47,7 @@ public class Lift : IWrapper<ElevatorChamber>, IWorldSpace
         internal Lift(ElevatorChamber elevator)
         {
             Base = elevator;
+            ElevatorAutoReturn = elevator.GetComponent<ElevatorAutoReturn>();
             ElevatorChamberToLift.Add(elevator, this);
 
             internalDoorsList.AddRange(Elevator.AllElevatorDoors[Group]);
@@ -73,6 +74,12 @@ internal Lift(ElevatorChamber elevator)
         /// </summary>
         public ElevatorChamber Base { get; }
 
+        /// <summary>
+        /// Gets the base <see cref="ElevatorAutoReturn"/>.
+        /// </summary>
+        /// <remarks>Would be null for any elevator that do not used <see cref="Interactables.Interobjects.ElevatorAutoReturn"/>.</remarks>
+        public ElevatorAutoReturn ElevatorAutoReturn { get; }
+
         /// <summary>
         /// Gets a value of the internal doors list.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
index 0494d2e966..eaaf77cb7a 100644
--- a/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/JailbirdPickup.cs
@@ -123,11 +123,11 @@ protected override void InitializeProperties(ItemBase itemBase)
             base.InitializeProperties(itemBase);
             if (itemBase is JailbirdItem jailbirdItem)
             {
-                MeleeDamage = jailbirdItem._hitreg._damageMelee;
-                ChargeDamage = jailbirdItem._hitreg._damageCharge;
-                FlashDuration = jailbirdItem._hitreg._flashedDuration;
-                ConcussionDuration = jailbirdItem._hitreg._concussionDuration;
-                Radius = jailbirdItem._hitreg._hitregRadius;
+                MeleeDamage = jailbirdItem.MeleeDamage;
+                ChargeDamage = jailbirdItem._chargeDamage;
+                FlashDuration = jailbirdItem._flashedDuration;
+                ConcussionDuration = jailbirdItem._concussionDuration;
+                Radius = Radius;
             }
         }
     }
diff --git a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
index b11c1cb0e9..935bc636ca 100644
--- a/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/Scp1509Pickup.cs
@@ -15,7 +15,7 @@ namespace Exiled.API.Features.Pickups
     using BaseScp1509 = InventorySystem.Items.Scp1509.Scp1509Pickup;
 
     /// <summary>
-    /// A wrapper class for a Radio pickup.
+    /// A wrapper class for a Scp1509 pickup.
     /// </summary>
     public class Scp1509Pickup : Pickup, IWrapper<BaseScp1509>
     {
diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index a61d640a84..956fcf7f23 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -648,7 +648,7 @@ public ScpSpawnPreferences.SpawnPreferences ScpPreferences
         /// <summary>
         /// Gets a value indicating whether the player is reloading a weapon.
         /// </summary>
-        public bool IsReloading => CurrentItem is Firearm firearm && !firearm.IsReloading;
+        public bool IsReloading => CurrentItem is Firearm firearm && firearm.IsReloading;
 
         /// <summary>
         /// Gets a value indicating whether the player is aiming with a weapon.
@@ -1982,10 +1982,24 @@ public void SetRank(string name, UserGroup group)
                 ReferenceHub.serverRoles.SetGroup(group, false, false);
             }
 
-            if (ServerStatic.PermissionsHandler.Members.ContainsKey(UserId))
+            ServerStatic.PermissionsHandler.Members[UserId] = name;
+        }
+
+        /// <summary>
+        /// If the rank(group) exists in the remote admin config, it will assign it to the player.
+        /// </summary>
+        /// <param name="name">The rank name to be set.</param>
+        /// <returns><see langword="true"/> if the rank(group) was found and successfully assigned, <see langword="false"/> otherwise.</returns>
+        public bool TrySetRank(string name)
+        {
+            if (ServerStatic.PermissionsHandler.Groups.TryGetValue(name, out UserGroup userGroup))
+            {
+                ReferenceHub.serverRoles.SetGroup(userGroup, false, false);
                 ServerStatic.PermissionsHandler.Members[UserId] = name;
-            else
-                ServerStatic.PermissionsHandler.Members.Add(UserId, name);
+                return true;
+            }
+
+            return false;
         }
 
         /// <summary>
@@ -2029,6 +2043,21 @@ public void Broadcast(Broadcast broadcast, bool shouldClearPrevious = false)
                 Broadcast(broadcast.Duration, broadcast.Content, broadcast.Type, shouldClearPrevious);
         }
 
+        /// <summary>
+        /// Send an <see cref="global::Cassie.CassieAnnouncement"/> to the player.
+        /// </summary>
+        /// <param name="cassieAnnouncement">The <see cref="global::Cassie.CassieAnnouncement"/> to be broadcasted.</param>
+        /// <returns><see langword="0"/> if Cassie failed to play it or it's play nothing, otherwise it's return the duration of the annoucement.</returns>
+        public float CassieAnnouncement(global::Cassie.CassieAnnouncement cassieAnnouncement)
+        {
+            global::Cassie.CassieAnnouncementDispatcher.CurrentAnnouncement.OnStartedPlaying();
+            global::Cassie.CassieTtsPayload payload = cassieAnnouncement.Payload;
+            if (!global::Cassie.CassieTtsAnnouncer.TryPlay(payload, out float totalduration))
+                return 0;
+            payload.SendToHubsConditionally(x => x == ReferenceHub);
+            return totalduration;
+        }
+
         /// <summary>
         /// Drops an item from the player's inventory.
         /// </summary>
@@ -2061,10 +2090,12 @@ public void DropItem(Item item, bool isThrown = false)
         /// <returns>Dropped item's <see cref="Pickup"/>.</returns>
         public Pickup DropHeldItem()
         {
-            if (CurrentItem is null)
+            Item item = CurrentItem;
+
+            if (item is null)
                 return null;
 
-            return DropItem(CurrentItem);
+            return DropItem(item);
         }
 
         /// <summary>
@@ -3449,10 +3480,7 @@ public void SyncEffect(Effect effect)
         {
             if (effect.IsEnabled)
             {
-                EnableEffect(effect.Type, effect.Duration, effect.AddDurationIfActive);
-
-                if (effect.Intensity > 0)
-                    ChangeEffectIntensity(effect.Type, effect.Intensity, effect.Duration);
+                EnableEffect(effect.Type, effect.Intensity, effect.Duration, effect.AddDurationIfActive);
             }
         }
 
@@ -3580,8 +3608,7 @@ public void ChangeEffectIntensity<T>(byte intensity, float duration = 0)
         {
             if (ReferenceHub.playerEffectsController.TryGetEffect(out T statusEffect))
             {
-                statusEffect.Intensity = intensity;
-                statusEffect.ServerChangeDuration(duration, true);
+                statusEffect.ServerSetState(intensity, duration, false);
             }
         }
 
@@ -3595,8 +3622,7 @@ public void ChangeEffectIntensity(EffectType type, byte intensity, float duratio
         {
             if (TryGetEffect(type, out StatusEffectBase statusEffect))
             {
-                statusEffect.Intensity = intensity;
-                statusEffect.ServerChangeDuration(duration, false);
+                statusEffect.ServerSetState(intensity, duration, false);
             }
         }
 
diff --git a/EXILED/Exiled.API/Features/Recontainer.cs b/EXILED/Exiled.API/Features/Recontainer.cs
index 17f59c97d5..dbc31a35bf 100644
--- a/EXILED/Exiled.API/Features/Recontainer.cs
+++ b/EXILED/Exiled.API/Features/Recontainer.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.API.Features
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -33,7 +34,8 @@ public static class Recontainer
         /// <summary>
         /// Gets a value indicating whether the C.A.S.S.I.E is currently busy.
         /// </summary>
-        public static bool IsCassieBusy => Base.CassieBusy;
+        [Obsolete("Use Cassie.IsSpeaking instead")]
+        public static bool IsCassieBusy => Cassie.IsSpeaking;
 
         /// <summary>
         /// Gets a value about how many generator have been activated.
@@ -61,11 +63,8 @@ public static bool IsContainmentZoneLocked
         /// <summary>
         /// Gets or sets the delay to wait before overcharging.
         /// </summary>
-        public static float OverchargeDelay
-        {
-            get => Base._activationDelay;
-            set => Base._activationDelay = value;
-        }
+        [Obsolete("Will be removed in Exiled 10, patch the Cassie079RecontainAnnouncement ctor if you need this functionality")]
+        public static float OverchargeDelay { get; set; }
 
         /// <summary>
         /// Gets or sets the lockdown duration.
@@ -188,7 +187,7 @@ public static bool IsContainmentSequenceSuccessful
         /// </summary>
         /// <param name="announcement">The announcement to play.</param>
         /// <param name="glitchyMultiplier">The glitchy multiplier.</param>
-        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, glitchyMultiplier);
+        public static void PlayAnnouncement(string announcement, float glitchyMultiplier) => Base.PlayAnnouncement(announcement, false, false, null);
 
         /// <summary>
         /// Begins the overcharge procedure.
@@ -199,7 +198,6 @@ public static void BeginOvercharge(bool endOvercharge = true)
             Base.BeginOvercharge();
             if (endOvercharge)
             {
-                Base._delayStopwatch.Stop();
                 Base._unlockStopwatch.Start();
             }
         }
@@ -228,7 +226,7 @@ public static void BeginOvercharge(bool endOvercharge = true)
         /// <summary>
         /// Begins the recontainment procedure.
         /// </summary>
-        public static void Recontain() => Base.Recontain();
+        public static void Recontain() => Base.Recontain(false);
 
         /// <summary>
         /// Refreshes the activator.
diff --git a/EXILED/Exiled.API/Features/Roles/FpcRole.cs b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
index 2b0d75cf00..9a1156833e 100644
--- a/EXILED/Exiled.API/Features/Roles/FpcRole.cs
+++ b/EXILED/Exiled.API/Features/Roles/FpcRole.cs
@@ -300,6 +300,30 @@ public BasicRagdoll Ragdoll
         /// </summary>
         public SpectatableModuleBase SpectatableModuleBase => FirstPersonController.SpectatorModule;
 
+        /// <summary>
+        /// Tries to get the <see cref="Transform"/> of a specified <see cref="HumanBodyBones"/> bone.
+        /// </summary>
+        /// <param name="bone">The bone to get the <see cref="Transform"/> of.</param>
+        /// <param name="boneTransform">
+        /// When this method returns, contains the <see cref="Transform"/> of the specified bone, if found;
+        /// otherwise, <c>null</c>.
+        /// </param>
+        /// <returns><c>true</c> if the bone transform was found; otherwise, <c>false</c>.</returns>
+        public bool TryGetBoneTransform(HumanBodyBones bone, out Transform boneTransform)
+        {
+            boneTransform = null;
+
+            if (Model is not AnimatedCharacterModel animatedModel)
+                return false;
+
+            Animator animator = animatedModel.Animator;
+            if (animator == null || animator.avatar == null || !animator.avatar.isValid || !animator.avatar.isHuman)
+                return false;
+
+            boneTransform = animator.GetBoneTransform(bone);
+            return boneTransform != null;
+        }
+
         /// <summary>
         /// Resets the <see cref="Player"/>'s stamina.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
index 1c015e2ff0..6283226eb4 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp049Role.cs
@@ -271,8 +271,7 @@ public void Attack(Player player)
             else
             {
                 cardiacArrest.SetAttacker(AttackAbility.Owner);
-                cardiacArrest.Intensity = 1;
-                cardiacArrest.ServerChangeDuration(AttackAbility._statusEffectDuration, false);
+                cardiacArrest.ServerSetState(1, AttackAbility._statusEffectDuration, false);
             }
 
             SenseAbility.OnServerHit(AttackAbility._target);
diff --git a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
index a59e699ac9..6e78b6c662 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp096Role.cs
@@ -16,6 +16,8 @@ namespace Exiled.API.Features.Roles
     using PlayerRoles.PlayableScps.Scp096;
     using PlayerRoles.Subroutines;
 
+    using UnityEngine;
+
     using Scp096GameRole = PlayerRoles.PlayableScps.Scp096.Scp096Role;
 
     /// <summary>
@@ -139,6 +141,20 @@ internal Scp096Role(Scp096GameRole baseRole)
         /// </summary>
         public bool AttackPossible => AttackAbility.AttackPossible;
 
+        /// <summary>
+        /// Gets the head transform of SCP-096's character model.
+        /// </summary>
+        public Transform HeadTransform
+        {
+            get
+            {
+                if (Model is not Scp096CharacterModel scp96AnimatedCharacterModel)
+                    return null;
+
+                return scp96AnimatedCharacterModel.Head;
+            }
+        }
+
         /// <summary>
         /// Gets or sets the Charge Ability Cooldown.
         /// </summary>
@@ -306,4 +322,4 @@ public void Charge(float cooldown = 1f)
         /// <returns>The Spawn Chance.</returns>
         public float GetSpawnChance(List<RoleTypeId> alreadySpawned) => Base.GetSpawnChance(alreadySpawned);
     }
-}
\ No newline at end of file
+}
diff --git a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
index a4c9ba78cf..170bda116a 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
@@ -20,7 +20,7 @@ namespace Exiled.API.Features.Roles
     /// <summary>
     /// Defines a role that represents SCP-1507.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp1507Role : FpcRole, ISubroutinedScpRole, IHumeShieldRole, ISpawnableScp
     {
         /// <summary>
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
index a81a24173f..846a76509c 100644
--- a/EXILED/Exiled.API/Features/Room.cs
+++ b/EXILED/Exiled.API/Features/Room.cs
@@ -506,6 +506,7 @@ private static RoomType FindType(GameObject gameObject)
                 "HCZ_ChkpB" => RoomType.HczElevatorB,
                 "HCZ_127" => RoomType.Hcz127,
                 "HCZ_ServerRoom" => RoomType.HczServerRoom,
+                "HCZ_Intersection_Ramp" => RoomType.HczLoadingBay,
                 "EZ_GateA" => RoomType.EzGateA,
                 "EZ_GateB" => RoomType.EzGateB,
                 "EZ_ThreeWay" => RoomType.EzTCross,
diff --git a/EXILED/Exiled.API/Features/Scp559.cs b/EXILED/Exiled.API/Features/Scp559.cs
index 08fc899047..d05702b351 100644
--- a/EXILED/Exiled.API/Features/Scp559.cs
+++ b/EXILED/Exiled.API/Features/Scp559.cs
@@ -18,7 +18,7 @@ namespace Exiled.API.Features
     /// <summary>
     /// Represents a cake.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp559 : IWrapper<Scp559Cake>, IPosition
     {
         /// <summary>
@@ -50,20 +50,34 @@ public Scp559(Scp559Cake cakeBase)
         /// <summary>
         /// Gets a <see cref="Dictionary{TKey,TValue}"/> with spawnpoint in rooms.
         /// </summary>
-        public static Dictionary<RoomName, Vector4> SpawnPositions => Scp559Cake.Spawnpoints;
+        public static Dictionary<RoomName, Vector4> SpawnPositions { get; } = Scp559Spawnpoint.InstancesPerRoom.ToDictionary(kvp => kvp.Key.Name, kvp =>
+        {
+            Transform roomTransform = kvp.Key.transform;
+            Transform spawnTransform = kvp.Value.transform;
+
+            Vector3 localPos = roomTransform.InverseTransformPoint(spawnTransform.position);
+
+            return new Vector4(localPos.x, localPos.y, localPos.z, spawnTransform.eulerAngles.y);
+        });
 
         /// <summary>
         /// Gets the list of all available spawnpoints.
         /// </summary>
-        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossiblePositions;
+        public static List<Vector4> AvailableSpawnpoints => Scp559Cake.PossibleSpawnpoints.Select(spawnpoint =>
+        {
+            Transform t = spawnpoint.transform;
+            return new Vector4(t.position.x, t.position.y, t.position.z, t.eulerAngles.y);
+        }).ToList();
 
         /// <summary>
         /// Gets or sets offset for spawning near pedestals.
         /// </summary>
         public static Vector3 PedestalOffset
         {
-            get => Scp559Cake.PedestalOffset;
-            set => Scp559Cake.PedestalOffset.Set(value.x, value.y, value.z);
+            get => new(0, -Scp559Spawnpoint.PedestalHeight, 0);
+
+            [Obsolete("Setter no longer works")]
+            set { }
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.API/Features/Server.cs b/EXILED/Exiled.API/Features/Server.cs
index 96b8311fdf..825cfb3566 100644
--- a/EXILED/Exiled.API/Features/Server.cs
+++ b/EXILED/Exiled.API/Features/Server.cs
@@ -111,7 +111,27 @@ public static string Name
         /// <summary>
         /// Gets the actual ticks per second of the server.
         /// </summary>
-        public static double Tps => Math.Round(1f / Time.smoothDeltaTime);
+        public static double Tps
+        {
+            get
+            {
+                double delta = Time.deltaTime;
+
+                if (delta <= 0)
+                    return MaxTps;
+
+                double tps = 1d / delta;
+
+                tps = Math.Min(tps, MaxTps);
+
+                return tps;
+            }
+        }
+
+        /// <summary>
+        /// Gets the average ticks per second of the server.
+        /// </summary>
+        public static double SmoothTps => Math.Round(1f / Time.smoothDeltaTime);
 
         /// <summary>
         /// Gets or sets the max ticks per second of the server.
diff --git a/EXILED/Exiled.API/Features/Waves/TimedWave.cs b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
index 8856727c58..6e9a5c55bf 100644
--- a/EXILED/Exiled.API/Features/Waves/TimedWave.cs
+++ b/EXILED/Exiled.API/Features/Waves/TimedWave.cs
@@ -193,13 +193,13 @@ public static List<TimedWave> GetTimedWaves()
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
-        public void PlayAnnouncement() => Announcement?.PlayAnnouncement(new());
+        public void PlayAnnouncement() => Announcement?.PlayAnnouncement([], Base as IAnnouncedWave);
 
         /// <summary>
         /// Plays the announcement for this wave.
         /// </summary>
         /// <remarks>Wave must implement <see cref="IAnnouncedWave"/>.</remarks>
         /// <param name="players">The list of Player to spawn.</param>
-        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList());
+        public void PlayAnnouncement(IEnumerable<Player> players) => Announcement?.PlayAnnouncement(players.Select(x => x.ReferenceHub).ToList(), Base as IAnnouncedWave);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Window.cs b/EXILED/Exiled.API/Features/Window.cs
index e5a1624e0d..2d327ff0c4 100644
--- a/EXILED/Exiled.API/Features/Window.cs
+++ b/EXILED/Exiled.API/Features/Window.cs
@@ -231,6 +231,7 @@ public void DamageWindow(float amount, DamageHandlerBase handler)
                 RoomType.HczEzCheckpointB => GlassType.HczEzCheckpointB,
                 RoomType.EzGateA when Base.name[7] == '5' => GlassType.GateAArmory,
                 RoomType.EzGateA => GlassType.GateAPit,
+                RoomType.HczLoadingBay => GlassType.HczLoadingBay,
                 _ => GlassType.Unknown,
             },
             "Window" => Room?.Type switch
diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
index fa39569e0a..182f47155e 100644
--- a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
@@ -1013,15 +1013,6 @@ private void OnInternalOwnerHandcuffing(HandcuffingEventArgs ev)
                     continue;
 
                 OnOwnerHandcuffing(new OwnerHandcuffingEventArgs(item, ev));
-
-                if (!ev.IsAllowed)
-                    continue;
-
-                ev.Target.RemoveItem(item);
-
-                TrackedSerials.Remove(item.Serial);
-
-                Spawn(ev.Target, item, ev.Target);
             }
         }
 
diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index f29e2d525c..afce01ccdf 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -790,6 +790,12 @@ public bool TryAddFriendlyFire(Dictionary<RoleTypeId, float> ffRules, bool overw
             return true;
         }
 
+        /// <summary>
+        /// Returns the CustomRole in a human-readable format.
+        /// </summary>
+        /// <returns>A string containing CustomRole-related data.</returns>
+        public override string ToString() => $"{Name} ({Id})";
+
         /// <summary>
         /// Tries to register this role.
         /// </summary>
diff --git a/EXILED/Exiled.CustomRoles/Commands/Get.cs b/EXILED/Exiled.CustomRoles/Commands/Get.cs
new file mode 100644
index 0000000000..7d96d5f6b4
--- /dev/null
+++ b/EXILED/Exiled.CustomRoles/Commands/Get.cs
@@ -0,0 +1,123 @@
+// -----------------------------------------------------------------------
+// <copyright file="Get.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.CustomRoles.Commands
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Linq;
+    using System.Text;
+
+    using CommandSystem;
+    using Exiled.API.Extensions;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.CustomRoles.API;
+    using Exiled.CustomRoles.API.Features;
+    using Exiled.Permissions.Extensions;
+    using HarmonyLib;
+
+    /// <summary>
+    /// The command to get specified player(s) current custom roles.
+    /// </summary>
+    internal sealed class Get : ICommand
+    {
+        private Get()
+        {
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Get"/> command instance.
+        /// </summary>
+        public static Get Instance { get; } = new();
+
+        /// <inheritdoc/>
+        public string Command => "get";
+
+        /// <inheritdoc/>
+        public string[] Aliases { get; } = Array.Empty<string>();
+
+        /// <inheritdoc/>
+        public string Description => "Gets the specified player(s)' current custom role(s).";
+
+        /// <inheritdoc/>
+        public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
+        {
+            if (!sender.CheckPermission("customroles.get"))
+            {
+                response = "Permission Denied, required: customroles.get";
+                return false;
+            }
+
+            List<Player> players = ListPool<Player>.Pool.Get();
+
+            if (arguments.Count > 0)
+            {
+                string identifier = string.Join(" ", arguments);
+
+                switch (identifier.ToLower())
+                {
+                    case "*":
+                    case "all":
+                        players.AddRange(Player.List);
+                        break;
+                    default:
+                        players.AddRange(Player.GetProcessedData(arguments));
+                        break;
+                }
+
+                if (players.IsEmpty())
+                {
+                    if (arguments.Count > 0 || !Player.TryGet(sender, out Player player))
+                    {
+                        response = $"Player not found: {identifier}";
+                        return false;
+                    }
+
+                    players.Add(player);
+                }
+            }
+            else
+            {
+                response = "get <Nickname/PlayerID/UserID/all/*>";
+                return false;
+            }
+
+            StringBuilder builder = StringBuilderPool.Pool.Get();
+
+            builder.AppendLine();
+            builder.AppendLine("====================== Custom Roles ======================");
+
+            foreach (Player target in players)
+            {
+                ReadOnlyCollection<CustomRole> roles = target.GetCustomRoles();
+                builder.Append((target.DisplayNickname + (target.HasCustomName ? $" ({target.Nickname})" : string.Empty)).PadRight(30 + (target.HasCustomName ? 23 : 0)));
+                builder.Append(" ");
+                builder.Append($"({target.Id})".PadRight(5));
+                if (roles.IsEmpty())
+                {
+                    builder.AppendLine(" | No Custom Role");
+                }
+                else
+                {
+                    // builder.Append($" | [{string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>"))}]");
+                    builder.Append(" | [");
+                    builder.Append(string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>")));
+                    builder.AppendLine("]");
+                }
+            }
+
+            builder.AppendLine("==========================================================");
+
+            ListPool<Player>.Pool.Return(players);
+
+            response = StringBuilderPool.Pool.ToStringReturn(builder);
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.CustomRoles/Commands/Give.cs b/EXILED/Exiled.CustomRoles/Commands/Give.cs
index 2f74b46498..9666bff990 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Give.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Give.cs
@@ -83,7 +83,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
 
                 string identifier = string.Join(" ", arguments.Skip(1));
 
-                switch (identifier)
+                switch (identifier.ToLower())
                 {
                     case "*":
                     case "all":
diff --git a/EXILED/Exiled.CustomRoles/Commands/Parent.cs b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
index f64facabec..fd42b5e497 100644
--- a/EXILED/Exiled.CustomRoles/Commands/Parent.cs
+++ b/EXILED/Exiled.CustomRoles/Commands/Parent.cs
@@ -41,12 +41,13 @@ public override void LoadGeneratedCommands()
             RegisterCommand(Give.Instance);
             RegisterCommand(Info.Instance);
             RegisterCommand(List.List.Instance);
+            RegisterCommand(Get.Instance);
         }
 
         /// <inheritdoc/>
         protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            response = "Invalid subcommand! Available: give, info, list";
+            response = "Invalid subcommand! Available: give, info, list, get";
             return false;
         }
     }
diff --git a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
index 78b2030580..cd1a8b4769 100644
--- a/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
+++ b/EXILED/Exiled.CustomRoles/Exiled.CustomRoles.csproj
@@ -49,4 +49,4 @@
         <PostBuildEvent>if [[ ! -z "$EXILED_DEV_REFERENCES" ]]; then cp "$(OutputPath)$(AssemblyName).dll" "$EXILED_DEV_REFERENCES/Plugins/"; fi</PostBuildEvent>
     </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Commands/TpsCommand.cs b/EXILED/Exiled.Events/Commands/TpsCommand.cs
index 722de3b61e..14c0def05e 100644
--- a/EXILED/Exiled.Events/Commands/TpsCommand.cs
+++ b/EXILED/Exiled.Events/Commands/TpsCommand.cs
@@ -15,7 +15,6 @@ namespace Exiled.Events.Commands
     /// <summary>
     /// Command for showing current server TPS.
     /// </summary>
-    [CommandHandler(typeof(RemoteAdminCommandHandler))]
     [CommandHandler(typeof(GameConsoleCommandHandler))]
     public class TpsCommand : ICommand
     {
@@ -31,7 +30,7 @@ public class TpsCommand : ICommand
         /// <inheritdoc />
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            double diff = Server.Tps / Server.MaxTps;
+            double diff = Server.SmoothTps / Server.MaxTps;
             string color = diff switch
             {
                 > 0.9 => "green",
@@ -39,7 +38,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 _ => "red"
             };
 
-            response = $"<color={color}>{Server.Tps}/{Server.MaxTps}</color>";
+            response = $"<color={color}>{Server.SmoothTps}/{Server.MaxTps}</color>";
             return true;
         }
     }
diff --git a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
index a8b986c171..abd2f4877f 100644
--- a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs
@@ -7,39 +7,70 @@
 
 namespace Exiled.Events.EventArgs.Cassie
 {
+    using System;
+    using System.Text;
+
+    using Exiled.API.Features.Pools;
+    using global::Cassie;
     using Interfaces;
+    using Subtitles;
 
     /// <summary>
     /// Contains all the information after sending a C.A.S.S.I.E. message.
     /// </summary>
     public class SendingCassieMessageEventArgs : IDeniableEvent
     {
+        private readonly CassieAnnouncement announcement;
+        private readonly CassieTtsPayload payload;
+
+        private string customSubtitles;
+        private float glitchScale;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SendingCassieMessageEventArgs" /> class.
         /// </summary>
-        /// <param name="words">
-        /// <inheritdoc cref="Words" />
-        /// </param>
-        /// <param name="makeHold">
-        /// <inheritdoc cref="MakeHold" />
-        /// </param>
-        /// <param name="makeNoise">
-        /// <inheritdoc cref="MakeNoise" />
+        /// <param name="annc">The announcement to populate all properties from.</param>
+        /// <param name="isAllowed">
+        /// <inheritdoc cref="IsAllowed"/>
         /// </param>
-        /// <param name="customAnnouncement">
-        /// <inheritdoc cref="IsCustomAnnouncement" />
-        /// </param>
-        /// <param name="customSubtitles">
-        /// <inheritdoc cref="CustomSubtitles" />
-        /// </param>
-        /// <param name="isAllowed">Indicates whether the event can be executed.</param>
-        public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise, bool customAnnouncement, string customSubtitles, bool isAllowed = true)
+        public SendingCassieMessageEventArgs(CassieAnnouncement annc, bool isAllowed = true)
         {
-            Words = words;
-            CustomSubtitles = customSubtitles;
-            MakeHold = makeHold;
-            MakeNoise = makeNoise;
-            IsCustomAnnouncement = customAnnouncement;
+            announcement = annc;
+            payload = annc.Payload;
+
+            Words = payload.Content;
+            switch (payload.SubtitleSource)
+            {
+                case CassieTtsPayload.SubtitleMode.None:
+                case CassieTtsPayload.SubtitleMode.Automatic:
+                    CustomSubtitles = string.Empty;
+                    break;
+                case CassieTtsPayload.SubtitleMode.Custom:
+                    CustomSubtitles = payload._customSubtitle;
+                    break;
+                case CassieTtsPayload.SubtitleMode.FromTranslation:
+                    StringBuilder builder = StringBuilderPool.Pool.Get();
+                    SubtitleController controller = SubtitleController.Singleton;
+
+                    foreach (SubtitlePart part in payload._subtitleMessage.SubtitleParts)
+                    {
+                        Subtitle subtitle = controller.Subtitles[part.Subtitle];
+                        builder.Append(controller.GetTranslation(subtitle));
+                    }
+
+                    CustomSubtitles = StringBuilderPool.Pool.ToStringReturn(builder);
+
+                    break;
+                default:
+                    CustomSubtitles = string.Empty;
+                    break;
+            }
+
+            MakeHold = payload.PlayBackground;
+            GlitchScale = annc.GlitchScale;
+            MakeNoise = annc.GlitchScale is not 0;
+            SubtitleSource = payload.SubtitleSource;
+
             IsAllowed = isAllowed;
         }
 
@@ -51,13 +82,38 @@ public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise
         /// <summary>
         /// Gets or sets the message subtitles.
         /// </summary>
-        public string CustomSubtitles { get; set; }
+        public string CustomSubtitles
+        {
+            get => customSubtitles;
+            set
+            {
+                if (customSubtitles != value)
+                    SubtitleSource = CassieTtsPayload.SubtitleMode.Custom;
+
+                customSubtitles = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether the message should be held.
         /// </summary>
         public bool MakeHold { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value controlling how glitchy this CASSIE message is.
+        /// </summary>
+        public float GlitchScale
+        {
+            get => glitchScale;
+            set
+            {
+                if (!MakeNoise && value is not 0)
+                    MakeNoise = true;
+
+                glitchScale = value;
+            }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether the message should make noise.
         /// </summary>
@@ -69,8 +125,50 @@ public SendingCassieMessageEventArgs(string words, bool makeHold, bool makeNoise
         public bool IsAllowed { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the message can be sent.
+        /// Gets or sets a value indicating whether the event can be executed.
         /// </summary>
+        [Obsolete("Useless and will be removed in Exiled 10.")]
         public bool IsCustomAnnouncement { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating where the subtitles for this message came from.
+        /// </summary>
+        public CassieTtsPayload.SubtitleMode SubtitleSource { get; set; }
+
+        /// <summary>
+        /// Gets a <see cref="CassieAnnouncement"/> consisting of all properties in this event.
+        /// </summary>
+        public CassieAnnouncement Announcement
+        {
+            get
+            {
+                CassieTtsPayload newPayload;
+
+                // I love readonly fields :)
+                if (SubtitleSource is CassieTtsPayload.SubtitleMode.FromTranslation)
+                {
+                    newPayload = new CassieTtsPayload(Words, MakeHold, payload._subtitleMessage.SubtitleParts);
+                }
+                else
+                {
+                    if (SubtitleSource is CassieTtsPayload.SubtitleMode.Automatic)
+                        newPayload = new CassieTtsPayload(Words, true, MakeHold);
+                    else
+                        newPayload = new CassieTtsPayload(Words, CustomSubtitles, MakeHold);
+                }
+
+                return announcement switch
+                {
+                    CassieScpTerminationAnnouncement =>
+
+                        // this is disabled via patch b/c termination messages are not modifiable at the stage the SendCassieMessage patch is in.
+                        throw new InvalidOperationException("SendCassieMessage was called for a SCP termination message!"),
+
+                    CassieWaveAnnouncement waveAnnc => new CassieWaveAnnouncement(waveAnnc.Wave, newPayload),
+                    Cassie079RecontainAnnouncement recontainAnnc => new Cassie079RecontainAnnouncement(recontainAnnc._callback, false, newPayload),
+                    _ => new CassieAnnouncement(newPayload, 0, GlitchScale / (API.Features.Warhead.IsDetonated ? 2F : 1F) * (MakeNoise ? 1F : 0F)),
+                };
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
new file mode 100644
index 0000000000..fdd41cef5b
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IMarshmallowEvent.cs
@@ -0,0 +1,22 @@
+// -----------------------------------------------------------------------
+// <copyright file="IMarshmallowEvent.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Interfaces
+{
+    using Exiled.API.Features.Items;
+
+    /// <summary>
+    /// Represents all events related to the marshmallow man.
+    /// </summary>
+    public interface IMarshmallowEvent : IItemEvent
+    {
+        /// <summary>
+        /// Gets the marshmallow item related to this event.
+        /// </summary>
+        public Marshmallow Marshmallow { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
new file mode 100644
index 0000000000..616ad8f3e5
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp127Event.cs
@@ -0,0 +1,20 @@
+// -----------------------------------------------------------------------
+// <copyright file="IScp127Event.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Interfaces
+{
+    /// <summary>
+    /// Represents all events related to SCP-127.
+    /// </summary>
+    public interface IScp127Event : IItemEvent
+    {
+        /// <summary>
+        /// Gets the SCP-127 instance, related to this event.
+        /// </summary>
+        public API.Features.Items.Scp127 Scp127 { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
index 1d6dcf3add..acb2463878 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
@@ -14,7 +14,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Event args used for all <see cref="Scp1507Role"/> related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp1507Event : IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
index d8a5537257..fc62383340 100644
--- a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
+++ b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
@@ -12,7 +12,7 @@ namespace Exiled.Events.EventArgs.Interfaces
     /// <summary>
     /// Defines the base contract for all <see cref="Scp559Cake"/> related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp559Event : IExiledEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
new file mode 100644
index 0000000000..8e491ee0b1
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Item/CacklingEventArgs.cs
@@ -0,0 +1,50 @@
+// -----------------------------------------------------------------------
+// <copyright file="CacklingEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Item
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.MarshmallowMan;
+
+    /// <summary>
+    /// Contains all information before a marshmallow man punches.
+    /// </summary>
+    public class CacklingEventArgs : IMarshmallowEvent, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CacklingEventArgs"/> class.
+        /// </summary>
+        /// <param name="marshmallow">The marshmallow item of the player cackling.</param>
+        /// <param name="isAllowed">Whether the player is allowed to cackle.</param>
+        public CacklingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
+        {
+            Marshmallow = Item.Get<Marshmallow>(marshmallow);
+            Player = Marshmallow.Owner;
+            IsAllowed = isAllowed;
+        }
+
+        /// <summary>
+        /// Gets the player cackling.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <inheritdoc />
+        public API.Features.Items.Item Item => Marshmallow;
+
+        /// <summary>
+        /// Gets the marshmallow item of the player cackling.
+        /// </summary>
+        public Marshmallow Marshmallow { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the player is allowed to cackle.
+        /// </summary>
+        public bool IsAllowed { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
new file mode 100644
index 0000000000..d2d927d95a
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Item/PunchingEventArgs.cs
@@ -0,0 +1,50 @@
+// -----------------------------------------------------------------------
+// <copyright file="PunchingEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Item
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.MarshmallowMan;
+
+    /// <summary>
+    /// Contains all information before a marshmallow man punches.
+    /// </summary>
+    public class PunchingEventArgs : IMarshmallowEvent, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PunchingEventArgs"/> class.
+        /// </summary>
+        /// <param name="marshmallow">The marshmallow item of the player attacking.</param>
+        /// <param name="isAllowed">Whether the player is allowed to punch.</param>
+        public PunchingEventArgs(MarshmallowItem marshmallow, bool isAllowed = true)
+        {
+            Marshmallow = Item.Get<Marshmallow>(marshmallow);
+            Player = Marshmallow.Owner;
+            IsAllowed = isAllowed;
+        }
+
+        /// <summary>
+        /// Gets the player punching.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <inheritdoc />
+        public Item Item => Marshmallow;
+
+        /// <summary>
+        /// Gets the marshmallow item of the player punching.
+        /// </summary>
+        public Marshmallow Marshmallow { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the punch is allowed.
+        /// </summary>
+        public bool IsAllowed { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
index 4c43eb1df8..d8d38cc474 100644
--- a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs
@@ -7,15 +7,13 @@
 
 namespace Exiled.Events.EventArgs.Map
 {
+    using System;
+
     using API.Features;
     using API.Features.DamageHandlers;
     using API.Features.Roles;
-
     using Interfaces;
 
-    using CustomAttackerHandler = API.Features.DamageHandlers.AttackerDamageHandler;
-    using DamageHandlerBase = PlayerStatsSystem.DamageHandlerBase;
-
     /// <summary>
     /// Contains all information before C.A.S.S.I.E announces an SCP termination.
     /// </summary>
@@ -27,16 +25,14 @@ public class AnnouncingScpTerminationEventArgs : IAttackerEvent, IDeniableEvent
         /// <param name="scp">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="damageHandlerBase">
-        /// <inheritdoc cref="DamageHandler" />
+        /// <param name="terminationCause">
+        /// <inheritdoc cref="TerminationCause"/>
         /// </param>
-        public AnnouncingScpTerminationEventArgs(Player scp, DamageHandlerBase damageHandlerBase)
+        public AnnouncingScpTerminationEventArgs(Player scp, string terminationCause)
         {
             Player = scp;
             Role = scp.Role;
-            DamageHandler = new CustomDamageHandler(scp, damageHandlerBase);
-            Attacker = DamageHandler.BaseIs(out CustomAttackerHandler customAttackerHandler) ? customAttackerHandler.Attacker : null;
-            TerminationCause = damageHandlerBase.CassieDeathAnnouncement.Announcement;
+            TerminationCause = terminationCause;
             IsAllowed = true;
         }
 
@@ -58,11 +54,13 @@ public AnnouncingScpTerminationEventArgs(Player scp, DamageHandlerBase damageHan
         /// <summary>
         /// Gets the player who killed the SCP.
         /// </summary>
+        [Obsolete("Attacker can no longer be acquired for this event. This will be readded in a different event.")]
         public Player Attacker { get; }
 
         /// <summary>
         /// Gets or sets the <see cref="CustomDamageHandler" />.
         /// </summary>
+        [Obsolete("DamageHandler can no longer be acquired for this event. This will be readded in a different event.")]
         public CustomDamageHandler DamageHandler { get; set; }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
index 168a0f578e..038a3e16c4 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/ReceivingEffectEventArgs.cs
@@ -18,8 +18,6 @@ namespace Exiled.Events.EventArgs.Player
     /// </summary>
     public class ReceivingEffectEventArgs : IPlayerEvent, IDeniableEvent
     {
-        private byte intensity;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ReceivingEffectEventArgs" /> class.
         /// </summary>
@@ -32,9 +30,9 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         {
             Player = player;
             Effect = effect;
-            this.intensity = intensity;
+            Intensity = intensity;
             CurrentIntensity = currentIntensity;
-            Duration = duration;
+            Duration = intensity is 0 ? 0 : duration;
         }
 
         /// <summary>
@@ -53,20 +51,9 @@ public ReceivingEffectEventArgs(Player player, StatusEffectBase effect, byte int
         public float Duration { get; set; } = 0;
 
         /// <summary>
-        /// Gets or sets the value of the new intensity of the effect. Setting this to <c>0</c> is the same as setting IsAllowed to
-        /// <see langword="false" />.
+        /// Gets or sets the value of the new intensity of the effect.
         /// </summary>
-        public byte Intensity
-        {
-            get => intensity;
-            set
-            {
-                intensity = value;
-
-                if (intensity == 0)
-                    IsAllowed = false;
-            }
-        }
+        public byte Intensity { get; set; }
 
         /// <summary>
         /// Gets the value of the intensity of this effect on the player.
diff --git a/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
new file mode 100644
index 0000000000..6dce01109c
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Player/Scp1576TransmissionEndedEventArgs.cs
@@ -0,0 +1,41 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp1576TransmissionEndedEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Player
+{
+    using API.Features;
+    using API.Features.Items;
+    using Interfaces;
+    using InventorySystem.Items.Usables.Scp1576;
+
+    /// <summary>
+    /// Contains all information after a SCP-1576 transmission has ended.
+    /// </summary>
+    public class Scp1576TransmissionEndedEventArgs : IPlayerEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Scp1576TransmissionEndedEventArgs"/> class.
+        /// </summary>
+        /// <param name="player"><inheritdoc cref="Player"/></param>
+        /// <param name="scp1576Item"><inheritdoc cref="Scp1576"/></param>
+        public Scp1576TransmissionEndedEventArgs(Player player, Scp1576Item scp1576Item)
+        {
+            Player = player;
+            Scp1576 = Item.Get<Scp1576>(scp1576Item);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Exiled.API.Features.Player"/> that the transmission ended for.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Exiled.API.Features.Items.Scp1576"/> instance.
+        /// </summary>
+        public Exiled.API.Features.Items.Scp1576 Scp1576 { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
index e25e9fd728..c6aeed7ffb 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/UsedItemEventArgs.cs
@@ -28,10 +28,14 @@ public class UsedItemEventArgs : IPlayerEvent, IUsableEvent
         /// <param name="item">
         /// <inheritdoc cref="Item" />
         /// </param>
-        public UsedItemEventArgs(ReferenceHub player, UsableItem item)
+        /// <param name="causedByHolstering">
+        /// <inheritdoc cref="CausedByHolstering"/>
+        /// </param>
+        public UsedItemEventArgs(ReferenceHub player, UsableItem item, bool causedByHolstering)
         {
             Player = Player.Get(player);
-            Usable = Item.Get(item) is Usable usable ? usable : null;
+            Usable = Item.Get(item) as Usable;
+            CausedByHolstering = causedByHolstering;
         }
 
         /// <summary>
@@ -46,5 +50,11 @@ public UsedItemEventArgs(ReferenceHub player, UsableItem item)
         /// Gets the player who used the item.
         /// </summary>
         public Player Player { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this event was triggered by a player switching items (true) or by waiting after using the item (false).
+        /// </summary>
+        /// <remarks>Use this value if you wish to keep the bug where you could switch items quickly to skip this event.</remarks>
+        public bool CausedByHolstering { get; }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
new file mode 100644
index 0000000000..533ccbb5ce
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/GainedExperienceEventArgs.cs
@@ -0,0 +1,51 @@
+// -----------------------------------------------------------------------
+// <copyright file="GainedExperienceEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information before SCP-127 gains experience.
+    /// </summary>
+    public class GainedExperienceEventArgs : IScp127Event
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GainedExperienceEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="experience"><inheritdoc cref="Experience"/></param>
+        public GainedExperienceEventArgs(Scp127 scp127, float experience)
+        {
+            Scp127 = scp127;
+            Experience = experience;
+            Tier = Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
+        }
+
+        /// <inheritdoc />
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc />
+        public Item Item => Scp127;
+
+        /// <inheritdoc />
+        public Scp127 Scp127 { get; }
+
+        /// <summary>
+        /// Gets the experience that SCP-127 has gained.
+        /// </summary>
+        public float Experience { get; }
+
+        /// <summary>
+        /// Gets the tier.
+        /// </summary>
+        public Scp127Tier Tier { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
new file mode 100644
index 0000000000..6a1d7b738b
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/GainingExperienceEventArgs.cs
@@ -0,0 +1,59 @@
+// -----------------------------------------------------------------------
+// <copyright file="GainingExperienceEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information before SCP-127 gains experience.
+    /// </summary>
+    public class GainingExperienceEventArgs : IScp127Event, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GainingExperienceEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="experience"><inheritdoc cref="Experience"/></param>
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public GainingExperienceEventArgs(Scp127 scp127, float experience, bool isAllowed = true)
+        {
+            Scp127 = scp127;
+            Experience = experience;
+            IsAllowed = isAllowed;
+        }
+
+        /// <inheritdoc />
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc />
+        public Item Item => Scp127;
+
+        /// <inheritdoc />
+        public Scp127 Scp127 { get; }
+
+        /// <inheritdoc />
+        public bool IsAllowed { get; set; }
+
+        /// <summary>
+        /// Gets or sets the gaining experience.
+        /// </summary>
+        public float Experience { get; set; }
+
+        /// <summary>
+        /// Gets or sets the new tier.
+        /// </summary>
+        public Scp127Tier Tier
+        {
+            get => Scp127.TierManagerModule.GetTierForExp(Experience + Scp127.Experience);
+            set => Experience = Scp127.TierManagerModule.GetExpForTier(value) - Scp127.Experience;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
new file mode 100644
index 0000000000..10810403d5
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/TalkedEventArgs.cs
@@ -0,0 +1,52 @@
+// -----------------------------------------------------------------------
+// <copyright file="TalkedEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information after SCP-127 voice line is played.
+    /// </summary>
+    public class TalkedEventArgs : IScp127Event
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TalkedEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
+        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
+        public TalkedEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority)
+        {
+            Scp127 = scp127;
+            VoiceLine = voiceLine;
+            Priority = voiceLinePriority;
+        }
+
+        /// <inheritdoc/>
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc/>
+        public Item Item => Scp127;
+
+        /// <inheritdoc/>
+        public Scp127 Scp127 { get; }
+
+        /// <summary>
+        /// Gets a voice line which is played.
+        /// </summary>
+        public Scp127VoiceLinesTranslation VoiceLine { get; }
+
+        /// <summary>
+        /// Gets a priority for this play.
+        /// </summary>
+        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
new file mode 100644
index 0000000000..b8934566a8
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp127/TalkingEventArgs.cs
@@ -0,0 +1,57 @@
+// -----------------------------------------------------------------------
+// <copyright file="TalkingEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp127
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+    /// <summary>
+    /// Contains all information before SCP-127 voice line is played.
+    /// </summary>
+    public class TalkingEventArgs : IScp127Event, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TalkingEventArgs"/> class.
+        /// </summary>
+        /// <param name="scp127"><inheritdoc cref="Scp127"/></param>
+        /// <param name="voiceLine"><inheritdoc cref="VoiceLine"/></param>
+        /// <param name="voiceLinePriority"><inheritdoc cref="Priority"/></param>
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public TalkingEventArgs(Scp127 scp127, Scp127VoiceLinesTranslation voiceLine, Scp127VoiceTriggerBase.VoiceLinePriority voiceLinePriority, bool isAllowed = true)
+        {
+            Scp127 = scp127;
+            VoiceLine = voiceLine;
+            Priority = voiceLinePriority;
+            IsAllowed = isAllowed;
+        }
+
+        /// <inheritdoc/>
+        public Player Player => Scp127.Owner;
+
+        /// <inheritdoc/>
+        public Item Item => Scp127;
+
+        /// <inheritdoc/>
+        public Scp127 Scp127 { get; }
+
+        /// <inheritdoc/>
+        public bool IsAllowed { get; set; }
+
+        /// <summary>
+        /// Gets or sets a voice line which is played.
+        /// </summary>
+        public Scp127VoiceLinesTranslation VoiceLine { get; set; }
+
+        /// <summary>
+        /// Gets or sets a priority for this play.
+        /// </summary>
+        public Scp127VoiceTriggerBase.VoiceLinePriority Priority { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
index c58330e252..c6ea947e55 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
@@ -18,7 +18,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 attacks door.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class AttackingDoorEventArgs : IScp1507Event, IDeniableEvent, IDoorEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
index ae5ebb8450..7ab56f98e2 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class ScreamingEventArgs : IScp1507Event, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
index 376eba5abf..5cc50f9352 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
@@ -19,7 +19,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before flamingos get spawned.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningFlamingosEventArgs : IDeniableEvent, IPlayerEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
index 0121d02d95..10b713052e 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class UsingTapeEventArgs : IPlayerEvent, IItemEvent, IDeniableEvent
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
new file mode 100644
index 0000000000..d4935e6c92
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Scp2536/FoundPositionEventArgs.cs
@@ -0,0 +1,40 @@
+// -----------------------------------------------------------------------
+// <copyright file="FoundPositionEventArgs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Scp2536
+{
+    using Christmas.Scp2536;
+    using Exiled.API.Features;
+    using Exiled.Events.EventArgs.Interfaces;
+
+    /// <summary>
+    /// Contains all information after SCP-2536 chooses target for spawning.
+    /// </summary>
+    public class FoundPositionEventArgs : IPlayerEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FoundPositionEventArgs"/> class.
+        /// </summary>
+        /// <param name="player"><inheritdoc cref="Player"/></param>
+        /// <param name="spawnpoint"><inheritdoc cref="Spawnpoint"/></param>
+        public FoundPositionEventArgs(Player player, Scp2536Spawnpoint spawnpoint)
+        {
+            Player = player;
+            Spawnpoint = spawnpoint;
+        }
+
+        /// <summary>
+        /// Gets the player near whom SCP-2536 will spawn.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <summary>
+        /// Gets or sets the spawn point where SCP will spawn.
+        /// </summary>
+        public Scp2536Spawnpoint Spawnpoint { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
index b8b99f9ac9..1a4a7408dc 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
@@ -15,7 +15,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before a player interacts with SCP-559.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerEvent
     {
         /// <summary>
@@ -23,12 +23,11 @@ public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerE
         /// </summary>
         /// <param name="scp559"><inheritdoc cref="Scp559"/></param>
         /// <param name="player"><inheritdoc cref="Player"/></param>
-        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
-        public InteractingScp559EventArgs(Scp559 scp559, Player player, bool isAllowed = true)
+        public InteractingScp559EventArgs(Scp559 scp559, Player player)
         {
             Player = player;
             Scp559 = scp559;
-            IsAllowed = isAllowed;
+            IsAllowed = scp559.RemainingSlices > 0 && PlayerRoles.PlayerRolesUtils.IsHuman(player.Role.Type);
         }
 
         /// <inheritdoc/>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
index 6e3a81f06a..c83baddd2c 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
@@ -16,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp559
     /// <summary>
     /// Contains all information before SCP-559 spawns.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningEventArgs : IDeniableEvent, IScp559Event
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Events.cs b/EXILED/Exiled.Events/Events.cs
index a1bdd040a2..adae6e21a8 100644
--- a/EXILED/Exiled.Events/Events.cs
+++ b/EXILED/Exiled.Events/Events.cs
@@ -21,6 +21,7 @@ namespace Exiled.Events
     using PlayerRoles.FirstPersonControl.NetworkMessages;
     using PlayerRoles.Ragdolls;
     using PlayerRoles.RoleAssign;
+
     using Respawning;
     using UnityEngine.SceneManagement;
     using UserSettings.ServerSpecific;
@@ -73,6 +74,7 @@ public override void OnEnabled()
             Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
             Handlers.Map.ChangedIntoGrenade += Handlers.Internal.ExplodingGrenade.OnChangedIntoGrenade;
+            Handlers.Warhead.Detonated += Handlers.Internal.Round.OnWarheadDetonated;
 
             RoleAssigner.OnPlayersSpawned += Handlers.Server.OnAllPlayersSpawned;
             CharacterClassManager.OnRoundStarted += Handlers.Server.OnRoundStarted;
@@ -95,6 +97,11 @@ public override void OnEnabled()
 
             FpcServerPositionDistributor.RoleSyncEvent += Handlers.Internal.Round.OnRoleSyncEvent;
 
+            LabApi.Events.Handlers.Scp127Events.Talking += Handlers.Scp127.OnTalking;
+            LabApi.Events.Handlers.Scp127Events.Talked += Handlers.Scp127.OnTalked;
+            LabApi.Events.Handlers.Scp127Events.GainingExperience += Handlers.Scp127.OnGainingExperience;
+            LabApi.Events.Handlers.Scp127Events.GainExperience += Handlers.Scp127.OnGainedExperience;
+
             ServerConsole.ReloadServerName();
         }
 
@@ -135,6 +142,11 @@ public override void OnDisabled()
             LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon -= Handlers.Player.OnUnloadingWeapon;
 
             FpcServerPositionDistributor.RoleSyncEvent -= Handlers.Internal.Round.OnRoleSyncEvent;
+
+            LabApi.Events.Handlers.Scp127Events.Talking -= Handlers.Scp127.OnTalking;
+            LabApi.Events.Handlers.Scp127Events.Talked -= Handlers.Scp127.OnTalked;
+            LabApi.Events.Handlers.Scp127Events.GainingExperience -= Handlers.Scp127.OnGainingExperience;
+            LabApi.Events.Handlers.Scp127Events.GainExperience -= Handlers.Scp127.OnGainedExperience;
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 4cedb7a21e..26ff90342a 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -29,6 +29,7 @@ namespace Exiled.Events.Handlers.Internal
     using InventorySystem.Items.Firearms.Attachments.Components;
     using InventorySystem.Items.Usables;
     using InventorySystem.Items.Usables.Scp244.Hypothermia;
+    using InventorySystem.Items.Usables.Scp330;
     using Mirror;
     using PlayerRoles;
     using PlayerRoles.FirstPersonControl;
@@ -108,6 +109,9 @@ public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
             if (ev.Role.IsDead() || !ev.Role.IsFpcRole())
                 ev.IsAllowed = false;
+
+            if (ev.DamageHandlerBase is Exiled.Events.Patches.Fixes.FixMarshmallowManFF fixMarshamllowManFf)
+                ev.DamageHandlerBase = fixMarshamllowManFf.MarshmallowItem.NewDamageHandler;
         }
 
         /// <inheritdoc cref="Scp049.OnActivatingSense(ActivatingSenseEventArgs)" />
@@ -136,7 +140,7 @@ public static void OnVerified(VerifiedEventArgs ev)
             }
 
             // Fix bug that player that Join do not receive information about other players Scale
-            foreach (Player player in Player.Enumerable)
+            foreach (Player player in ReferenceHub.AllHubs.Select(Player.Get))
             {
                 player.SetFakeScale(player.Scale, new List<Player>() { ev.Player });
 
@@ -178,6 +182,13 @@ public static RoleTypeId OnRoleSyncEvent(ReferenceHub viewerHub, ReferenceHub ow
             return actualRole;
         }
 
+        /// <inheritdoc cref="Handlers.Warhead.OnDetonated()"/>
+        public static void OnWarheadDetonated()
+        {
+            // fix for black candy
+            CandyBlack.Outcomes.RemoveAll(outcome => outcome is TeleportOutcome);
+        }
+
         private static void GenerateAttachments()
         {
             foreach (FirearmType firearmType in EnumUtils<FirearmType>.Values)
diff --git a/EXILED/Exiled.Events/Handlers/Item.cs b/EXILED/Exiled.Events/Handlers/Item.cs
index 9ac83aafd3..b1ca257f09 100644
--- a/EXILED/Exiled.Events/Handlers/Item.cs
+++ b/EXILED/Exiled.Events/Handlers/Item.cs
@@ -89,6 +89,16 @@ public static class Item
         /// </summary>
         public static Event<JailbirdChangedWearStateEventArgs> JailbirdChangedWearState { get; set; } = new();
 
+        /// <summary>
+        /// Invoked before a marshmallow man punches.
+        /// </summary>
+        public static Event<PunchingEventArgs> Punching { get; set; } = new();
+
+        /// <summary>
+        /// Invoked before a marshmallow man cackles.
+        /// </summary>
+        public static Event<CacklingEventArgs> Cackling { get; set; } = new();
+
         /// <summary>
         /// Called before the Jailbird's <see cref="InventorySystem.Items.Jailbird.JailbirdWearState"/> is changed.
         /// </summary>
@@ -173,5 +183,17 @@ public static class Item
         /// </summary>
         /// <param name="ev">The <see cref="InspectedItemEventArgs"/> instance.</param>
         public static void OnInspectedItem(InspectedItemEventArgs ev) => InspectedItem.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called before a marshmallow man punches.
+        /// </summary>
+        /// <param name="ev">The <see cref="PunchingEventArgs"/> instance.</param>
+        public static void OnPunching(PunchingEventArgs ev) => Punching.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called before a marshmallow man cackles.
+        /// </summary>
+        /// <param name="ev">The <see cref="CacklingEventArgs"/> instance.</param>
+        public static void OnCackling(CacklingEventArgs ev) => Cackling.InvokeSafely(ev);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs
index 97e6137003..998b54f813 100644
--- a/EXILED/Exiled.Events/Handlers/Player.cs
+++ b/EXILED/Exiled.Events/Handlers/Player.cs
@@ -621,6 +621,11 @@ public class Player
         /// </summary>
         public static Event<InteractingEmergencyButtonEventArgs> InteractingEmergencyButton { get; set; } = new();
 
+        /// <summary>
+        /// Invoked after transmission has ended.
+        /// </summary>
+        public static Event<Scp1576TransmissionEndedEventArgs> Scp1576TransmissionEnded { get; set; } = new();
+
         /// <summary>
         /// Called before a player's emotion changed.
         /// </summary>
@@ -1356,5 +1361,11 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item
         /// </summary>
         /// <param name="ev">The <see cref="InteractingEmergencyButtonEventArgs"/> instance.</param>
         public static void OnInteractingEmergencyButton(InteractingEmergencyButtonEventArgs ev) => InteractingEmergencyButton.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called after a 1576 transmisiion has ended.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp1576TransmissionEndedEventArgs"/> instance.</param>
+        public static void OnScp1576TransmissionEnded(Scp1576TransmissionEndedEventArgs ev) => Scp1576TransmissionEnded.InvokeSafely(ev);
     }
 }
diff --git a/EXILED/Exiled.Events/Handlers/Scp127.cs b/EXILED/Exiled.Events/Handlers/Scp127.cs
new file mode 100644
index 0000000000..b3f86534d3
--- /dev/null
+++ b/EXILED/Exiled.Events/Handlers/Scp127.cs
@@ -0,0 +1,81 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Handlers
+{
+    using Exiled.Events.EventArgs.Scp127;
+    using Exiled.Events.Features;
+    using LabApi.Events.Arguments.Scp127Events;
+
+#pragma warning disable SA1623
+    /// <summary>
+    /// SCP-127 event handlers.
+    /// </summary>
+    public static class Scp127
+    {
+        /// <summary>
+        /// Invoked before SCP-127 voice line is played.
+        /// </summary>
+        public static Event<TalkingEventArgs> Talking { get; set; } = new();
+
+        /// <summary>
+        /// Invoked after SCP-127 voice line is played.
+        /// </summary>
+        public static Event<TalkedEventArgs> Talked { get; set; } = new();
+
+        /// <summary>
+        /// Invoked before SCP-127 gains experience.
+        /// </summary>
+        public static Event<GainingExperienceEventArgs> GainingExperience { get; set; } = new();
+
+        /// <summary>
+        /// Invoked after SCP-127 gains experience.
+        /// </summary>
+        public static Event<GainedExperienceEventArgs> GainedExperience { get; set; } = new();
+
+        /// <summary>
+        /// Called before SCP-127 voice line is played.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127TalkingEventArgs"/> instance.</param>
+        public static void OnTalking(Scp127TalkingEventArgs ev)
+        {
+            TalkingEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority, ev.IsAllowed);
+            Talking.InvokeSafely(eventArgs);
+
+            ev.Priority = eventArgs.Priority;
+            ev.VoiceLine = eventArgs.VoiceLine;
+            ev.IsAllowed = eventArgs.IsAllowed;
+        }
+
+        /// <summary>
+        /// Called after SCP-127 voice line is played.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127TalkedEventArgs"/> instance.</param>
+        public static void OnTalked(Scp127TalkedEventArgs ev)
+            => Talked.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.VoiceLine, ev.Priority));
+
+        /// <summary>
+        /// Called before SCP-127 gains experience.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127GainingExperienceEventArgs"/> instance.</param>
+        public static void OnGainingExperience(Scp127GainingExperienceEventArgs ev)
+        {
+            GainingExperienceEventArgs eventArgs = new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain, ev.IsAllowed);
+            GainingExperience.InvokeSafely(eventArgs);
+
+            ev.ExperienceGain = eventArgs.Experience;
+            ev.IsAllowed = eventArgs.IsAllowed;
+        }
+
+        /// <summary>
+        /// Called after SCP-127 gains experience.
+        /// </summary>
+        /// <param name="ev">The <see cref="Scp127GainExperienceEventArgs"/> instance.</param>
+        public static void OnGainedExperience(Scp127GainExperienceEventArgs ev) =>
+            GainedExperience.InvokeSafely(new(API.Features.Items.Item.Get<API.Features.Items.Scp127>(ev.Scp127Item.Base), ev.ExperienceGain));
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Handlers/Scp1507.cs b/EXILED/Exiled.Events/Handlers/Scp1507.cs
index 63e4536d2c..f36b16d633 100644
--- a/EXILED/Exiled.Events/Handlers/Scp1507.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp1507.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// SCP-1507 related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp1507
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp2536.cs b/EXILED/Exiled.Events/Handlers/Scp2536.cs
index 3f7dfd1c58..8c0d272583 100644
--- a/EXILED/Exiled.Events/Handlers/Scp2536.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp2536.cs
@@ -21,6 +21,11 @@ public static class Scp2536
         /// </summary>
         public static Event<FindingPositionEventArgs> FindingPosition { get; set; } = new();
 
+        /// <summary>
+        /// Invoked once SCP-2536 has found a spawn location.
+        /// </summary>
+        public static Event<FoundPositionEventArgs> FoundPosition { get; set; } = new();
+
         /// <summary>
         /// Invoked before SCP-2536 gives a gift to a player.
         /// </summary>
@@ -37,6 +42,12 @@ public static class Scp2536
         /// <param name="ev">The <see cref="FindingPositionEventArgs"/> instance.</param>
         public static void OnFindingPosition(FindingPositionEventArgs ev) => FindingPosition.InvokeSafely(ev);
 
+        /// <summary>
+        /// Called after SCP-2536 chooses a target.
+        /// </summary>
+        /// <param name="ev">The <see cref="FoundPositionEventArgs"/> instance.</param>
+        public static void OnFoundPosition(FoundPositionEventArgs ev) => FoundPosition.InvokeSafely(ev);
+
         /// <summary>
         /// Called before SCP-2536 gives a gift to a player.
         /// </summary>
diff --git a/EXILED/Exiled.Events/Handlers/Scp559.cs b/EXILED/Exiled.Events/Handlers/Scp559.cs
index b17f520c9d..70d5387520 100644
--- a/EXILED/Exiled.Events/Handlers/Scp559.cs
+++ b/EXILED/Exiled.Events/Handlers/Scp559.cs
@@ -17,7 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// All SCP-559 related events.
     /// </summary>
-    [Obsolete("Only availaible for Christmas and AprilFools.")]
+    // [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp559
     {
         /// <summary>
diff --git a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
index 0cb378ac02..1e7b55e3a8 100644
--- a/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Cassie/SendingCassieMessage.cs
@@ -8,87 +8,61 @@
 namespace Exiled.Events.Patches.Events.Cassie
 {
     using System.Collections.Generic;
+    using System.Linq;
     using System.Reflection.Emit;
 
     using API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Cassie;
-
+    using global::Cassie;
     using Handlers;
-
     using HarmonyLib;
     using Respawning;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="RespawnEffectsController.PlayCassieAnnouncement(string, bool, bool, bool, string)" />.
+    /// Patches <see cref="global::Cassie.CassieAnnouncementDispatcher.PlayNewAnnouncement(CassieAnnouncement)" />.
     /// Adds the <see cref="Cassie.SendingCassieMessage" /> event.
     /// </summary>
     [EventPatch(typeof(Cassie), nameof(Cassie.SendingCassieMessage))]
-    [HarmonyPatch(typeof(RespawnEffectsController), nameof(RespawnEffectsController.PlayCassieAnnouncement))]
+    [HarmonyPatch(typeof(CassieAnnouncementDispatcher), nameof(CassieAnnouncementDispatcher.PlayNewAnnouncement))]
     internal static class SendingCassieMessage
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
+            Label skipLabel = generator.DefineLabel();
             Label returnLabel = generator.DefineLabel();
 
+            newInstructions[0].WithLabels(skipLabel);
+
             newInstructions.InsertRange(
                 0,
                 new CodeInstruction[]
                 {
-                    // words
                     new(OpCodes.Ldarg_0),
+                    new(OpCodes.Isinst, typeof(CassieScpTerminationAnnouncement)),
+                    new(OpCodes.Brtrue_S, skipLabel),
 
-                    // makeHold
-                    new(OpCodes.Ldarg_1),
-
-                    // makeNoise
-                    new(OpCodes.Ldarg_2),
-
-                    // customAnnouncement
-                    new(OpCodes.Ldarg_3),
-
-                    // customSubtitles
-                    new(OpCodes.Ldarg_S, 4),
+                    new(OpCodes.Ldarg_0),
 
                     // isAllowed
                     new(OpCodes.Ldc_I4_1),
 
-                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(string, bool, bool, bool, string, bool);
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs))[0]),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
+                    // SendingCassieMessageEventArgs ev = new SendingCassieMessageEventArgs(CassieAnnouncement, bool);
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SendingCassieMessageEventArgs)).Single(ctor => ctor.GetParameters().Length == 2)),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),
 
                     // Cassie.OnSendingCassieMessage(ev);
                     new(OpCodes.Call, Method(typeof(Cassie), nameof(Cassie.OnSendingCassieMessage))),
 
-                    // words = ev.Words
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Words))),
+                    // annc = ev.Announcement
+                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.Announcement))),
                     new(OpCodes.Starg_S, 0),
 
-                    // makeHold = ev.MakeHold
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeHold))),
-                    new(OpCodes.Starg_S, 1),
-
-                    // makeNoise = ev.MakeNoise
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.MakeNoise))),
-                    new(OpCodes.Starg_S, 2),
-
-                    // customAnnouncement = ev.IsCustomAnnouncement
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsCustomAnnouncement))),
-                    new(OpCodes.Starg_S, 3),
-
-                    // customSubtitles = ev.CustomSubtitles
-                    new(OpCodes.Call, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.CustomSubtitles))),
-                    new(OpCodes.Starg_S, 4),
-
                     // if (!IsAllowed)
                     //   return;
                     new(OpCodes.Callvirt, PropertyGetter(typeof(SendingCassieMessageEventArgs), nameof(SendingCassieMessageEventArgs.IsAllowed))),
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs b/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
new file mode 100644
index 0000000000..fec7811ecf
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Item/Cackling.cs
@@ -0,0 +1,65 @@
+// -----------------------------------------------------------------------
+// <copyright file="Cackling.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Item
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Item;
+    using HarmonyLib;
+    using InventorySystem.Items.MarshmallowMan;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
+    /// Adds the <see cref="Handlers.Item.Cackling" /> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Cackling))]
+    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCackle))]
+    public class Cackling
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label retLabel = generator.DefineLabel();
+
+            int offset = 1;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // this;
+                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // ev = new CacklingEventArgs(MarshmallowItem, bool);
+                new(OpCodes.Newobj, Constructor(typeof(CacklingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnCackling))),
+
+                // if (!ev.IsAllowed) return
+                new(OpCodes.Callvirt, PropertyGetter(typeof(CacklingEventArgs), nameof(CacklingEventArgs.IsAllowed))),
+                new(OpCodes.Brfalse_S, retLabel),
+            });
+
+            newInstructions[newInstructions.Count - 1].WithLabels(retLabel);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs b/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
new file mode 100644
index 0000000000..15c74b57b1
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Item/Punching.cs
@@ -0,0 +1,65 @@
+// -----------------------------------------------------------------------
+// <copyright file="Punching.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Item
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Item;
+    using HarmonyLib;
+    using InventorySystem.Items.MarshmallowMan;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patch the <see cref="MarshmallowItem.ServerProcessCmd" />.
+    /// Adds the <see cref="Handlers.Item.Punching" /> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.Punching))]
+    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerProcessCmd))]
+    public class Punching
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label retLabel = generator.DefineLabel();
+
+            int offset = 1;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
+
+            newInstructions[^1].WithLabels(retLabel);
+
+            newInstructions.InsertRange(index, new[]
+            {
+                // this;
+                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // ev = new PunchingEventArgs(MarshmallowItem, bool);
+                new(OpCodes.Newobj, Constructor(typeof(PunchingEventArgs), new[] { typeof(MarshmallowItem), typeof(bool) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Handlers.Item), nameof(Handlers.Item.OnPunching))),
+
+                // if (!ev.IsAllowed) return
+                new(OpCodes.Callvirt, PropertyGetter(typeof(PunchingEventArgs), nameof(PunchingEventArgs.IsAllowed))),
+                new(OpCodes.Brfalse_S, retLabel),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
index 0d53ebeefb..3033a0327d 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingChaosEntrance.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
+    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -17,11 +18,12 @@ namespace Exiled.Events.Patches.Events.Map
     using Exiled.Events.EventArgs.Map;
     using HarmonyLib;
     using Respawning.Announcements;
+    using Subtitles;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncementString"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncementString"/>
+    /// Patches <see cref="ChaosWaveAnnouncement.CreateAnnouncement"/> and <see cref="ChaosMiniwaveAnnouncement.CreateAnnouncement"/>
     /// to add <see cref="Handlers.Map.AnnouncingChaosEntrance"/> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
@@ -30,8 +32,8 @@ internal static class AnnouncingChaosEntrance
     {
         private static IEnumerable<MethodBase> TargetMethods()
         {
-            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncementString));
-            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncementString));
+            yield return Method(typeof(ChaosWaveAnnouncement), nameof(ChaosWaveAnnouncement.CreateAnnouncement));
+            yield return Method(typeof(ChaosMiniwaveAnnouncement), nameof(ChaosMiniwaveAnnouncement.CreateAnnouncement));
         }
 
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instruction, ILGenerator generator)
@@ -70,6 +72,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldarg_1),
                 new(OpCodes.Callvirt, Method(typeof(StringBuilder), nameof(StringBuilder.Clear))),
                 new(OpCodes.Pop),
+                new(OpCodes.Ldarg_3),
+                new(OpCodes.Call, Method(typeof(Array), nameof(Array.Empty), new Type[] { }, new[] { typeof(SubtitlePart) })),
+                new(OpCodes.Stind_Ref),
                 new(OpCodes.Ret),
 
                 new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel),
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
index bf59ef0103..75cf10177c 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfEntrance.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
+    using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -23,11 +24,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncementString" />
+    /// Patch the <see cref="NtfWaveAnnouncement.CreateAnnouncement" />
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncementString))]
+    [HarmonyPatch(typeof(NtfWaveAnnouncement), nameof(NtfWaveAnnouncement.CreateAnnouncement))]
     internal static class AnnouncingNtfEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -39,8 +40,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = 1;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_3) + offset;
+            int offset = 2;
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie)))) + offset;
 
             newInstructions.InsertRange(
                 index,
@@ -50,10 +51,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_2),
+                    new(OpCodes.Ldloc_3),
 
-                    // string[] unitInformation = unitNameClear.Split('-');
-                    new(OpCodes.Ldloc_1),
+                    // string[] unitInformation = lastGeneratedName.Split('-');
+                    new(OpCodes.Ldloc_2),
                     new(OpCodes.Ldstr, "<[^>]*?>"),
                     new(OpCodes.Ldsfld, Field(typeof(string), nameof(string.Empty))),
                     new(OpCodes.Call, Method(typeof(Regex), nameof(Regex.Replace), new System.Type[] { typeof(string), typeof(string), typeof(string) })),
@@ -63,9 +64,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldc_I4_0),
                     new(OpCodes.Ldc_I4_S, 45),
                     new(OpCodes.Stelem_I2),
-                    new(OpCodes.Call, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
+                    new(OpCodes.Callvirt, Method(typeof(string), nameof(string.Split), new[] { typeof(char[]) })),
 
-                    // AnnouncingNtfEntranceEventArgs ev = new(scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
+                    // AnnouncingNtfEntranceEventArgs ev = new(this, scpsLeft, unitInformation[0], int.Parse(unitInformation[1]));
                     //
                     // Map.OnAnnouncingNtfEntrance(ev);
                     new(OpCodes.Dup),
@@ -98,14 +99,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Box, typeof(int)),
                     new(OpCodes.Call, Method(typeof(string), nameof(string.Format), new[] { typeof(string), typeof(object), typeof(object) })),
                     new(OpCodes.Dup),
-                    new(OpCodes.Stloc_1),
-                    new(OpCodes.Callvirt, Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie))),
                     new(OpCodes.Stloc_2),
+                    new(OpCodes.Callvirt, Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TranslateToCassie))),
+                    new(OpCodes.Stloc_3),
 
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_2),
+                    new(OpCodes.Stloc_3),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
index 8bb3389fdd..018362acde 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingNtfMiniEntrance.cs
@@ -20,11 +20,11 @@ namespace Exiled.Events.Patches.Events.Map
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncementString"/>
+    /// Patch the <see cref="NtfMiniwaveAnnouncement.CreateAnnouncement"/>
     /// Adds the <see cref="Map.AnnouncingNtfEntrance" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingNtfEntrance))]
-    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncementString))]
+    [HarmonyPatch(typeof(NtfMiniwaveAnnouncement), nameof(NtfMiniwaveAnnouncement.CreateAnnouncement))]
     internal static class AnnouncingNtfMiniEntrance
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
@@ -35,15 +35,17 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_1) + 1;
+
             newInstructions.InsertRange(
-                0,
+                index,
                 new CodeInstruction[]
                 {
                     // WaveAnnouncementBase
                     new(OpCodes.Ldarg_0),
 
                     // scpsLeft
-                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Ldloc_1),
 
                     // null
                     new(OpCodes.Ldnull),
@@ -66,7 +68,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     // scpsLeft = ev.ScpsLeft;
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingNtfEntranceEventArgs), nameof(AnnouncingNtfEntranceEventArgs.ScpsLeft))),
-                    new(OpCodes.Stloc_0),
+                    new(OpCodes.Stloc_1),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
index 71363142ff..5064239e03 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
@@ -7,78 +7,102 @@
 
 namespace Exiled.Events.Patches.Events.Map
 {
+    using System;
+    using System.Collections;
     using System.Collections.Generic;
-    using System.Reflection;
     using System.Reflection.Emit;
 
-    using API.Features.DamageHandlers;
     using API.Features.Pools;
+    using Exiled.API.Features;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Map;
     using Exiled.Events.Handlers;
-
+    using Footprinting;
+    using global::Cassie;
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
 
+    using Map = Exiled.Events.Handlers.Map;
     using Player = API.Features.Player;
 
     /// <summary>
     /// Patches
-    /// <see cref="NineTailedFoxAnnouncer.AnnounceScpTermination(ReferenceHub, PlayerStatsSystem.DamageHandlerBase)" />.
+    /// <see cref="CassieScpTerminationAnnouncement.OnStartedPlaying()" />.
     /// Adds the <see cref="Map.AnnouncingScpTermination" /> event.
     /// </summary>
     [EventPatch(typeof(Map), nameof(Map.AnnouncingScpTermination))]
-    [HarmonyPatch(typeof(NineTailedFoxAnnouncer), nameof(NineTailedFoxAnnouncer.AnnounceScpTermination))]
+    [HarmonyPatch(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.OnStartedPlaying))]
     internal static class AnnouncingScpTermination
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            LocalBuilder ev = generator.DeclareLocal(typeof(AnnouncingScpTerminationEventArgs));
+            LocalBuilder cause = generator.DeclareLocal(typeof(string));
+            LocalBuilder enumerator = generator.DeclareLocal(typeof(IEnumerator<Footprint>));
+
+            ExceptionBlock beginTry = new(ExceptionBlockType.BeginExceptionBlock);
+            ExceptionBlock beginFinally = new(ExceptionBlockType.BeginFinallyBlock);
+            ExceptionBlock endFinally = new(ExceptionBlockType.EndExceptionBlock);
 
             Label ret = generator.DefineLabel();
+            Label entryLabel = generator.DefineLabel();
+            Label loopLabel = generator.DefineLabel();
+            Label leaveLabel = generator.DefineLabel();
+            Label endFinallyLabel = generator.DefineLabel();
+
+            int offset = -1;
+            int index = newInstructions.FindIndex(i => i.LoadsField(Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts)))) + offset;
+
+            newInstructions.RemoveRange(index, 2);
+            newInstructions.Insert(index, new CodeInstruction(OpCodes.Ldloc_S, cause));
 
-            int offset = -4;
-            int index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.CassieQueuingScpTerminationEventArgs))[0]) + offset;
+            newInstructions[0].WithLabels(leaveLabel);
 
             newInstructions.InsertRange(
-                index,
+                0,
                 new[]
-                {
-                    // Player.Get(scp)
-                    new CodeInstruction(OpCodes.Ldarg_0),
-                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
-
-                    // hit
-                    new(OpCodes.Ldarg_1),
-
-                    // AnnouncingScpTerminationEventArgs ev = new(Player, DamageHandlerBase)
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(AnnouncingScpTerminationEventArgs))[0]),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Dup),
-                    new(OpCodes.Stloc_S, ev.LocalIndex),
-
-                    // Map.OnAnnouncingScpTermination(ev)
-                    new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
-
-                    // if (!ev.IsAllowed)
-                    //    return;
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.IsAllowed))),
-                    new(OpCodes.Brfalse_S, ret),
-
-                    // hit = ev.DamageHandler.Base
-                    new(OpCodes.Ldloc_S, ev.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.DamageHandler))),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(CustomDamageHandler), nameof(CustomDamageHandler.Base))),
-                    new(OpCodes.Starg, 1),
-
-                    // announcement = ev.TerminationCause
-                    new(OpCodes.Ldloc_S, ev.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
-                    new(OpCodes.Stloc_0),
-                });
+            {
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Ldfld, Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._announcementTts))),
+                new(OpCodes.Stloc_S, cause),
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement.Victims))),
+                new(OpCodes.Callvirt, Method(typeof(IEnumerable<Footprint>), nameof(IEnumerable<Footprint>.GetEnumerator))),
+                new(OpCodes.Stloc_S, enumerator),
+
+                // start of try
+                new CodeInstruction(OpCodes.Br_S, entryLabel).WithBlocks(beginTry),
+
+                // start of loop
+                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(loopLabel),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(IEnumerator<Footprint>), nameof(IEnumerator<Footprint>.Current))),
+                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(Footprint) })),
+                new(OpCodes.Ldloc_S, cause),
+                new(OpCodes.Newobj, Constructor(typeof(AnnouncingScpTerminationEventArgs), new[] { typeof(Player), typeof(string) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
+                new(OpCodes.Stloc_S, cause),
+
+                // entry point
+                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(entryLabel),
+                new(OpCodes.Callvirt, Method(typeof(IEnumerator), nameof(IEnumerator.MoveNext))),
+                new(OpCodes.Brtrue_S, loopLabel),
+
+                // end of loop
+                new(OpCodes.Leave, leaveLabel),
+
+                // begin finally
+                new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithBlocks(beginFinally),
+                new(OpCodes.Brfalse, endFinallyLabel),
+                new(OpCodes.Ldloc_S, enumerator),
+                new(OpCodes.Callvirt, Method(typeof(IDisposable), nameof(IDisposable.Dispose))),
+
+                // end of finally
+                new CodeInstruction(OpCodes.Endfinally).WithLabels(endFinallyLabel).WithBlocks(endFinally),
+            });
 
             newInstructions[newInstructions.Count - 1].labels.Add(ret);
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs b/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
deleted file mode 100644
index 7193f8d17f..0000000000
--- a/EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="AnnouncingTeamEntrance.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Events.Map
-{
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Reflection.Emit;
-    using System.Text;
-
-    using Exiled.API.Features.Pools;
-    using Exiled.Events.Attributes;
-    using Exiled.Events.EventArgs.Map;
-    using HarmonyLib;
-    using Respawning.Announcements;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="WaveAnnouncementBase.PlayAnnouncement"/> to prevent cassie from playing empty string.
-    /// </summary>
-    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingNtfEntrance))]
-    [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.AnnouncingChaosEntrance))]
-    [HarmonyPatch(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.PlayAnnouncement))]
-    internal static class AnnouncingTeamEntrance
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label returnLabel = generator.DefineLabel();
-
-            // the instruction that sends subtitles is called before stringReturn is created (and thus checked) so we need to move it so that empty (or disallowed) message's subtitles are not sent.
-            // this removes the Ldarg_0 and the CallVirt
-            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.SendSubtitles))));
-            CodeInstruction sendSubtitlesInstruction = newInstructions[index];
-            newInstructions.RemoveRange(index - 2, 3);
-
-            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldsfld);
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // if (stringReturn == "")
-                //     return;
-                new(OpCodes.Ldloc_S, 4),
-                new(OpCodes.Ldstr, string.Empty),
-                new(OpCodes.Ceq),
-                new(OpCodes.Brtrue_S, returnLabel),
-
-                // send subtitles before cassie message, but after our check.
-                new(OpCodes.Ldarg_0),
-                new(OpCodes.Ldarg_1),
-                sendSubtitlesInstruction,
-            });
-
-            newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
index b379bdec1a..4af8bd4e11 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/SpawningRoomConnector.cs
@@ -89,14 +89,13 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))));
-            List<Label> label = newInstructions[index].labels;
-
-            newInstructions.RemoveAt(index);
-
-            int offset = -1;
-            index = newInstructions.FindIndex(i => i.opcode == OpCodes.Newobj && (ConstructorInfo)i.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.ServerEvents.MapGeneratedEventArgs))[0]) + offset;
-            newInstructions.Insert(index, new CodeInstruction(OpCodes.Call, Method(typeof(RoomConnectorSpawnpointBase), nameof(RoomConnectorSpawnpointBase.SetupAllRoomConnectors))).WithLabels(label));
+            List<Label> labels = newInstructions[index].ExtractLabels();
+            List<CodeInstruction> codeInstructionsCopy = newInstructions.GetRange(index, 4);
+            newInstructions.RemoveRange(index, 4);
+            newInstructions[index].labels.AddRange(labels);
 
+            index = newInstructions.FindIndex(x => x.OperandIs(Field(typeof(SeedSynchronizer), nameof(SeedSynchronizer.MapGenerated))));
+            newInstructions.InsertRange(index, codeInstructionsCopy);
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
index 6f70c4b8b0..ac28cd901a 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
@@ -14,36 +14,34 @@ namespace Exiled.Events.Patches.Events.Player
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Player;
     using Exiled.Events.Handlers;
-
     using HarmonyLib;
-
+    using PlayerRoles.FirstPersonControl;
     using PlayerRoles.FirstPersonControl.Thirdperson;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="AnimatedCharacterModel.OnGrounded" />
+    /// Patches <see cref="FirstPersonMovementModule.IsGrounded" />
     /// Adds the <see cref="Player.Landing" /> event.
     /// </summary>
     [EventPatch(typeof(Player), nameof(Player.Landing))]
-    [HarmonyPatch(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.OnGrounded))]
+    [HarmonyPatch(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.IsGrounded), MethodType.Setter)]
     internal static class Landing
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            const int offset = -1;
-            int index = newInstructions.FindIndex(
-                instruction => instruction.Calls(Method(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.PlayFootstep)))) + offset;
+            const int offset = 2;
+            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Ldarg_1) + offset;
 
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
-                    // Player.Get(base.OwnerHub)
+                    // Player.Get(this.Hub)
                     new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(CharacterModel), nameof(CharacterModel.OwnerHub))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.Hub))),
                     new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // LandingEventArgs ev = new(Player)
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
index 9d22a80b67..707743a243 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/ReceivingStatusEffect.cs
@@ -23,9 +23,9 @@ namespace Exiled.Events.Patches.Events.Player
 
     /// <summary>
     /// Patches the <see cref="StatusEffectBase.Intensity"/> method.
-    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event.
+    /// Adds the <see cref="Handlers.Player.ReceivingEffect"/> event and fix NW Duration not being correctly set to 0 when effect is Reset.
     /// </summary>
-    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
+    // [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ReceivingEffect))]
     [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ForceIntensity))]
     internal static class ReceivingStatusEffect
     {
@@ -74,9 +74,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._intensity))),
 
-                    // this.Duration
+                    // this._timeLeft
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
+                    new(OpCodes.Ldfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
 
                     // ReceivingEventArgs ev = new(Player, StatusEffectBase, byte, byte, float)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ReceivingEffectEventArgs))[0]),
@@ -95,11 +95,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Intensity))),
                     new(OpCodes.Starg_S, 1),
 
-                    // this.Duration = ev.Duration
+                    // this._timeLeft = ev.Duration
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ReceivingEffectEventArgs), nameof(ReceivingEffectEventArgs.Duration))),
-                    new(OpCodes.Callvirt, PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Duration))),
+                    new(OpCodes.Stfld, Field(typeof(StatusEffectBase), nameof(StatusEffectBase._timeLeft))),
                 });
 
             newInstructions[newInstructions.Count - 1].WithLabels(returnLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs b/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
new file mode 100644
index 0000000000..2f81bec7c7
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Player/Scp1576TransmissionEnded.cs
@@ -0,0 +1,59 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp1576TransmissionEnded.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Player
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Player;
+    using HarmonyLib;
+    using InventorySystem.Items.Usables.Scp1576;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Scp1576Item.ServerStopTransmitting"/> to add <see cref="Handlers.Player.Scp1576TransmissionEnded"/> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.Scp1576TransmissionEnded))]
+    [HarmonyPatch(typeof(InventorySystem.Items.Usables.Scp1576.Scp1576Item), nameof(Scp1576Item.ServerStopTransmitting))]
+    public class Scp1576TransmissionEnded
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+                List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+                int index = newInstructions.Count - 1;
+
+                newInstructions.InsertRange(
+                    index,
+                    new[]
+                    {
+                        // Player.Get(base.Owner)
+                        new CodeInstruction(OpCodes.Ldarg_0),
+                        new CodeInstruction(OpCodes.Callvirt, PropertyGetter(typeof(Scp1576Item), nameof(Scp1576Item.Owner))),
+                        new CodeInstruction(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
+
+                        // this
+                        new CodeInstruction(OpCodes.Ldarg_0),
+
+                        // Scp1576TransmissionEndedEventArgs ev = new(Player, this)
+                        new CodeInstruction(OpCodes.Newobj, GetDeclaredConstructors(typeof(Scp1576TransmissionEndedEventArgs))[0]),
+
+                        // OnScp1576TransmissionEnded(ev)
+                        new CodeInstruction(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnScp1576TransmissionEnded))),
+                    });
+
+                for (int i = 0; i < newInstructions.Count; i++)
+                    yield return newInstructions[i];
+
+                ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs b/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
new file mode 100644
index 0000000000..d83af6e966
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Player/UsedItemByHolstering.cs
@@ -0,0 +1,58 @@
+// -----------------------------------------------------------------------
+// <copyright file="UsedItemByHolstering.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Player
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Player;
+    using HarmonyLib;
+    using InventorySystem.Items.Usables;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Consumable.OnHolstered" />.
+    /// Adds an alternative trigger of the <see cref="Handlers.Player.UsedItem" /> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.UsedItem))]
+    [HarmonyPatch(typeof(Consumable), nameof(Consumable.OnHolstered))]
+    public class UsedItemByHolstering
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            // after ServerRemoveSelf, which lines up with before the ret
+            newInstructions.InsertRange(newInstructions.Count - 1, new CodeInstruction[]
+            {
+                // this.Owner
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(Consumable), nameof(Consumable.Owner))),
+
+                // this (Consumable inherits UsableItem)
+                new(OpCodes.Ldarg_0),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // OnUsedItem(new UsedItemEventArgs(ReferenceHub, UsableItem, bool));
+                new(OpCodes.Newobj, Constructor(typeof(UsedItemEventArgs), new[] { typeof(ReferenceHub), typeof(UsableItem), typeof(bool) })),
+                new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnUsedItem))),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
index d2efcd3fd3..680bbbf0dd 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontaining.cs
@@ -31,17 +31,18 @@ internal class Recontaining
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
-            int index = 0;
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             LocalBuilder ev = generator.DeclareLocal(typeof(RecontainingEventArgs));
 
             Label returnLabel = generator.DefineLabel();
 
-            newInstructions.InsertRange(index, new CodeInstruction[]
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + 1;
+
+            newInstructions.InsertRange(index, new[]
             {
                 // RecontainingEventArgs ev = new(this._activatorGlass)
-                new(OpCodes.Ldarg_0),
+                new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
                 new(OpCodes.Ldfld, Field(typeof(Scp079Recontainer), nameof(Scp079Recontainer._activatorGlass))),
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RecontainingEventArgs))[0]),
                 new(OpCodes.Stloc_S, ev.LocalIndex),
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
new file mode 100644
index 0000000000..dd942042fb
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Events/Scp2536/FoundPosition.cs
@@ -0,0 +1,86 @@
+// -----------------------------------------------------------------------
+// <copyright file="FoundPosition.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Events.Scp2536
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using Christmas.Scp2536;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Exiled.Events.Attributes;
+    using Exiled.Events.EventArgs.Scp2536;
+    using HarmonyLib;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Scp2536Controller.ServerFindTarget"/>
+    /// to add <see cref="Handlers.Scp2536.FoundPosition"/> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.FoundPosition))]
+    [HarmonyPatch(typeof(Scp2536Controller), nameof(Scp2536Controller.ServerFindTarget))]
+    public class FoundPosition
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            Label retLabel = generator.DefineLabel();
+
+            int index = newInstructions.Count - 1;
+
+            newInstructions[index].WithLabels(retLabel);
+
+            newInstructions.InsertRange(index, new CodeInstruction[]
+            {
+                // dupe the result (true / false if found)
+                new(OpCodes.Dup),
+
+                // return w result if failed
+                new(OpCodes.Brfalse_S, retLabel),
+                new(OpCodes.Pop),
+
+                // load ADDRESS of parameter "out Scp2536Spawnpoint spawnpoint" onto stack (so not actual value but address)
+                // this is used at end of transpiler
+                new(OpCodes.Ldarg_2),
+
+                // load address of parameter "out ReferenceHub target"
+                new(OpCodes.Ldarg_1),
+
+                // load value at address
+                new(OpCodes.Ldind_Ref),
+
+                // player = Player.Get(target);
+                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                // load address of parameter "out Scp2536Spawnpoint spawnpoint"
+                new(OpCodes.Ldarg_2),
+
+                // load value at address
+                new(OpCodes.Ldind_Ref),
+
+                // ev = new FoundPositionEventArgs(player, spawnpoint);
+                new(OpCodes.Newobj, Constructor(typeof(FoundPositionEventArgs), new[] { typeof(Player), typeof(Scp2536Spawnpoint) })),
+                new(OpCodes.Dup),
+                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnFoundPosition))),
+
+                // spawnpoint = ev.Spawnpoint;
+                new(OpCodes.Callvirt, PropertyGetter(typeof(FoundPositionEventArgs), nameof(FoundPositionEventArgs.Spawnpoint))),
+
+                // this uses the address already on stack (see 3rd comment) with the value from the event args
+                new(OpCodes.Stind_Ref),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
index 9389addfa5..855523f1e3 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
@@ -11,6 +11,7 @@ namespace Exiled.Events.Patches.Events.Scp2536
     using System.Reflection.Emit;
 
     using Christmas.Scp2536;
+    using Christmas.Scp2536.Gifts;
     using Exiled.API.Features;
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
@@ -34,6 +35,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label retLabel = generator.DefineLabel();
 
             LocalBuilder ev = generator.DeclareLocal(typeof(GrantingGiftEventArgs));
+            LocalBuilder naughty = generator.DeclareLocal(typeof(Naughty));
 
             int offset = -1;
             int index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp2536GiftBase), nameof(Scp2536GiftBase.ObtainedBy)))) + offset;
@@ -45,7 +47,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                 // gift
-                new(OpCodes.Ldloc_1),
+                new(OpCodes.Ldloc_2),
 
                 // true
                 new(OpCodes.Ldc_I4_1),
@@ -67,7 +69,45 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // gift = ev.Gift;
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
-                new(OpCodes.Stloc_1),
+                new(OpCodes.Stloc_2),
+            });
+
+            offset = 1;
+            index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(Scp2536GiftController), nameof(Scp2536GiftController.ServerGetGift), null, new[] { typeof(Naughty) }))) + offset;
+
+            newInstructions.InsertRange(index, new CodeInstruction[]
+            {
+                // naughty is already on the stack
+                // naughty = this.ServerGetGift<Naught>();
+                new(OpCodes.Stloc_S, naughty),
+
+                // Player.Get(hub);
+                new(OpCodes.Ldarg_1),
+                new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                // naughty
+                new(OpCodes.Ldloc_S, naughty),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // GrantingGiftEventArgs ev = new(Player, Scp2536GiftBase, true);
+                new(OpCodes.Newobj, GetDeclaredConstructors(typeof(GrantingGiftEventArgs))[0]),
+                new(OpCodes.Dup),
+                new(OpCodes.Dup),
+                new(OpCodes.Stloc_S, ev.LocalIndex),
+
+                // Handlers.Scp2536.OnGrantingGift(ev);
+                new(OpCodes.Call, Method(typeof(Handlers.Scp2536), nameof(Handlers.Scp2536.OnGrantingGift))),
+
+                // if (!ev.IsAllowed)
+                //   goto retLabel;
+                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.IsAllowed))),
+                new(OpCodes.Brfalse_S, retLabel),
+
+                // load naughty onto stack
+                new(OpCodes.Ldloc_S, ev.LocalIndex),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(GrantingGiftEventArgs), nameof(GrantingGiftEventArgs.Gift))),
             });
 
             newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
index 1c0f3442e3..dcf788f079 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
@@ -30,9 +30,13 @@ internal class Interacting
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Brfalse_S);
 
-            int offset = 1;
-            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ret) + offset;
+            newInstructions.RemoveRange(index, 6);
+            newInstructions[index].opcode = OpCodes.Brtrue_S;
+            int offset = -2;
+
+            index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp559Cake), nameof(Scp559Cake._remainingSlices)))) + offset;
 
             Label retLabel = generator.DefineLabel();
 
@@ -48,10 +52,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                    // true
-                    new(OpCodes.Ldc_I4_1),
-
-                    // InteractingScp559EventArgs ev = new(Scp559, Player, true);
+                    // InteractingScp559EventArgs ev = new(Scp559, Player);
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingScp559EventArgs))[0]),
                     new(OpCodes.Dup),
 
@@ -68,6 +69,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
index 8027c34ad9..cd52be3cc0 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
@@ -76,6 +76,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
index c042b65f9e..defc59b9b6 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp914/InteractingEvents.cs
@@ -14,9 +14,7 @@ namespace Exiled.Events.Patches.Events.Scp914
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp914;
-
     using global::Scp914;
-
     using HarmonyLib;
 
     using static HarmonyLib.AccessTools;
@@ -39,8 +37,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label ret = generator.DefineLabel();
 
-            int offset = 1;
-            int index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Stloc_1) + offset;
+            int offset = -3;
+            int index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914KnobChangingEventArgs))[0])) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
@@ -75,7 +73,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             });
 
             offset = -3;
-            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Newobj) + offset;
+            index = newInstructions.FindLastIndex(i => i.OperandIs(GetDeclaredConstructors(typeof(LabApi.Events.Arguments.Scp914Events.Scp914ActivatingEventArgs))[0])) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs b/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
new file mode 100644
index 0000000000..6ea4a5ac08
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixEffectOrder.cs
@@ -0,0 +1,101 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixEffectOrder.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection;
+    using System.Reflection.Emit;
+
+    using API.Features.Pools;
+    using CustomPlayerEffects;
+    using Exiled.API.Features;
+    using HarmonyLib;
+    using InventorySystem.Items.Usables.Scp330;
+    using PlayerRoles.PlayableScps.Scp049;
+
+    using static HarmonyLib.AccessTools;
+
+#pragma warning disable SA1402 // File may only contain a single type
+
+    /// <summary>
+    /// Patches <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
+    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
+    /// </summary>
+    [HarmonyPatch(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState))]
+    internal class FixEffectOrder
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            // Find the setter call index
+            int offset = -2;
+            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity)))) + offset;
+
+            // Extract: ldarg.0, ldarg.1, call set_Intensity
+            List<CodeInstruction> intensityBlock = newInstructions.GetRange(intensityCallIndex, 3);
+
+            // Remove it from original location
+            newInstructions.RemoveRange(intensityCallIndex, 3);
+            newInstructions[intensityCallIndex].WithLabels(intensityBlock[0].ExtractLabels());
+
+            // Find ServerChangeDuration call
+            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
+
+            // Insert AFTER ServerChangeDuration
+            newInstructions.InsertRange(serverChangeIndex + 1, intensityBlock);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+
+    /// <summary>
+    /// Patches Method that should use <see cref="StatusEffectBase.ServerSetState(byte, float, bool)"/>.
+    /// Fix than NW do not updated the EffectDuration before Intensity https://github.com/northwood-studios/LabAPI/issues/248.
+    /// </summary>
+    [HarmonyPatch]
+    internal class FixEffectOrder2
+    {
+        private static IEnumerable<MethodBase> TargetMethods()
+        {
+            yield return Method(typeof(CandyYellow), nameof(CandyYellow.ServerApplyEffects));
+            yield return Method(typeof(Scp049AttackAbility), nameof(Scp049AttackAbility.ServerProcessCmd));
+            yield return Method(typeof(SugarCrave), nameof(SugarCrave.Disabled));
+        }
+
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int intensityCallIndex = newInstructions.FindIndex(ci => ci.Calls(PropertySetter(typeof(StatusEffectBase), nameof(StatusEffectBase.Intensity))));
+
+            int offset = 6;
+            if (newInstructions[intensityCallIndex - offset].opcode == OpCodes.Dup)
+            {
+                // specific to Yellow candy that get it's Instance from a OpCodes.Dup
+                newInstructions.RemoveAt(intensityCallIndex);
+                newInstructions.RemoveAt(intensityCallIndex - offset);
+            }
+            else
+            {
+                newInstructions.RemoveRange(intensityCallIndex, 2);
+            }
+
+            int serverChangeIndex = newInstructions.FindIndex(ci => ci.Calls(Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerChangeDuration))));
+
+            newInstructions[serverChangeIndex] = new CodeInstruction(OpCodes.Callvirt, Method(typeof(StatusEffectBase), nameof(StatusEffectBase.ServerSetState)));
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs b/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
new file mode 100644
index 0000000000..51dab211b3
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixMarshmallowManFF.cs
@@ -0,0 +1,91 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixMarshmallowManFF.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using CustomPlayerEffects;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pools;
+    using Footprinting;
+    using HarmonyLib;
+    using InventorySystem.Items.MarshmallowMan;
+    using InventorySystem.Items.Pickups;
+    using InventorySystem.Items.ThrowableProjectiles;
+    using Mirror;
+    using PlayerRoles;
+    using PlayerRoles.FirstPersonControl;
+    using PlayerStatsSystem;
+    using Respawning.NamingRules;
+    using Subtitles;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches the <see cref="MarshmallowItem.ServerAttack"/> delegate.
+    /// </summary>
+    [HarmonyPatch(typeof(MarshmallowItem), nameof(MarshmallowItem.ServerAttack))]
+    internal class FixMarshmallowManFF : AttackerDamageHandler
+    {
+#pragma warning disable SA1600 // Elements should be documented
+        public FixMarshmallowManFF(MarshmallowItem marshmallowItem, bool isEvilMode)
+        {
+            MarshmallowItem = marshmallowItem;
+            Attacker = new(marshmallowItem.Owner);
+            Damage = marshmallowItem._attackDamage;
+            ForceFullFriendlyFire = isEvilMode;
+        }
+
+        public MarshmallowItem MarshmallowItem { get; set; }
+
+        public override Footprint Attacker { get; set; }
+
+        public override bool AllowSelfDamage { get; } = false;
+
+        public override float Damage { get; set; }
+
+        public override string RagdollInspectText { get; } = DeathTranslations.MarshmallowMan.RagdollTranslation;
+
+        public override CassieAnnouncement CassieDeathAnnouncement { get; } = new()
+        {
+            Announcement = "TERMINATED BY MARSHMALLOW MAN",
+            SubtitleParts =
+            [
+                new SubtitlePart(SubtitleType.TerminatedByMarshmallowMan, null),
+            ],
+        };
+
+        public override string DeathScreenText { get; } = DeathTranslations.MarshmallowMan.DeathscreenTranslation;
+
+        public override string ServerLogsText => "Stabbed with Marshmallow Item by " + Attacker.Nickname;
+#pragma warning restore SA1600 // Elements should be documented
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.NewDamageHandler))));
+
+            // replace the getter for NewDamageHandler with ctor of FixMarshmallowManFF
+            newInstructions.RemoveAt(index);
+            newInstructions.InsertRange(index, new List<CodeInstruction>
+            {
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(MarshmallowItem), nameof(MarshmallowItem.EvilMode))),
+                new(OpCodes.Newobj, Constructor(typeof(FixMarshmallowManFF), new[] { typeof(MarshmallowItem), typeof(bool) })),
+            });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs b/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
new file mode 100644
index 0000000000..fde6bfd51a
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixNWFlashbangDuration.cs
@@ -0,0 +1,30 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixNWFlashbangDuration.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using CustomPlayerEffects;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Player;
+    using HarmonyLib;
+    using InventorySystem;
+
+    /// <summary>
+    /// Patches <see cref="Flashed.IntensityChanged"/> to fix NW overwritting value multiple time.
+    /// </summary>
+    [HarmonyPatch(typeof(Flashed), nameof(Flashed.IntensityChanged))]
+    internal class FixNWFlashbangDuration
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            yield return new CodeInstruction(OpCodes.Ret);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs b/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
new file mode 100644
index 0000000000..c40037f4b9
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Fixes/FixScp1507DestroyingDoor.cs
@@ -0,0 +1,52 @@
+// -----------------------------------------------------------------------
+// <copyright file="FixScp1507DestroyingDoor.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Fixes
+{
+    using System.Collections.Generic;
+    using System.Reflection.Emit;
+
+    using API.Features.Pools;
+    using Footprinting;
+    using HarmonyLib;
+    using Interactables.Interobjects.DoorUtils;
+    using PlayerRoles.PlayableScps.Scp1507;
+
+    using static HarmonyLib.AccessTools;
+
+    /// <summary>
+    /// Patches <see cref="Scp1507AttackAbility.TryAttackDoor()"/> delegate.
+    /// Fix than NW don't set the footprint argument <see cref="IDamageableDoor.ServerDamage(float, DoorDamageType, Footprint)"/>.
+    /// </summary>
+    [HarmonyPatch(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.TryAttackDoor))]
+    internal class FixScp1507DestroyingDoor
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            int offset = -1;
+            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Initobj) + offset;
+
+            newInstructions.RemoveRange(index, 3);
+
+            newInstructions.InsertRange(
+                index,
+                new CodeInstruction[]
+                {
+                    new(OpCodes.Ldarg_0),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.Owner))),
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(Footprint))[0]),
+                });
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
+}
diff --git a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
index 1f6a8ee431..17bdf5e142 100644
--- a/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
+++ b/EXILED/Exiled.Events/Patches/Fixes/Jailbird914CoarseFix.cs
@@ -22,7 +22,7 @@ namespace Exiled.Events.Patches.Fixes
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem, JailbirdHitreg)" />.
+    /// Patches <see cref="JailbirdDeteriorationTracker.Setup(JailbirdItem)" />.
     /// Bug reported to NW (https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/88).
     /// </summary>
     [HarmonyPatch(typeof(JailbirdDeteriorationTracker), nameof(JailbirdDeteriorationTracker.Setup))]
diff --git a/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs b/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
deleted file mode 100644
index 46151c7577..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/JailbirdHitRegFix.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="JailbirdHitRegFix.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using API.Features.Pools;
-
-    using HarmonyLib;
-    using InventorySystem.Items.Jailbird;
-    using Mirror;
-    using Utils.Networking;
-
-    using static HarmonyLib.AccessTools;
-
-    /// <summary>
-    /// Patches <see cref="JailbirdHitreg.ServerAttack(bool, NetworkReader)" />.
-    /// </summary>
-    [HarmonyPatch(typeof(JailbirdHitreg), nameof(JailbirdHitreg.ServerAttack))]
-    internal static class JailbirdHitRegFix
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(ReferenceHubReaderWriter), nameof(ReferenceHubReaderWriter.TryReadReferenceHub)))) - 2;
-
-            int breakIndex = newInstructions.FindIndex(i => i.Calls(Method(typeof(JailbirdHitreg), nameof(JailbirdHitreg.DetectDestructibles)))) - 1;
-            Label breakLabel = generator.DefineLabel();
-            newInstructions[breakIndex].WithLabels(breakLabel);
-
-            List<Label> loopBeginingLabels = newInstructions[index].ExtractLabels();
-
-            newInstructions.InsertRange(index, new[]
-            {
-                // reader.Remaining
-                new CodeInstruction(OpCodes.Ldarg_2),
-                new CodeInstruction(OpCodes.Call, PropertyGetter(typeof(NetworkReader), nameof(NetworkReader.Remaining))),
-
-                // if (reader.Remaining == 0)
-                //     break;
-                new CodeInstruction(OpCodes.Ldc_I4_0),
-                new CodeInstruction(OpCodes.Ceq),
-                new CodeInstruction(OpCodes.Brtrue, breakLabel),
-            });
-
-            newInstructions[index].WithLabels(loopBeginingLabels);
-
-            foreach (CodeInstruction instruction in newInstructions)
-                yield return instruction;
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-    }
-}
diff --git a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
index bafb4a2847..574c0d856a 100644
--- a/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
+++ b/EXILED/Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs
@@ -16,6 +16,7 @@ namespace Exiled.Events.Patches.Generic
 
     using API.Features;
     using API.Features.Pools;
+    using Exiled.API.Features.Items;
 
     using Footprinting;
 
@@ -125,6 +126,12 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref
                     return true;
                 }
 
+                if (victim.CurrentItem is Marshmallow { Evil: true })
+                {
+                    Log.Debug("CheckFriendlyFirePlayerRules, NW Fix victim not getting hit");
+                    return true;
+                }
+
                 Log.Debug($"CheckFriendlyFirePlayerRules, Attacker role {attacker.Role} and Victim {victim.Role}");
 
                 // Check victim's UniqueRole for custom FF multiplier
diff --git a/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs b/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
new file mode 100644
index 0000000000..c98d2d57c2
--- /dev/null
+++ b/EXILED/Exiled.Events/Patches/Generic/Scp127MaxHs.cs
@@ -0,0 +1,32 @@
+// -----------------------------------------------------------------------
+// <copyright file="Scp127MaxHs.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Patches.Generic
+{
+    using Exiled.API.Features.Items;
+    using HarmonyLib;
+    using InventorySystem.Items.Firearms.Modules.Scp127;
+
+#pragma warning disable SA1313
+    /// <summary>
+    /// Patches <see cref="Scp127HumeModule.HsMax"/> to implement <see cref="Scp127.HsMax"/> setter.
+    /// </summary>
+    [HarmonyPatch(typeof(Scp127HumeModule), nameof(Scp127HumeModule.HsMax), MethodType.Getter)]
+    internal class Scp127MaxHs
+    {
+        private static void Postfix(Scp127HumeModule __instance, ref float __result)
+        {
+            Scp127 item = Item.Get<Scp127>(__instance.ItemSerial);
+
+            if (item == null || !item.CustomHsMax.HasValue)
+                return;
+
+            __result = item.CustomHsMax.Value;
+            return;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Installer/Program.cs b/EXILED/Exiled.Installer/Program.cs
index 1924fc369d..6ea75b0df0 100644
--- a/EXILED/Exiled.Installer/Program.cs
+++ b/EXILED/Exiled.Installer/Program.cs
@@ -172,7 +172,7 @@ private static async Task<IEnumerable<Release>> GetReleases()
                     r => Version.TryParse(r.TagName, out Version version)
                          && version > VersionLimit);
 
-            return releases.OrderByDescending(r => r.CreatedAt.Ticks);
+            return releases.OrderByDescending(r => r.PublishedAt);
         }
 
         private static string FormatRelease(Release r)
diff --git a/EXILED/Exiled.Loader/AutoUpdateFiles.cs b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
index a4e454cb3a..3ad56c5c95 100644
--- a/EXILED/Exiled.Loader/AutoUpdateFiles.cs
+++ b/EXILED/Exiled.Loader/AutoUpdateFiles.cs
@@ -17,6 +17,6 @@ public static class AutoUpdateFiles
         /// <summary>
         /// Gets which SCP: SL version generated Exiled.
         /// </summary>
-        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 1);
+        public static readonly Version RequiredSCPSLVersion = new(14, 2, 0, 4);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Loader/ConfigManager.cs b/EXILED/Exiled.Loader/ConfigManager.cs
index f04835e61c..706924ee45 100644
--- a/EXILED/Exiled.Loader/ConfigManager.cs
+++ b/EXILED/Exiled.Loader/ConfigManager.cs
@@ -446,7 +446,10 @@ public static bool LoadLabAPIProperties(LabPlugin plugin)
             ISerializer serializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Serializer;
             IDeserializer deserializer = LabApi.Loader.Features.Yaml.YamlConfigParser.Deserializer;
 
-            string configPath = Path.Combine(Paths.IndividualConfigs, plugin.Name, $"{Server.Port}-properties.yml");
+            string directory = Path.Combine(Paths.IndividualConfigs, plugin.Name);
+            string configPath = Path.Combine(directory, $"{Server.Port}-properties.yml");
+
+            Directory.CreateDirectory(directory);
 
             if (!File.Exists(configPath))
             {
diff --git a/EXILED/Exiled.Loader/Loader.cs b/EXILED/Exiled.Loader/Loader.cs
index b8a8883fa3..1a30436669 100644
--- a/EXILED/Exiled.Loader/Loader.cs
+++ b/EXILED/Exiled.Loader/Loader.cs
@@ -635,7 +635,10 @@ private static void LoadPluginsFromDirectory(string dir = null)
                     continue;
 
                 if (PluginLoader.EnabledPlugins.Any(p => p.Name == plugin.Name) || Plugins.Any(p => p.Name == plugin.Name) || LabAPIPlugins.Keys.Any(p => p.Name == plugin.Name))
+                {
+                    Log.Info("Skipping loading duplicate LabAPI plugin " + plugin.Name);
                     continue;
+                }
 
                 Log.Info("Successfully loaded LabAPI plugin " + plugin.Name);
                 LabAPIPlugins.Add(plugin, attempt);
diff --git a/EXILED/Exiled.Loader/Updater.cs b/EXILED/Exiled.Loader/Updater.cs
index 672c17063a..a2a3863597 100644
--- a/EXILED/Exiled.Loader/Updater.cs
+++ b/EXILED/Exiled.Loader/Updater.cs
@@ -229,7 +229,7 @@ private void Update(HttpClient client, NewVersion newVersion)
                     FileName = installerPath,
                     UseShellExecute = false,
                     CreateNoWindow = true,
-                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{config.ExiledDirectoryPath}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
+                    Arguments = $"--exit {(Folder == "global" ? string.Empty : $"--target-port {Folder}")} --target-version {newVersion.Release.TagName} --appdata \"{Paths.AppData}\" --exiled \"{Path.Combine(config.ExiledDirectoryPath, "..")}\" {(newVersion.IsPrerelease ? "--pre-releases" : string.Empty)}",
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     StandardErrorEncoding = ProcessEncoding,
diff --git a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
index f797797370..faeda9462e 100644
--- a/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
+++ b/EXILED/docs/articles/SCPSLRessources/NW_Documentation.md
@@ -17,7 +17,7 @@
 title: NW Documentation
 ---
 
-Last Update (14.2.0.1)
+Last Update (14.2.0.4)
 
 ### Index
 
@@ -56,6 +56,7 @@ Last Update (14.2.0.1)
 - [CallType](#calltype)
 - [CandyKindID](#candykindid)
 - [CassieAnnouncementType](#cassieannouncementtype)
+- [CassieClipCategory](#cassieclipcategory)
 - [Category](#category)
 - [CentralAuthPreauthFlags](#centralauthpreauthflags)
 - [ChallengeState](#challengestate)
@@ -89,7 +90,6 @@ Last Update (14.2.0.1)
 - [DecalPoolType](#decalpooltype)
 - [DecontaminationStatus](#decontaminationstatus)
 - [DeliveryMethod](#deliverymethod)
-- [DetectionStatus](#detectionstatus)
 - [DiodeType](#diodetype)
 - [DisconnectReason](#disconnectreason)
 - [DisconnectResult](#disconnectresult)
@@ -206,6 +206,7 @@ Last Update (14.2.0.1)
 - [NatAddressType](#nataddresstype)
 - [NetLogLevel](#netloglevel)
 - [NetworkProtocolType](#networkprotocoltype)
+- [NextAction](#nextaction)
 - [NextRoundAction](#nextroundaction)
 - [NotificationSound](#notificationsound)
 - [NtpLeapIndicator](#ntpleapindicator)
@@ -220,6 +221,7 @@ Last Update (14.2.0.1)
 - [OtherAudioSetting](#otheraudiosetting)
 - [OtherCondition](#othercondition)
 - [OutputCodes](#outputcodes)
+- [OverwatchSettings](#overwatchsettings)
 - [PacketProperty](#packetproperty)
 - [PanelColliderId](#panelcolliderid)
 - [ParameterMixingMode](#parametermixingmode)
@@ -317,6 +319,7 @@ Last Update (14.2.0.1)
 - [SteamLobbyPrivacy](#steamlobbyprivacy)
 - [StorageLocation](#storagelocation)
 - [StructureType](#structuretype)
+- [SubtitleMode](#subtitlemode)
 - [SubtitleType](#subtitletype)
 - [SyncData](#syncdata)
 - [SyncDataFlags](#syncdataflags)
@@ -958,6 +961,18 @@ Last Update (14.2.0.1)
 
 </details>
 
+### CassieClipCategory
+
+<details><summary><b>Cassie.CassieClipCategory</b></summary>
+
+```
+ [0] = Word
+ [1] = Glitch
+ [2] = Other
+```
+
+</details>
+
 ### Category
 
 <details><summary><b>PlayerRoles.PlayableScps.Scp079.Scp079KeyAbilityBase+Category</b></summary>
@@ -1451,18 +1466,6 @@ Last Update (14.2.0.1)
 
 </details>
 
-### DetectionStatus
-
-<details><summary><b>InventorySystem.Items.Firearms.Modules.Scp127.Scp127CassieBasedVoiceTriggerBase+DetectionStatus</b></summary>
-
-```
- [0] = Idle
- [1] = WaitingForTrigger
- [2] = AnnouncementStartedPlaying
-```
-
-</details>
-
 ### DiodeType
 
 <details><summary><b>AlphaWarheadNukesitePanel+DiodeType</b></summary>
@@ -2412,7 +2415,7 @@ Last Update (14.2.0.1)
 
 ### HitResult
 
-<details><summary><b>InventorySystem.Items.Scp1509.Scp1509Hitreg+HitResult</b></summary>
+<details><summary><b>InventorySystem.Items.Autosync.MeleeAutoSync+HitResult</b></summary>
 
 ```
  [0] = HitPlayer
@@ -2769,6 +2772,7 @@ Last Update (14.2.0.1)
  [66] = KeycardCustomMetalCase
  [67] = MarshmallowItem
  [68] = SCP1509
+ [69] = Scp021J
  [-1] = None
 ```
 
@@ -3294,6 +3298,17 @@ Last Update (14.2.0.1)
 
 </details>
 
+### NextAction
+
+<details><summary><b>Cassie.Interpreters.CassieInterpreter+NextAction</b></summary>
+
+```
+ [0] = Continue
+ [1] = Halt
+```
+
+</details>
+
 ### NextRoundAction
 
 <details><summary><b>ServerStatic+NextRoundAction</b></summary>
@@ -3500,6 +3515,18 @@ Last Update (14.2.0.1)
 
 </details>
 
+### OverwatchSettings
+
+<details><summary><b>PlayerRoles.Spectating.OverwatchSettings</b></summary>
+
+```
+ [0] = PlayerInfoToggle
+ [1] = HitRegisterToggle
+ [2] = DebugLines
+```
+
+</details>
+
 ### PacketProperty
 
 <details><summary><b>LiteNetLib.PacketProperty</b></summary>
@@ -4054,6 +4081,8 @@ Last Update (14.2.0.1)
  [25] = Flamingo
  [26] = AlphaFlamingo
  [27] = ZombieFlamingo
+ [28] = NtfFlamingo
+ [29] = ChaosFlamingo
  [-1] = None
 ```
 
@@ -4117,6 +4146,7 @@ Last Update (14.2.0.1)
  [38] = Hcz127
  [39] = HczAcroamaticAbatement
  [40] = HczWaysideIncinerator
+ [41] = HczRampTunnel
 ```
 
 </details>
@@ -4181,7 +4211,9 @@ Last Update (14.2.0.1)
  [0] = TargetResync
  [1] = TargetKilled
  [2] = AttackInterrupted
- [3] = OutOfRange
+ [3] = AttackCancelled
+ [4] = OutOfRange
+ [5] = StrangleTimer
 ```
 
 </details>
@@ -5200,6 +5232,19 @@ Last Update (14.2.0.1)
 
 </details>
 
+### SubtitleMode
+
+<details><summary><b>Cassie.CassieTtsPayload+SubtitleMode</b></summary>
+
+```
+ [0] = None
+ [1] = Automatic
+ [2] = Custom
+ [3] = FromTranslation
+```
+
+</details>
+
 ### SubtitleType
 
 <details><summary><b>Subtitles.SubtitleType</b></summary>
@@ -5434,6 +5479,7 @@ Last Update (14.2.0.1)
  [8] = Tokens
  [11] = All
  [16] = Spawn
+ [32] = Max
 ```
 
 </details>
@@ -5498,6 +5544,8 @@ Last Update (14.2.0.1)
  [3] = Two
  [4] = Three
  [5] = Four
+ [6] = Five
+ [7] = Six
 ```
 
 </details>
@@ -5676,6 +5724,7 @@ Last Update (14.2.0.1)
  [5] = Scp127Voice
  [6] = Scp3114Voice
  [7] = ChaseThemes
+ [8] = SoundEffectsWhileSpectating
 ```
 
 </details>
@@ -5784,9 +5833,11 @@ Last Update (14.2.0.1)
 | 22  | Filmmaker      | Dead             | None             | Draw            |
 | 23  | Scp3114        | SCPs             | Scp              | Anomalies       |
 | 24  | Destroyed      | Dead             | None             | Draw            |
-| 25  | Flamingo       | Dead             | None             | Draw            |
-| 26  | AlphaFlamingo  | Dead             | None             | Draw            |
-| 27  | ZombieFlamingo | Dead             | None             | Draw            |
+| 25  | Flamingo       | Flamingos        | Flamingos        | Flamingo        |
+| 26  | AlphaFlamingo  | Flamingos        | Flamingos        | Flamingo        |
+| 27  | ZombieFlamingo | SCPs             | Scp              | Anomalies       |
+| 28  | NtfFlamingo    | FoundationForces | Mtf              | FacilityForces  |
+| 29  | ChaosFlamingo  | ChaosInsurgency  | ChaosInsurgency  | ChaosInsurgency |
 ```
 
 </details>
@@ -5797,7 +5848,7 @@ Last Update (14.2.0.1)
 
 <details><summary> <b>Damage Handlers</b></summary>
 
-```md title="Latest Updated: 14.2.0.1"
+```md title="Latest Updated: 14.2.0.4"
 All available DamageHandlers
 
 + Symbol ':' literally means "inherits from"

From 7585b19c7c90cc40948cded62aef38606c7e565e Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Mon, 5 Jan 2026 13:43:15 -0500
Subject: [PATCH 07/10] PLEASEEEEEE

---
 EXILED/Exiled.Events/Handlers/Internal/Round.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 26ff90342a..ff2833b79b 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -44,7 +44,7 @@ namespace Exiled.Events.Handlers.Internal
     internal static class Round
     {
         /// <inheritdoc cref="Handlers.Player.OnUsedItem" />
-        public static void OnServerOnUsingCompleted(ReferenceHub hub, UsableItem usable) => Handlers.Player.OnUsedItem(new (hub, usable));
+        public static void OnServerOnUsingCompleted(ReferenceHub hub, UsableItem usable) => Handlers.Player.OnUsedItem(new (hub, usable, false));
 
         /// <inheritdoc cref="Handlers.Server.OnWaitingForPlayers" />
         public static void OnWaitingForPlayers()

From 018d3cb8b87d73c098748a52d892ed3a646c743f Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Mon, 5 Jan 2026 14:33:07 -0500
Subject: [PATCH 08/10] actually think about cause and effect

---
 EXILED/Exiled.API/Features/Player.cs            | 15 +++++++++++----
 EXILED/Exiled.Events/Handlers/Internal/Round.cs | 10 +++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index 956fcf7f23..e094c05019 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -614,7 +614,7 @@ internal set
         }
 
         /// <summary>
-        /// Gets a <see cref="List{T}"/> of <see cref="Func{T1, T2}"/> generating a <see cref="RoleData"/> to fake the others role whenever another player changes role.
+        /// Gets a <see cref="List{T}"/> of <see cref="Func{T1, T2}"/> generating a <see cref="RoleData"/> to fake this players role whenever this player changes role.
         /// </summary>
         /// <remarks>See <see cref="SetAppearance(Func{Player,RoleData})"/> for usage.</remarks>
         public List<Func<Player, RoleData>> FakeRoleGenerator { get; } = ListPool<Func<Player, RoleData>>.Pool.Get();
@@ -1852,10 +1852,17 @@ public void TrySetCustomRoleFriendlyFire(string roleTypeId, Dictionary<RoleTypeI
         public bool TryRemoveCustomeRoleFriendlyFire(string role) => CustomRoleFriendlyFireMultiplier.Remove(role);
 
         /// <summary>
-        /// Adds a <see cref="Func{Player, RoleData}"/> from a <see cref="Player"/> to a <see cref="RoleTypeId"/> that is used every time a players role changes.
+        /// Adds a <see cref="Func{Player, RoleData}"/> from a <see cref="Player"/> to a <see cref="RoleTypeId"/> that is used every time this players role changes.
         /// </summary>
-        /// <param name="generator">The function that determines if a players role will be faked (to a given viewer) after their role changes.</param>
-        /// <remarks>The first Func in <see cref="FakeRoleGenerator"/> that returns a RoleData that is not <see cref="RoleData.None"/> will be used for faking appearance.</remarks>
+        /// <param name="generator">The function that determines if this players role will be faked (to a viewer) after their role changes.</param>
+        /// <remarks>The first Func in <see cref="FakeRoleGenerator"/> that returns a RoleData that is not <see cref="RoleData.None"/> will be used for faking appearance.
+        /// <para>An example use case would be to make a scientist appear as a Class-D to all other Class-D, that Func would look like:
+        /// <code>
+        /// player => player.Role.Team is Team.ClassD ? new RoleData(RoleTypeId.ClassD) : RoleData.None
+        /// </code>
+        /// This method can be further optimized by only using static RoleData instances in your Funcs.
+        /// </para>
+        /// </remarks>
         public void SetAppearance(Func<Player, RoleData> generator)
         {
             FakeRoleGenerator.Add(generator);
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index ff2833b79b..3c91147c1d 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -93,9 +93,9 @@ public static void OnSpawned(SpawnedEventArgs ev)
         {
             foreach (Player viewer in Player.Enumerable.Except(new[] { ev.Player }))
             {
-                foreach (Func<Player, RoleData> generator in viewer.FakeRoleGenerator)
+                foreach (Func<Player, RoleData> generator in ev.Player.FakeRoleGenerator)
                 {
-                    RoleData data = generator(ev.Player);
+                    RoleData data = generator(viewer);
                     if (data.Role != RoleTypeId.None)
                     {
                         viewer.FakeRoles[ev.Player] = data;
@@ -161,15 +161,15 @@ public static void OnVerified(VerifiedEventArgs ev)
         /// <summary>
         /// Makes fake role API work.
         /// </summary>
-        /// <param name="viewerHub">The <see cref="ReferenceHub"/> of the viewer.</param>
         /// <param name="ownerHub">The <see cref="ReferenceHub"/> of the player.</param>
+        /// <param name="viewerHub">The <see cref="ReferenceHub"/> of the viewer.</param>
         /// <param name="actualRole">The actual <see cref="RoleTypeId"/>.</param>
         /// <param name="writer">The pooled <see cref="NetworkWriter"/>.</param>
         /// <returns>A role, fake if needed.</returns>
-        public static RoleTypeId OnRoleSyncEvent(ReferenceHub viewerHub, ReferenceHub ownerHub, RoleTypeId actualRole, NetworkWriter writer)
+        public static RoleTypeId OnRoleSyncEvent(ReferenceHub ownerHub, ReferenceHub viewerHub, RoleTypeId actualRole, NetworkWriter writer)
         {
-            Player viewer = Player.Get(viewerHub);
             Player owner = Player.Get(ownerHub);
+            Player viewer = Player.Get(viewerHub);
 
             if (viewer.FakeRoles.TryGetValue(owner, out RoleData data))
             {

From b07a3b92492b92dcc88866a2af75e2e43e347f2b Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Tue, 6 Jan 2026 00:00:18 -0500
Subject: [PATCH 09/10] Add Authority + CustomData

Everything seems to work but dummies are kinda schizo
---
 EXILED/Exiled.API/Features/Player.cs          | 12 ++--
 EXILED/Exiled.API/Structs/RoleData.cs         | 54 +++++++++++---
 EXILED/Exiled.Events/Events.cs                |  2 +
 .../Exiled.Events/Handlers/Internal/Round.cs  | 72 ++++++++++++++++++-
 4 files changed, 123 insertions(+), 17 deletions(-)

diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index e094c05019..24d0760efc 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -1873,12 +1873,13 @@ public void SetAppearance(Func<Player, RoleData> generator)
         /// </summary>
         /// <param name="viewers">The players to affect.</param>
         /// <param name="fakeRole">The fake role.</param>
-        /// /// <param name="unitId">The Unit ID of the player, if <paramref name="fakeRole"/> is an NTF role.</param>
-        public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole, byte unitId = 0)
+        /// <param name="authority">How to handle edge cases.</param>
+        /// <param name="unitId">The Unit ID of the player, if <paramref name="fakeRole"/> is an NTF role.</param>
+        public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole, RoleData.Authority authority = RoleData.Authority.None, byte unitId = 0)
         {
             foreach (Player player in viewers)
             {
-                player.SetAppearance(this, fakeRole, unitId);
+                player.SetAppearance(this, fakeRole, authority, unitId);
             }
         }
 
@@ -1887,10 +1888,11 @@ public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole, byte
         /// </summary>
         /// <param name="player">The target.</param>
         /// <param name="fakeRole">The fake role.</param>
+        /// <param name="authority">How to handle edge cases.</param>
         /// <param name="unitId">The Unit ID of the player, if <paramref name="fakeRole"/> is an NTF role.</param>
-        public void SetAppearance(Player player, RoleTypeId fakeRole, byte unitId = 0)
+        public void SetAppearance(Player player, RoleTypeId fakeRole, RoleData.Authority authority = RoleData.Authority.None, byte unitId = 0)
         {
-            FakeRoles[player] = new RoleData(fakeRole, unitId);
+            FakeRoles[player] = new RoleData(fakeRole, authority, unitId);
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.API/Structs/RoleData.cs b/EXILED/Exiled.API/Structs/RoleData.cs
index 7497b6d0a3..2d04b0bd0e 100644
--- a/EXILED/Exiled.API/Structs/RoleData.cs
+++ b/EXILED/Exiled.API/Structs/RoleData.cs
@@ -9,6 +9,7 @@ namespace Exiled.API.Structs
 {
     using System;
 
+    using Mirror;
     using PlayerRoles;
 
     /// <summary>
@@ -20,13 +21,43 @@ public struct RoleData : IEquatable<RoleData>
         /// Initializes a new instance of the <see cref="RoleData"/> struct.
         /// </summary>
         /// <param name="role">The fake role.</param>
+        /// <param name="authority">The authority of the role data.</param>
         /// <param name="unitId">The fake UnitID, if <paramref name="role"/> is an NTF role.</param>
-        public RoleData(RoleTypeId role = RoleTypeId.None, byte unitId = 0)
+        public RoleData(RoleTypeId role = RoleTypeId.None, Authority authority = Authority.None, byte unitId = 0)
         {
             Role = role;
+            DataAuthority = authority;
             UnitId = unitId;
         }
 
+        /// <summary>
+        /// Represents flags for how Exiled should handle edge cases.
+        /// </summary>
+        [Flags]
+        public enum Authority
+        {
+            /// <summary>
+            /// Indicates Exiled should only fake the role of the target of this <see cref="RoleData"/> in ideal conditions.
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Indicates that Exiled should attempt to override other plugins fake role attempts if they exist.
+            /// </summary>
+            /// <remarks>This is not guaranteed to always work.</remarks>
+            Override = 1,
+
+            /// <summary>
+            /// Indicates that the fake role should always be sent without checking if the player is dead, etc...
+            /// </summary>
+            Always = 2,
+
+            /// <summary>
+            /// Indicates that Exiled should not reset the fake role if the target of this <see cref="RoleData"/> dies.
+            /// </summary>
+            Persist = 4,
+        }
+
         /// <summary>
         /// Gets the static <see cref="RoleData"/> representing no data.
         /// </summary>
@@ -42,6 +73,17 @@ public RoleData(RoleTypeId role = RoleTypeId.None, byte unitId = 0)
         /// </summary>
         public byte UnitId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the authority of this <see cref="RoleData"/> instance. see <see cref="Authority"/> for details.
+        /// </summary>
+        public Authority DataAuthority { get; set; } = Authority.None;
+
+        /// <summary>
+        /// Gets or sets custom data written to network writers when fake data is generated.
+        /// </summary>
+        /// <remarks>Leave this value as null unless you are writing custom role-specific data.</remarks>
+        public Action<NetworkWriter> CustomData { get; set; }
+
         /// <summary>
         /// Checks if 2 <see cref="RoleData"/> are equal.
         /// </summary>
@@ -59,18 +101,12 @@ public RoleData(RoleTypeId role = RoleTypeId.None, byte unitId = 0)
         public static bool operator !=(RoleData left, RoleData right) => !left.Equals(right);
 
         /// <inheritdoc/>
-        public bool Equals(RoleData other) => Role == other.Role && UnitId == other.UnitId;
+        public bool Equals(RoleData other) => Role == other.Role && DataAuthority == other.DataAuthority && UnitId == other.UnitId;
 
         /// <inheritdoc/>
         public override bool Equals(object obj) => obj is RoleData other && Equals(other);
 
         /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return ((int)Role * 397) ^ UnitId.GetHashCode();
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine((int)Role, UnitId, (int)DataAuthority, CustomData);
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Events.cs b/EXILED/Exiled.Events/Events.cs
index adae6e21a8..876ccf1f37 100644
--- a/EXILED/Exiled.Events/Events.cs
+++ b/EXILED/Exiled.Events/Events.cs
@@ -70,6 +70,7 @@ public override void OnEnabled()
             Handlers.Server.RoundStarted += Handlers.Internal.Round.OnRoundStarted;
             Handlers.Player.ChangingRole += Handlers.Internal.Round.OnChangingRole;
             Handlers.Player.Spawned += Handlers.Internal.Round.OnSpawned;
+            Handlers.Player.Dying.Subscribe(Handlers.Internal.Round.OnDying, -100);
             Handlers.Player.SpawningRagdoll += Handlers.Internal.Round.OnSpawningRagdoll;
             Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
@@ -121,6 +122,7 @@ public override void OnDisabled()
             Handlers.Server.RoundStarted -= Handlers.Internal.Round.OnRoundStarted;
             Handlers.Player.ChangingRole -= Handlers.Internal.Round.OnChangingRole;
             Handlers.Player.Spawned -= Handlers.Internal.Round.OnSpawned;
+            Handlers.Player.Dying -= Handlers.Internal.Round.OnDying;
             Handlers.Player.SpawningRagdoll -= Handlers.Internal.Round.OnSpawningRagdoll;
             Handlers.Scp049.ActivatingSense -= Handlers.Internal.Round.OnActivatingSense;
             Handlers.Player.Verified -= Handlers.Internal.Round.OnVerified;
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 3c91147c1d..3cbe9d3c1d 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -34,6 +34,8 @@ namespace Exiled.Events.Handlers.Internal
     using PlayerRoles;
     using PlayerRoles.FirstPersonControl;
     using PlayerRoles.RoleAssign;
+    using RelativePositioning;
+    using Respawning.NamingRules;
     using UnityEngine;
     using Utils.Networking;
     using Utils.NonAllocLINQ;
@@ -91,8 +93,11 @@ public static void OnChangingRole(ChangingRoleEventArgs ev)
         /// <inheritdoc cref="Handlers.Player.OnSpawned(SpawnedEventArgs)" />
         public static void OnSpawned(SpawnedEventArgs ev)
         {
-            foreach (Player viewer in Player.Enumerable.Except(new[] { ev.Player }))
+            foreach (Player viewer in Player.Enumerable)
             {
+                if (viewer == ev.Player)
+                    continue;
+
                 foreach (Func<Player, RoleData> generator in ev.Player.FakeRoleGenerator)
                 {
                     RoleData data = generator(viewer);
@@ -104,6 +109,22 @@ public static void OnSpawned(SpawnedEventArgs ev)
             }
         }
 
+        /// <inheritdoc cref="Handlers.Player.OnDying(DyingEventArgs)" />
+        public static void OnDying(DyingEventArgs ev)
+        {
+            if (!ev.IsAllowed)
+                return;
+
+            foreach (Player viewer in Player.Enumerable)
+            {
+                if (viewer == ev.Player)
+                    continue;
+
+                if (viewer.FakeRoles.TryGetValue(ev.Player, out RoleData data) && (data.DataAuthority & RoleData.Authority.Persist) == RoleData.Authority.None)
+                    viewer.FakeRoles.Remove(ev.Player);
+            }
+        }
+
         /// <inheritdoc cref="Handlers.Player.OnSpawningRagdoll(SpawningRagdollEventArgs)" />
         public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
@@ -173,8 +194,53 @@ public static RoleTypeId OnRoleSyncEvent(ReferenceHub ownerHub, ReferenceHub vie
 
             if (viewer.FakeRoles.TryGetValue(owner, out RoleData data))
             {
-                if (data.UnitId != 0)
-                    writer.WriteByte(data.UnitId);
+                if (data.Role == actualRole)
+                    return actualRole;
+
+                // if another plugin has written data, we can't reliably modify and expect non-breaking behavior.
+                // if we send faulty data we can accidentally soft-dc the entire server which is much worse than a plugin not working.
+                if (writer.Position != 0 && (data.DataAuthority & RoleData.Authority.Override) == RoleData.Authority.None)
+                    return actualRole;
+
+                writer.Position = 0;
+
+                // I doubt most devs want people who are dead to have fake roles.
+                if (actualRole.IsDead() && (data.DataAuthority & RoleData.Authority.Always) == RoleData.Authority.None)
+                    return actualRole;
+
+                if (data.CustomData != null)
+                {
+                    data.CustomData(writer);
+                }
+                else
+                {
+                    if (data.Role.GetRoleBase() is PlayerRoles.HumanRole { UsesUnitNames: true })
+                    {
+                        if (data.UnitId != 0)
+                        {
+                            writer.WriteByte(data.UnitId);
+                        }
+                        else
+                        {
+                            if (!NamingRulesManager.GeneratedNames.TryGetValue(Team.FoundationForces, out List<string> list))
+                                return actualRole;
+
+                            writer.WriteByte((byte)list.Count);
+                        }
+                    }
+
+                    if (data.Role.GetRoleBase() is PlayerRoles.PlayableScps.Scp1507.Scp1507Role flamingo)
+                        writer.WriteByte((byte)flamingo.ServerSpawnReason);
+
+                    if (data.Role == RoleTypeId.Scp0492)
+                    {
+                        writer.WriteUShort((ushort)Mathf.Clamp(Mathf.CeilToInt(owner.MaxHealth), 0, ushort.MaxValue));
+                        writer.WriteBool(false);
+                    }
+
+                    writer.WriteRelativePosition(new RelativePosition(owner.Position));
+                    writer.WriteUShort((ushort)Mathf.RoundToInt(Mathf.InverseLerp(0.0f, 360f, owner.Rotation.eulerAngles.y) * ushort.MaxValue));
+                }
 
                 return data.Role;
             }

From 1ed1adc7902d67ba455a88ea4c5267b479482900 Mon Sep 17 00:00:00 2001
From: "@Someone" <45270312+Someone-193@users.noreply.github.com>
Date: Tue, 6 Jan 2026 13:57:30 -0500
Subject: [PATCH 10/10] Add AllowSelf flag + minor optimization

---
 EXILED/Exiled.API/Structs/RoleData.cs         |  5 ++++
 .../Exiled.Events/Handlers/Internal/Round.cs  | 30 ++++++++++---------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/EXILED/Exiled.API/Structs/RoleData.cs b/EXILED/Exiled.API/Structs/RoleData.cs
index 2d04b0bd0e..ae65f305bc 100644
--- a/EXILED/Exiled.API/Structs/RoleData.cs
+++ b/EXILED/Exiled.API/Structs/RoleData.cs
@@ -56,6 +56,11 @@ public enum Authority
             /// Indicates that Exiled should not reset the fake role if the target of this <see cref="RoleData"/> dies.
             /// </summary>
             Persist = 4,
+
+            /// <summary>
+            /// Indicates that this <see cref="RoleData"/> can make a player view themselves as a different role.
+            /// </summary>
+            AffectSelf = 8,
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 3cbe9d3c1d..2f4e76d15a 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -95,13 +95,14 @@ public static void OnSpawned(SpawnedEventArgs ev)
         {
             foreach (Player viewer in Player.Enumerable)
             {
-                if (viewer == ev.Player)
-                    continue;
-
                 foreach (Func<Player, RoleData> generator in ev.Player.FakeRoleGenerator)
                 {
                     RoleData data = generator(viewer);
-                    if (data.Role != RoleTypeId.None)
+
+                    if (data.Role == RoleTypeId.None)
+                        continue;
+
+                    if (viewer != ev.Player || (data.DataAuthority & RoleData.Authority.AffectSelf) == RoleData.Authority.AffectSelf)
                     {
                         viewer.FakeRoles[ev.Player] = data;
                     }
@@ -117,9 +118,6 @@ public static void OnDying(DyingEventArgs ev)
 
             foreach (Player viewer in Player.Enumerable)
             {
-                if (viewer == ev.Player)
-                    continue;
-
                 if (viewer.FakeRoles.TryGetValue(ev.Player, out RoleData data) && (data.DataAuthority & RoleData.Authority.Persist) == RoleData.Authority.None)
                     viewer.FakeRoles.Remove(ev.Player);
             }
@@ -165,15 +163,16 @@ public static void OnVerified(VerifiedEventArgs ev)
             {
                 player.SetFakeScale(player.Scale, new List<Player>() { ev.Player });
 
-                if (player != ev.Player)
+                foreach (Func<Player, RoleData> generator in player.FakeRoleGenerator)
                 {
-                    foreach (Func<Player, RoleData> generator in player.FakeRoleGenerator)
+                    RoleData data = generator(ev.Player);
+
+                    if (data.Role == RoleTypeId.None)
+                        continue;
+
+                    if (player != ev.Player || (data.DataAuthority & RoleData.Authority.AffectSelf) == RoleData.Authority.AffectSelf)
                     {
-                        RoleData data = generator(ev.Player);
-                        if (data.Role != RoleTypeId.None)
-                        {
-                            ev.Player.FakeRoles[player] = data;
-                        }
+                        ev.Player.FakeRoles[player] = data;
                     }
                 }
             }
@@ -197,6 +196,9 @@ public static RoleTypeId OnRoleSyncEvent(ReferenceHub ownerHub, ReferenceHub vie
                 if (data.Role == actualRole)
                     return actualRole;
 
+                if (ownerHub.roleManager.PreviouslySentRole.TryGetValue(viewerHub.netId, out RoleTypeId previousRole) && previousRole == data.Role)
+                    return data.Role;
+
                 // if another plugin has written data, we can't reliably modify and expect non-breaking behavior.
                 // if we send faulty data we can accidentally soft-dc the entire server which is much worse than a plugin not working.
                 if (writer.Position != 0 && (data.DataAuthority & RoleData.Authority.Override) == RoleData.Authority.None)