diff --git a/EXILED/Exiled.API/Enums/LockerType.cs b/EXILED/Exiled.API/Enums/LockerType.cs
index ca176fb21..b38b592c0 100644
--- a/EXILED/Exiled.API/Enums/LockerType.cs
+++ b/EXILED/Exiled.API/Enums/LockerType.cs
@@ -7,6 +7,8 @@
 
 namespace Exiled.API.Enums
 {
+    using System;
+
     /// <summary>
     /// Unique identifier for different types of <see cref="Features.Lockers.Locker"/>s.
     /// </summary>
@@ -15,6 +17,7 @@ public enum LockerType
         /// <summary>
         /// The pedestal used by SCP items.
         /// </summary>
+        [Obsolete("This value is not used.")]
         Pedestal,
 
         /// <summary>
@@ -46,5 +49,65 @@ public enum LockerType
         /// Unknow type of locker.
         /// </summary>
         Unknow,
+
+        /// <summary>
+        /// MircoHid pedestal.
+        /// </summary>
+        MicroHid,
+
+        /// <summary>
+        /// Experimental weapon locker.
+        /// </summary>
+        ExperimentalWeapon,
+
+        /// <summary>
+        /// SCP-500 pedestal.
+        /// </summary>
+        Scp500Pedestal,
+
+        /// <summary>
+        /// SCP-207? (Anti SCP-207) pedestal.
+        /// </summary>
+        AntiScp207Pedestal,
+
+        /// <summary>
+        /// SCP-207 pedestal.
+        /// </summary>
+        Scp207Pedestal,
+
+        /// <summary>
+        /// SCP-268 pedestal.
+        /// </summary>
+        Scp268Pedestal,
+
+        /// <summary>
+        /// SCP-1344 pedestal.
+        /// </summary>
+        Scp1344Pedestal,
+
+        /// <summary>
+        /// SCP-018 pedestal.
+        /// </summary>
+        Scp018Pedestal,
+
+        /// <summary>
+        /// SCP-1576 pedestal.
+        /// </summary>
+        Scp1576Pedestal,
+
+        /// <summary>
+        /// SCP-244 pedestal.
+        /// </summary>
+        Scp244Pedestal,
+
+        /// <summary>
+        /// SCP-2176 pedestal.
+        /// </summary>
+        Scp2176Pedestal,
+
+        /// <summary>
+        /// SCP-1853 pedestal.
+        /// </summary>
+        Scp1853Pedestal,
     }
 }
diff --git a/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs b/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs
index d26328475..38ef020b7 100644
--- a/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs
@@ -59,5 +59,21 @@ public static T ModifyFlags<T>(this T flags, bool value, params T[] changeFlags)
 
             return (T)Enum.ToObject(typeof(T), currentValue);
         }
+
+        /// <summary>
+        /// Checks if flag has specified value.
+        /// </summary>
+        /// <param name="flag">Flag to check.</param>
+        /// <param name="value">Value to check in flag.</param>
+        /// <typeparam name="T">The type of the enum.</typeparam>
+        /// <returns><see langword="true"/> if value is presented in flag. Otherwise, <see langword="false"/>.</returns>
+        public static bool HasFlagFast<T>(this T flag, T value)
+            where T : Enum
+        {
+            long flagValue = Convert.ToInt64(flag);
+            long valueValue = Convert.ToInt64(value);
+
+            return (flagValue & valueValue) == valueValue;
+        }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Extensions/LockerExtensions.cs b/EXILED/Exiled.API/Extensions/LockerExtensions.cs
index c7c1a78ab..bdf3689bb 100644
--- a/EXILED/Exiled.API/Extensions/LockerExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/LockerExtensions.cs
@@ -29,14 +29,25 @@ public static class LockerExtensions
         /// </summary>
         /// <param name="name">The name to check.</param>
         /// <returns>The corresponding <see cref="LockerType"/>.</returns>
-        public static LockerType GetLockerTypeByName(this string name) => name.Replace("(Clone)", string.Empty) switch
+        public static LockerType GetLockerTypeByName(this string name) => name.Split('(')[0].Trim() switch
         {
-            "Scp500PedestalStructure Variant" => LockerType.Pedestal,
+            "Scp500PedestalStructure Variant" => LockerType.Scp500Pedestal,
+            "AntiScp207PedestalStructure Variant" => LockerType.AntiScp207Pedestal,
+            "Scp207PedestalStructure Variant" => LockerType.Scp207Pedestal,
+            "Experimental Weapon Locker" => LockerType.ExperimentalWeapon,
+            "Scp1344PedestalStructure Variant" => LockerType.Scp1344Pedestal,
+            "Scp1576PedestalStructure Variant" => LockerType.Scp1576Pedestal,
+            "Scp2176PedestalStructure Variant" => LockerType.Scp2176Pedestal,
+            "Scp1853PedestalStructure Variant" => LockerType.Scp1853Pedestal,
+            "Scp268PedestalStructure Variant" => LockerType.Scp268Pedestal,
+            "Scp244PedestalStructure Variant" => LockerType.Scp244Pedestal,
+            "Scp018PedestalStructure Variant" => LockerType.Scp018Pedestal,
             "LargeGunLockerStructure" => LockerType.LargeGun,
             "RifleRackStructure" => LockerType.RifleRack,
             "MiscLocker" => LockerType.Misc,
             "RegularMedkitStructure" => LockerType.Medkit,
             "AdrenalineMedkitStructure" => LockerType.Adrenaline,
+            "MicroHIDpedestal" => LockerType.MicroHid,
             _ => LockerType.Unknow,
         };
     }
diff --git a/EXILED/Exiled.API/Features/CustomHealthStat.cs b/EXILED/Exiled.API/Features/CustomHealthStat.cs
index af351bf7a..57f6d31c2 100644
--- a/EXILED/Exiled.API/Features/CustomHealthStat.cs
+++ b/EXILED/Exiled.API/Features/CustomHealthStat.cs
@@ -11,6 +11,7 @@ namespace Exiled.API.Features
 
     /// <summary>
     /// A custom version of <see cref="HealthStat"/> which allows the player's max amount of health to be changed.
+    /// TODO: Move to Features.CustomStats.
     /// </summary>
     public class CustomHealthStat : HealthStat
     {
diff --git a/EXILED/Exiled.API/Features/CustomStats/CustomHumeShieldStat.cs b/EXILED/Exiled.API/Features/CustomStats/CustomHumeShieldStat.cs
new file mode 100644
index 000000000..78c4cd807
--- /dev/null
+++ b/EXILED/Exiled.API/Features/CustomStats/CustomHumeShieldStat.cs
@@ -0,0 +1,79 @@
+// -----------------------------------------------------------------------
+// <copyright file="CustomHumeShieldStat.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.CustomStats
+{
+    using Mirror;
+    using PlayerRoles.PlayableScps.HumeShield;
+    using PlayerStatsSystem;
+    using UnityEngine;
+    using Utils.Networking;
+
+    /// <summary>
+    /// A custom version of <see cref="HumeShieldStat"/> which allows the player's max amount of HumeShield to be changed.
+    /// </summary>
+    public class CustomHumeShieldStat : HumeShieldStat
+    {
+        /// <inheritdoc />
+        public override float MaxValue => CustomMaxValue == -1 ? base.MaxValue : CustomMaxValue;
+
+        /// <summary>
+        /// Gets or sets the multiplier for gaining HumeShield.
+        /// </summary>
+        public float ShieldRegenerationMultiplier { get; set; } = 1;
+
+        /// <summary>
+        /// Gets or sets the maximum amount of HumeShield the player can have.
+        /// </summary>
+        public float CustomMaxValue { get; set; } = -1;
+
+        private float ShieldRegeneration => TryGetHsModule(out HumeShieldModuleBase controller) ? controller.HsRegeneration * ShieldRegenerationMultiplier : 0;
+
+        /// <inheritdoc/>
+        public override void Update()
+        {
+            if (MaxValue == -1 && ShieldRegenerationMultiplier is 1)
+            {
+                base.Update();
+                return;
+            }
+
+            if (!NetworkServer.active)
+                return;
+
+            if (_valueDirty)
+            {
+                new SyncedStatMessages.StatMessage()
+                {
+                    Stat = this,
+                    SyncedValue = CurValue,
+                }.SendToHubsConditionally(CanReceive);
+                _lastSent = CurValue;
+                _valueDirty = false;
+            }
+
+            if (ShieldRegeneration == 0)
+                return;
+
+            float delta = ShieldRegeneration * Time.deltaTime;
+
+            if (delta > 0)
+            {
+                if (CurValue >= MaxValue)
+                    return;
+
+                CurValue = Mathf.MoveTowards(CurValue, MaxValue, delta);
+                return;
+            }
+
+            if (CurValue <= 0)
+                return;
+
+            CurValue += delta;
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Doors/Door.cs b/EXILED/Exiled.API/Features/Doors/Door.cs
index 63b4f62ce..c5ba62fac 100644
--- a/EXILED/Exiled.API/Features/Doors/Door.cs
+++ b/EXILED/Exiled.API/Features/Doors/Door.cs
@@ -627,7 +627,13 @@ private DoorType GetDoorType()
                 // Doors contains the DoorNameTagExtension component
                 "CHECKPOINT_LCZ_A" => DoorType.CheckpointLczA,
                 "CHECKPOINT_LCZ_B" => DoorType.CheckpointLczB,
-                "CHECKPOINT_EZ_HCZ_A" => DoorType.CheckpointEzHczA,
+
+                // TODO: Remove when it's fix https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/782
+                "CHECKPOINT_EZ_HCZ_A" => Room?.Type switch
+                {
+                    RoomType.HczEzCheckpointA => DoorType.CheckpointEzHczA,
+                    _ => DoorType.CheckpointEzHczB,
+                },
                 "CHECKPOINT_EZ_HCZ_B" => DoorType.CheckpointEzHczB,
                 "106_PRIMARY" => DoorType.Scp106Primary,
                 "106_SECONDARY" => DoorType.Scp106Secondary,
diff --git a/EXILED/Exiled.API/Features/Lift.cs b/EXILED/Exiled.API/Features/Lift.cs
index c38e146a3..ec2a87c84 100644
--- a/EXILED/Exiled.API/Features/Lift.cs
+++ b/EXILED/Exiled.API/Features/Lift.cs
@@ -223,6 +223,13 @@ public float AnimationTime
         /// <returns>A <see cref="Lift"/> or <see langword="null"/> if not found.</returns>
         public static Lift Get(ElevatorType type) => Get(lift => lift.Type == type).FirstOrDefault();
 
+        /// <summary>
+        /// Gets the <see cref="Lift"/> corresponding to the specified <see cref="ElevatorGroup"/>, if any.
+        /// </summary>
+        /// <param name="type">The <see cref="ElevatorGroup"/>.</param>
+        /// <returns>A <see cref="Lift"/> or <see langword="null"/> if not found.</returns>
+        public static Lift Get(ElevatorGroup type) => Get(lift => lift.Group == type).FirstOrDefault();
+
         /// <summary>
         /// Gets the <see cref="Lift"/> corresponding to the specified name, if any.
         /// </summary>
diff --git a/EXILED/Exiled.API/Features/Lockers/Locker.cs b/EXILED/Exiled.API/Features/Lockers/Locker.cs
index 68fe4a4f1..653e432d2 100644
--- a/EXILED/Exiled.API/Features/Lockers/Locker.cs
+++ b/EXILED/Exiled.API/Features/Lockers/Locker.cs
@@ -110,7 +110,7 @@ public Vector3 RandomChamberPosition
                 Chamber randomChamber = Chambers.GetRandomValue();
 
                 // Determine if the chamber uses multiple spawn points and has at least one available spawn point.
-                if (randomChamber.UseMultipleSpawnpoints && randomChamber.Spawnpoints.Count() > 0)
+                if (randomChamber.UseMultipleSpawnpoints && randomChamber.Spawnpoints.Any())
                 {
                     // Return the position of a random spawn point within the chamber.
                     return randomChamber.Spawnpoints.GetRandomValue().position;
@@ -136,11 +136,18 @@ public Vector3 RandomChamberPosition
         /// <returns>The <see cref="Locker"/> with the given <see cref="ZoneType"/> or <see langword="null"/> if not found.</returns>
         public static IEnumerable<Locker> Get(ZoneType zoneType) => Get(room => room.Zone.HasFlag(zoneType));
 
+        /// <summary>
+        /// Gets an <see cref="IEnumerable{T}"/> of <see cref="Locker"/> given the specified <see cref="LockerType"/>.
+        /// </summary>
+        /// <param name="lockerType">The <see cref="LockerType"/> to search for.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="Locker"/> which contains elements that satisfy the condition.</returns>
+        public static IEnumerable<Locker> Get(LockerType lockerType) => Get(x => x.Type == lockerType);
+
         /// <summary>
         /// Gets a <see cref="IEnumerable{T}"/> of <see cref="Locker"/> filtered based on a predicate.
         /// </summary>
         /// <param name="predicate">The condition to satify.</param>
-        /// <returns>A <see cref="IEnumerable{T}"/> of <see cref="Locker"/> which contains elements that satify the condition.</returns>
+        /// <returns>A <see cref="IEnumerable{T}"/> of <see cref="Locker"/> which contains elements that satisfy the condition.</returns>
         public static IEnumerable<Locker> Get(Func<Locker, bool> predicate) => List.Where(predicate);
 
         /// <summary>
diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
index 1c1e7fb54..c0bc8f40b 100644
--- a/EXILED/Exiled.API/Features/Player.cs
+++ b/EXILED/Exiled.API/Features/Player.cs
@@ -19,6 +19,7 @@ namespace Exiled.API.Features
     using DamageHandlers;
     using Enums;
     using Exiled.API.Features.Core.Interfaces;
+    using Exiled.API.Features.CustomStats;
     using Exiled.API.Features.Doors;
     using Exiled.API.Features.Hazards;
     using Exiled.API.Features.Items;
@@ -96,6 +97,7 @@ public class Player : TypeCastObject<Player>, IEntity, IWorldSpace
 
         private ReferenceHub referenceHub;
         private CustomHealthStat healthStat;
+        private CustomHumeShieldStat humeShieldStat;
         private Role role;
 
         /// <summary>
@@ -177,6 +179,7 @@ private set
                 CameraTransform = value.PlayerCameraReference;
 
                 value.playerStats._dictionarizedTypes[typeof(HealthStat)] = value.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HealthStat))] = healthStat = new CustomHealthStat { Hub = value };
+                value.playerStats._dictionarizedTypes[typeof(HumeShieldStat)] = value.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HumeShieldStat))] = humeShieldStat = new CustomHumeShieldStat { Hub = value };
             }
         }
 
@@ -930,6 +933,24 @@ public float HumeShield
             set => HumeShieldStat.CurValue = value;
         }
 
+        /// <summary>
+        /// Gets or sets the players maximum Hume Shield.
+        /// </summary>
+        public float MaxHumeShield
+        {
+            get => humeShieldStat.MaxValue;
+            set => humeShieldStat.CustomMaxValue = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the players multiplier for gaining HumeShield.
+        /// </summary>
+        public float HumeShieldRegenerationMultiplier
+        {
+            get => humeShieldStat.ShieldRegenerationMultiplier;
+            set => humeShieldStat.ShieldRegenerationMultiplier = value;
+        }
+
         /// <summary>
         /// Gets a <see cref="IEnumerable{T}"/> of all active Artificial Health processes on the player.
         /// </summary>
@@ -937,8 +958,9 @@ public float HumeShield
 
         /// <summary>
         /// Gets the player's <see cref="PlayerStatsSystem.HumeShieldStat"/>.
+        /// TODO: Change to <see cref="CustomHumeShieldStat"/>.
         /// </summary>
-        public HumeShieldStat HumeShieldStat => ReferenceHub.playerStats.GetModule<HumeShieldStat>();
+        public HumeShieldStat HumeShieldStat => humeShieldStat;
 
         /// <summary>
         /// Gets or sets the item in the player's hand. Value will be <see langword="null"/> if the player is not holding anything.
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
index 098340fa7..dc880fe69 100644
--- a/EXILED/Exiled.API/Features/Room.cs
+++ b/EXILED/Exiled.API/Features/Room.cs
@@ -508,12 +508,12 @@ private static RoomType FindType(GameObject gameObject)
                 "EZ_Shelter" => RoomType.EzShelter,
                 "EZ_HCZ_Checkpoint Part" => gameObject.transform.position.z switch
                 {
-                    > 80 => RoomType.EzCheckpointHallwayA,
+                    > 95 => RoomType.EzCheckpointHallwayA,
                     _ => RoomType.EzCheckpointHallwayB,
                 },
                 "HCZ_EZ_Checkpoint Part" => gameObject.transform.position.z switch
                 {
-                    > 80 => RoomType.HczEzCheckpointA,
+                    > 95 => RoomType.HczEzCheckpointA,
                     _ => RoomType.HczEzCheckpointB
                 },
                 _ => RoomType.Unknown,
diff --git a/EXILED/Exiled.API/Features/Toys/Light.cs b/EXILED/Exiled.API/Features/Toys/Light.cs
index eee626928..9496f6b83 100644
--- a/EXILED/Exiled.API/Features/Toys/Light.cs
+++ b/EXILED/Exiled.API/Features/Toys/Light.cs
@@ -113,6 +113,15 @@ public LightType LightType
             set => Base.NetworkLightType = value;
         }
 
+        /// <summary>
+        /// Gets or sets the type of shadows the light casts.
+        /// </summary>
+        public LightShadows ShadowType
+        {
+            get => Base.NetworkShadowType;
+            set => Base.NetworkShadowType = value;
+        }
+
         /// <summary>
         /// Creates a new <see cref="Light"/>.
         /// </summary>
diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
index f4f6116ae..8aff47f91 100644
--- a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs
@@ -834,7 +834,8 @@ internal bool TryUnregister()
         protected virtual void SubscribeEvents()
         {
             Exiled.Events.Handlers.Player.Dying += OnInternalOwnerDying;
-            Exiled.Events.Handlers.Player.DroppingItem += OnInternalDropping;
+            Exiled.Events.Handlers.Player.DroppingItem += OnInternalDroppingItem;
+            Exiled.Events.Handlers.Player.DroppingAmmo += OnInternalDroppingAmmo;
             Exiled.Events.Handlers.Player.ChangingItem += OnInternalChanging;
             Exiled.Events.Handlers.Player.Escaping += OnInternalOwnerEscaping;
             Exiled.Events.Handlers.Player.PickingUpItem += OnInternalPickingUp;
@@ -852,7 +853,8 @@ protected virtual void SubscribeEvents()
         protected virtual void UnsubscribeEvents()
         {
             Exiled.Events.Handlers.Player.Dying -= OnInternalOwnerDying;
-            Exiled.Events.Handlers.Player.DroppingItem -= OnInternalDropping;
+            Exiled.Events.Handlers.Player.DroppingItem -= OnInternalDroppingItem;
+            Exiled.Events.Handlers.Player.DroppingAmmo -= OnInternalDroppingAmmo;
             Exiled.Events.Handlers.Player.ChangingItem -= OnInternalChanging;
             Exiled.Events.Handlers.Player.Escaping -= OnInternalOwnerEscaping;
             Exiled.Events.Handlers.Player.PickingUpItem -= OnInternalPickingUp;
@@ -900,10 +902,27 @@ protected virtual void OnOwnerHandcuffing(OwnerHandcuffingEventArgs ev)
         /// Handles tracking items when they are dropped by a player.
         /// </summary>
         /// <param name="ev"><see cref="DroppingItemEventArgs"/>.</param>
+        protected virtual void OnDroppingItem(DroppingItemEventArgs ev)
+        {
+        }
+
+        /// <summary>
+        /// Handles tracking items when they are dropped by a player.
+        /// </summary>
+        /// <param name="ev"><see cref="DroppingItemEventArgs"/>.</param>
+        [Obsolete("Use OnDroppingItem instead.", false)]
         protected virtual void OnDropping(DroppingItemEventArgs ev)
         {
         }
 
+        /// <summary>
+        /// Handles tracking when player requests drop of item which <see cref="ItemType"/> equals to the <see cref="ItemType"/> specified by <see cref="CustomItem"/>.
+        /// </summary>
+        /// <param name="ev"><see cref="DroppingAmmoEventArgs"/>.</param>
+        protected virtual void OnDroppingAmmo(DroppingAmmoEventArgs ev)
+        {
+        }
+
         /// <summary>
         /// Handles tracking items when they are picked up by a player.
         /// </summary>
@@ -1061,12 +1080,25 @@ private void OnInternalOwnerHandcuffing(HandcuffingEventArgs ev)
             }
         }
 
-        private void OnInternalDropping(DroppingItemEventArgs ev)
+        private void OnInternalDroppingItem(DroppingItemEventArgs ev)
         {
             if (!Check(ev.Item))
                 return;
 
+            OnDroppingItem(ev);
+
+            // TODO: Don't forget to remove this with next update
+#pragma warning disable CS0618
             OnDropping(ev);
+#pragma warning restore CS0618
+        }
+
+        private void OnInternalDroppingAmmo(DroppingAmmoEventArgs ev)
+        {
+            if (Type != ev.ItemType)
+                return;
+
+            OnDroppingAmmo(ev);
         }
 
         private void OnInternalPickingUp(PickingUpItemEventArgs ev)
diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomKeycard.cs b/EXILED/Exiled.CustomItems/API/Features/CustomKeycard.cs
new file mode 100644
index 000000000..e28f1ea3d
--- /dev/null
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomKeycard.cs
@@ -0,0 +1,127 @@
+// -----------------------------------------------------------------------
+// <copyright file="CustomKeycard.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.CustomItems.API.Features
+{
+    using System;
+
+    using Exiled.API.Enums;
+    using Exiled.API.Extensions;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Doors;
+    using Exiled.API.Features.Items;
+    using Exiled.API.Features.Lockers;
+    using Exiled.API.Features.Pickups;
+    using Exiled.Events.EventArgs.Item;
+    using Exiled.Events.EventArgs.Player;
+    using UnityEngine;
+
+    /// <summary>
+    /// The Custom keycard base class.
+    /// </summary>
+    public abstract class CustomKeycard : CustomItem
+    {
+        /// <inheritdoc/>
+        /// <exception cref="ArgumentOutOfRangeException">Throws if specified <see cref="ItemType"/> is not Keycard.</exception>
+        public override ItemType Type
+        {
+            get => base.Type;
+            set
+            {
+                if (!value.IsKeycard())
+                    throw new ArgumentOutOfRangeException("Type", value, "Invalid keycard type.");
+
+                base.Type = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the permissions for custom keycard.
+        /// </summary>
+        public virtual KeycardPermissions Permissions { get; set; }
+
+        /// <inheritdoc/>
+        public override void Give(Player player, Item item, bool displayMessage = true)
+        {
+            base.Give(player, item, displayMessage);
+
+            if (item.Is(out Keycard card))
+                card.Permissions = Permissions;
+        }
+
+        /// <inheritdoc/>
+        public override Pickup? Spawn(Vector3 position, Item item, Player? previousOwner = null)
+        {
+            if (item.Is(out Keycard card))
+                card.Permissions = Permissions;
+
+            return base.Spawn(position, item, previousOwner);
+        }
+
+        /// <summary>
+        /// Called when custom keycard interacts with a door.
+        /// </summary>
+        /// <param name="player">Owner of Custom keycard.</param>
+        /// <param name="door">Door with which interacting.</param>
+        protected virtual void OnInteractingDoor(Player player, Door door)
+        {
+        }
+
+        /// <summary>
+        /// Called when custom keycard interacts with a locker.
+        /// </summary>
+        /// <param name="player">Owner of Custom keycard.</param>
+        /// <param name="chamber">Chamber with which interacting.</param>
+        protected virtual void OnInteractingLocker(Player player, Chamber chamber)
+        {
+        }
+
+        /// <inheritdoc/>
+        protected override void SubscribeEvents()
+        {
+            base.SubscribeEvents();
+
+            Exiled.Events.Handlers.Player.InteractingDoor += OnInternalInteractingDoor;
+            Exiled.Events.Handlers.Player.InteractingLocker += OnInternalInteractingLocker;
+            Exiled.Events.Handlers.Item.KeycardInteracting += OnInternalKeycardInteracting;
+        }
+
+        /// <inheritdoc/>
+        protected override void UnsubscribeEvents()
+        {
+            base.UnsubscribeEvents();
+
+            Exiled.Events.Handlers.Player.InteractingDoor -= OnInternalInteractingDoor;
+            Exiled.Events.Handlers.Player.InteractingLocker -= OnInternalInteractingLocker;
+            Exiled.Events.Handlers.Item.KeycardInteracting -= OnInternalKeycardInteracting;
+        }
+
+        private void OnInternalKeycardInteracting(KeycardInteractingEventArgs ev)
+        {
+            if (!Check(ev.Pickup))
+                return;
+
+            OnInteractingDoor(ev.Player, ev.Door);
+        }
+
+        private void OnInternalInteractingDoor(InteractingDoorEventArgs ev)
+        {
+            if (!Check(ev.Player.CurrentItem))
+                return;
+
+            OnInteractingDoor(ev.Player, ev.Door);
+        }
+
+        private void OnInternalInteractingLocker(InteractingLockerEventArgs ev)
+        {
+            if (!Check(ev.Player.CurrentItem))
+                return;
+
+            OnInteractingLocker(ev.Player, ev.InteractingChamber);
+        }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index b8217fb41..7de3e2eef 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -920,7 +920,7 @@ private void OnInternalChangingNickname(ChangingNicknameEventArgs ev)
 
         private void OnInternalSpawning(SpawningEventArgs ev)
         {
-            if (!IgnoreSpawnSystem && SpawnChance > 0 && !Check(ev.Player) && ev.Player.Role.Type == Role && Loader.Random.NextDouble() * 100 <= SpawnChance)
+            if (!IgnoreSpawnSystem && SpawnChance > 0 && !Check(ev.Player) && ev.NewRole == Role && Loader.Random.NextDouble() * 100 <= SpawnChance)
                 AddRole(ev.Player);
         }
 
diff --git a/EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs
index 342d4b311..6bb6c9ad6 100644
--- a/EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs
@@ -26,9 +26,7 @@ public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.Item
         {
             Player = Player.Get(player);
             Jailbird = (Jailbird)Item.Get(swingItem);
-#pragma warning disable CS0618
             IsAllowed = isAllowed;
-#pragma warning restore CS0618
         }
 
         /// <summary>
@@ -47,8 +45,8 @@ public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.Item
         public Item Item => Jailbird;
 
         /// <summary>
-        /// Gets a value indicating whether the Jailbird can be charged.
+        /// Gets or sets a value indicating whether the Jailbird can be charged.
         /// </summary>
-        public bool IsAllowed { get; }
+        public bool IsAllowed { get; set; }
     }
 }
diff --git a/EXILED/Exiled.Events/EventArgs/Map/ExplodingGrenadeEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/ExplodingGrenadeEventArgs.cs
index 27b0bc165..7cb2613ce 100644
--- a/EXILED/Exiled.Events/EventArgs/Map/ExplodingGrenadeEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Map/ExplodingGrenadeEventArgs.cs
@@ -27,6 +27,8 @@ namespace Exiled.Events.EventArgs.Map
     /// </summary>
     public class ExplodingGrenadeEventArgs : IPlayerEvent, IDeniableEvent
     {
+        private ExplosionType explosionType;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExplodingGrenadeEventArgs"/> class.
         /// </summary>
@@ -34,12 +36,14 @@ public class ExplodingGrenadeEventArgs : IPlayerEvent, IDeniableEvent
         /// <param name="position"><inheritdoc cref="Position"/></param>
         /// <param name="grenade"><inheritdoc cref="Projectile"/></param>
         /// <param name="targets"><inheritdoc cref="TargetsToAffect"/></param>
-        public ExplodingGrenadeEventArgs(Footprint thrower, Vector3 position, ExplosionGrenade grenade, Collider[] targets)
+        /// <param name="explosionType"><inheritdoc cref="ExplosionType"/></param>
+        public ExplodingGrenadeEventArgs(Footprint thrower, Vector3 position, ExplosionGrenade grenade, Collider[] targets, ExplosionType explosionType)
         {
             Player = Player.Get(thrower.Hub);
             Projectile = Pickup.Get<EffectGrenadeProjectile>(grenade);
             Position = position;
             TargetsToAffect = HashSetPool<Player>.Pool.Get();
+            ExplosionType = explosionType;
 
             if (Projectile.Base is not ExplosionGrenade)
                 return;
@@ -97,6 +101,7 @@ public ExplodingGrenadeEventArgs(Player thrower, EffectGrenade grenade, HashSet<
             Player = thrower ?? Server.Host;
             Projectile = Pickup.Get<EffectGrenadeProjectile>(grenade);
             Position = Projectile.Position;
+            ExplosionType = ExplosionType.Custom;
             TargetsToAffect = HashSetPool<Player>.Pool.Get(targetsToAffect ?? new HashSet<Player>());
             IsAllowed = isAllowed;
         }
@@ -114,6 +119,16 @@ public ExplodingGrenadeEventArgs(Player thrower, EffectGrenade grenade, HashSet<
         /// </summary>
         public Vector3 Position { get; }
 
+        /// <summary>
+        /// Gets or sets the Explosion type.
+        /// </summary>
+        /// <remarks>Explosion that are not from <see cref="ExplosionGrenadeProjectile"/> will return <see cref="ExplosionType.Custom"/> and can't be modified.</remarks>
+        public ExplosionType ExplosionType
+        {
+            get => explosionType;
+            set => explosionType = Projectile is ExplosionGrenadeProjectile ? value : ExplosionType.Custom;
+        }
+
         /// <summary>
         /// Gets the players who could be affected by the grenade, if any, and the damage that be dealt.
         /// </summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Player/DroppedAmmoEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/DroppedAmmoEventArgs.cs
index fe2dacbd9..78d229d08 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/DroppedAmmoEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/DroppedAmmoEventArgs.cs
@@ -11,6 +11,7 @@ namespace Exiled.Events.EventArgs.Player
 
     using API.Enums;
     using API.Features;
+    using Exiled.API.Extensions;
     using Exiled.API.Features.Pickups;
     using Interfaces;
 
@@ -27,8 +28,8 @@ public class DroppedAmmoEventArgs : IPlayerEvent
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="ammoType">
-        /// <inheritdoc cref="AmmoType" />
+        /// <param name="itemType">
+        /// <inheritdoc cref="ItemType"/>
         /// </param>
         /// <param name="amount">
         /// <inheritdoc cref="Amount" />
@@ -36,14 +37,20 @@ public class DroppedAmmoEventArgs : IPlayerEvent
         /// <param name="ammoPickups">
         /// <inheritdoc cref="AmmoPickups" />
         /// </param>
-        public DroppedAmmoEventArgs(Player player, AmmoType ammoType, ushort amount, List<InventorySystem.Items.Firearms.Ammo.AmmoPickup> ammoPickups)
+        public DroppedAmmoEventArgs(Player player, ItemType itemType, ushort amount, List<InventorySystem.Items.Firearms.Ammo.AmmoPickup> ammoPickups)
         {
             Player = player;
-            AmmoType = ammoType;
+            ItemType = itemType;
+            AmmoType = ItemExtensions.GetAmmoType(itemType);
             Amount = amount;
             AmmoPickups = Pickup.Get<AmmoPickup>(ammoPickups);
         }
 
+        /// <summary>
+        /// Gets the type of dropped item instead of <see cref="API.Enums.AmmoType"/>.
+        /// </summary>
+        public ItemType ItemType { get; }
+
         /// <summary>
         /// Gets the type of dropped ammo.
         /// </summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Player/DroppingAmmoEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/DroppingAmmoEventArgs.cs
index cceb19e75..0b379c903 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/DroppingAmmoEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/DroppingAmmoEventArgs.cs
@@ -9,7 +9,7 @@ namespace Exiled.Events.EventArgs.Player
 {
     using API.Enums;
     using API.Features;
-
+    using Exiled.API.Extensions;
     using Interfaces;
 
     using PlayerRoles;
@@ -27,8 +27,8 @@ public class DroppingAmmoEventArgs : IPlayerEvent, IDeniableEvent
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="ammoType">
-        /// <inheritdoc cref="AmmoType" />
+        /// <param name="itemType">
+        /// <inheritdoc cref="ItemType"/>
         /// </param>
         /// <param name="amount">
         /// <inheritdoc cref="int" />
@@ -36,14 +36,21 @@ public class DroppingAmmoEventArgs : IPlayerEvent, IDeniableEvent
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
-        public DroppingAmmoEventArgs(Player player, AmmoType ammoType, ushort amount, bool isAllowed = true)
+        public DroppingAmmoEventArgs(Player player, ItemType itemType, ushort amount, bool isAllowed = true)
         {
             Player = player;
-            AmmoType = ammoType;
+            ItemType = itemType;
+            AmmoType = ItemExtensions.GetAmmoType(itemType);
             Amount = amount;
             IsAllowed = isAllowed;
         }
 
+        /// <summary>
+        /// Gets the type of item being dropped instead of <see cref="API.Enums.AmmoType"/>.
+        /// For example, if the plugin gives the player one of the items instead of ammo.
+        /// </summary>
+        public ItemType ItemType { get; }
+
         /// <summary>
         /// Gets the type of ammo being dropped.
         /// </summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Player/InteractingDoorEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/InteractingDoorEventArgs.cs
index 49a5f2049..75eb562f3 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/InteractingDoorEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/InteractingDoorEventArgs.cs
@@ -9,6 +9,7 @@ namespace Exiled.Events.EventArgs.Player
 {
     using API.Features;
     using Exiled.API.Features.Doors;
+    using Interactables;
     using Interactables.Interobjects.DoorUtils;
     using Interfaces;
 
@@ -26,16 +27,21 @@ public class InteractingDoorEventArgs : IPlayerEvent, IDoorEvent, IDeniableEvent
         /// <param name="door">
         /// <inheritdoc cref="Door" />
         /// </param>
+        /// <param name="colliderId">
+        /// <inheritdoc cref="ColliderId"/>
+        /// </param>
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
         /// <param name="canInteract">
         /// <inheritdoc cref="CanInteract" />
         /// </param>
-        public InteractingDoorEventArgs(Player player, DoorVariant door, bool isAllowed = true, bool canInteract = true)
+        public InteractingDoorEventArgs(Player player, DoorVariant door, byte colliderId, bool isAllowed = true, bool canInteract = true)
         {
             Player = player;
             Door = Door.Get(door);
+            ColliderId = colliderId;
+            Collider = InteractableCollider.TryGetCollider(door, colliderId, out InteractableCollider interactableCollider) ? interactableCollider : null;
             IsAllowed = isAllowed;
             CanInteract = canInteract;
         }
@@ -51,10 +57,20 @@ public InteractingDoorEventArgs(Player player, DoorVariant door, bool isAllowed
         public bool IsAllowed { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="API.Features.Doors.Door" /> instance.
+        /// Gets or sets the <see cref="API.Features.Doors.Door"/> instance.
         /// </summary>
         public Door Door { get; set; }
 
+        /// <summary>
+        /// Gets the <see cref="InteractableCollider"/> instance that the player interacted with.
+        /// </summary>
+        public InteractableCollider Collider { get; }
+
+        /// <summary>
+        /// Gets the ColliderId of <see cref="InteractableCollider"/> that the player interacted with.
+        /// </summary>
+        public byte ColliderId { get; }
+
         /// <summary>
         /// Gets the player who's interacting with the door.
         /// </summary>
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/JailbirdPatch.cs b/EXILED/Exiled.Events/Patches/Events/Item/JailbirdPatch.cs
index af13bdffc..8ffa6e06e 100644
--- a/EXILED/Exiled.Events/Patches/Events/Item/JailbirdPatch.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Item/JailbirdPatch.cs
@@ -88,7 +88,12 @@ private static bool HandleJailbird(JailbirdItem instance, JailbirdMessageType me
                     ChargingJailbirdEventArgs ev = new(instance.Owner, instance);
 
                     Item.OnChargingJailbird(ev);
-                    return true;
+                    if (ev.IsAllowed)
+                        return true;
+
+                    ev.Player.RemoveHeldItem(destroy: false);
+                    ev.Player.AddItem(ev.Item);
+                    return false;
                 }
 
                 default:
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs b/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs
index 37a8bef64..e29c8c621 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs
@@ -84,8 +84,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     // Collider[]
                     new(OpCodes.Ldloc_3),
 
-                    // ExplodingGrenadeEventArgs ev = new(player, position, grenade, colliders);
-                    new(OpCodes.Newobj, DeclaredConstructor(typeof(ExplodingGrenadeEventArgs), new[] { typeof(Footprint), typeof(Vector3), typeof(ExplosionGrenade), typeof(Collider[]) })),
+                    // explosionType
+                    new(OpCodes.Ldarg_3),
+
+                    // ExplodingGrenadeEventArgs ev = new(player, position, grenade, colliders, ExplosionType);
+                    new(OpCodes.Newobj, DeclaredConstructor(typeof(ExplodingGrenadeEventArgs), new[] { typeof(Footprint), typeof(Vector3), typeof(ExplosionGrenade), typeof(Collider[]), typeof(ExplosionType) })),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),
                     new(OpCodes.Stloc, ev.LocalIndex),
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs b/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs
index 16a1b96e8..ff3a09dfa 100644
--- a/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs
@@ -9,23 +9,19 @@ namespace Exiled.Events.Patches.Events.Map
 {
     using System.Collections.Generic;
     using System.Linq;
-    using System.Reflection;
     using System.Reflection.Emit;
 
     using API.Features.Pools;
+    using Attributes;
     using Decals;
-    using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Map;
     using Handlers;
     using HarmonyLib;
-    using InventorySystem.Items;
     using InventorySystem.Items.Firearms.Modules;
     using UnityEngine;
 
     using static HarmonyLib.AccessTools;
 
-    using Player = API.Features.Player;
-
     /// <summary>
     /// Patches <see cref="ImpactEffectsModule.ServerSendImpactDecal(RaycastHit, Vector3, DecalPoolType)" />.
     /// Adds the <see cref="Map.PlacingBulletHole" /> event.
@@ -50,10 +46,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     // this.Firearm
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ImpactEffectsModule), nameof(ImpactEffectsModule.Firearm))),
-                    new(OpCodes.Call, TypeByName("Exiled.API.Features.Items.Item").GetMethods().Where(x => x.Name == "Get").First()),
+                    new(OpCodes.Call, typeof(Exiled.API.Features.Items.Item).GetMethods().Where(x => x.Name == "Get").First()),
 
                     // hit
-                    new(OpCodes.Ldarg_2),
+                    new(OpCodes.Ldarg_1),
 
                     // PlacingBulletHole ev = new(Item, RaycastHit)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(PlacingBulletHoleEventArgs))[0]),
@@ -70,13 +66,13 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Brfalse, returnLabel),
 
                     // hit.info = ev.Position
-                    new(OpCodes.Ldarga_S, 2),
+                    new(OpCodes.Ldarga_S, 1),
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(PlacingBulletHoleEventArgs), nameof(PlacingBulletHoleEventArgs.Position))),
                     new(OpCodes.Callvirt, PropertySetter(typeof(RaycastHit), nameof(RaycastHit.point))),
 
                     // hit.normal = ev.Rotation
-                    new(OpCodes.Ldarga_S, 2),
+                    new(OpCodes.Ldarga_S, 1),
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(PlacingBulletHoleEventArgs), nameof(PlacingBulletHoleEventArgs.Rotation))),
                     new(OpCodes.Stloc_S, rotation),
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/DroppingAmmo.cs b/EXILED/Exiled.Events/Patches/Events/Player/DroppingAmmo.cs
index 63b5e620f..180a0bd11 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/DroppingAmmo.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/DroppingAmmo.cs
@@ -50,9 +50,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldfld, Field(typeof(Inventory), nameof(Inventory._hub))),
                 new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                // ammoType
+                // itemType
                 new(OpCodes.Ldarg_1),
-                new(OpCodes.Call, Method(typeof(API.Extensions.ItemExtensions), nameof(API.Extensions.ItemExtensions.GetAmmoType))),
 
                 // amount
                 new(OpCodes.Ldarg_2),
@@ -60,7 +59,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // true
                 new(OpCodes.Ldc_I4_1),
 
-                // DroppingAmmoEventArgs ev = new(Player, AmmoType, ushort, bool)
+                // DroppingAmmoEventArgs ev = new(Player, ItemType, ushort, bool)
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(DroppingAmmoEventArgs))[0]),
                 new(OpCodes.Dup),
                 new(OpCodes.Dup),
@@ -84,9 +83,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingAmmoEventArgs), nameof(DroppingAmmoEventArgs.Player))),
 
-                // ev.AmmoType
+                // ev.ItemType
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingAmmoEventArgs), nameof(DroppingAmmoEventArgs.AmmoType))),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingAmmoEventArgs), nameof(DroppingAmmoEventArgs.ItemType))),
 
                 // ev.Amount
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
@@ -95,7 +94,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // ammoPickups
                 new(OpCodes.Ldloc_S, ammoPickups.LocalIndex),
 
-                // Handlers::Player::OnDroppedAmmo(new DroppedAmmoEventArgs(ev.Player, ev.AmmoType, ev.Amount, ammoPickups))
+                // Handlers::Player::OnDroppedAmmo(new DroppedAmmoEventArgs(ev.Player, ev.ItemType, ev.Amount, ammoPickups))
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(DroppedAmmoEventArgs))[0]),
                 new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnDroppedAmmo))),
             });
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/DryFire.cs b/EXILED/Exiled.Events/Patches/Events/Player/DryFire.cs
index 59b209e10..9ea721c3b 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/DryFire.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/DryFire.cs
@@ -12,17 +12,15 @@ namespace Exiled.Events.Patches.Events.Player
 #pragma warning disable SA1649
     using System.Collections.Generic;
     using System.Linq;
-    using System.Reflection;
     using System.Reflection.Emit;
 
-    using Exiled.API.Extensions;
-    using Exiled.API.Features.Pools;
+    using Attributes;
 
-    using Exiled.Events.Attributes;
+    using Exiled.API.Features.Pools;
 
     using Exiled.Events.EventArgs.Player;
 
-    using Exiled.Events.Handlers;
+    using Handlers;
 
     using HarmonyLib;
 
@@ -67,7 +65,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label ret = newInstructions[newInstructions.Count - 1 + offset].labels[0];
 
             offset = -2;
-            int index = newInstructions.FindLastIndex(x => x.Calls(PropertyGetter(typeof(AutomaticActionModule), nameof(AutomaticActionModule.Cocked)))) + offset;
+            int index = newInstructions.FindLastIndex(x => x.Calls(PropertySetter(typeof(AutomaticActionModule), nameof(AutomaticActionModule.Cocked)))) + offset;
 
             newInstructions.InsertRange(index, GetInstructions(newInstructions[index], ret));
 
@@ -78,6 +76,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
         }
     }
 
+    /* ------------> Commented out, because it is never called (nw moment). Calls 2 PumpActionModule.ShootOneBarrel(bool) instead.
     /// <summary>
     /// Patches <see cref="DoubleActionModule.FireDry()"/>
     /// to add <see cref="Player.DryfiringWeapon"/> event for double shots.
@@ -102,10 +101,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
+    */
 
     /// <summary>
-    /// Patches <see cref="DoubleActionModule.FireDry()"/>
-    /// to add <see cref="Player.DryfiringWeapon"/> event for double shots.
+    /// Patches <see cref="PumpActionModule.ShootOneBarrel(bool)"/>
+    /// to add <see cref="Player.DryfiringWeapon"/> event for pump shots.
     /// </summary>
     [EventPatch(typeof(Player), nameof(Player.DryfiringWeapon))]
     [HarmonyPatch(typeof(PumpActionModule), nameof(PumpActionModule.ShootOneBarrel))]
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/InteractingDoor.cs b/EXILED/Exiled.Events/Patches/Events/Player/InteractingDoor.cs
index 25b567ac7..417b03b85 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/InteractingDoor.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/InteractingDoor.cs
@@ -44,10 +44,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 0,
                 new CodeInstruction[]
                 {
-                    // InteractingDoorEventArgs ev = new(Player.Get(ply), __instance, false, true);
+                    // InteractingDoorEventArgs ev = new(Player.Get(ply), __instance, colliderId, false, true);
                     new(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
                     new(OpCodes.Ldarg_0),
+                    new(OpCodes.Ldarg_2),
                     new(OpCodes.Ldc_I4_0),
                     new(OpCodes.Ldc_I4_1),
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingDoorEventArgs))[0]),
diff --git a/EXILED/Exiled.Events/Patches/Events/Server/Unban.cs b/EXILED/Exiled.Events/Patches/Events/Server/Unban.cs
index 0700f5419..7792e7cdd 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/Unban.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/Unban.cs
@@ -18,15 +18,19 @@ namespace Exiled.Events.Patches.Events.Server
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="BanHandler.RemoveBan"/>
-    /// to add <see cref="Handlers.Server.Unbanning"/> and <see cref="Handlers.Server.Unbanned"/> events.
+    ///     Patches <see cref="BanHandler.RemoveBan" />
+    ///     to add <see cref="Handlers.Server.Unbanning" /> and <see cref="Handlers.Server.Unbanned" /> events.
     /// </summary>
-    [HarmonyPatch(typeof(BanHandler), nameof(BanHandler.RemoveBan))]
     [EventPatch(typeof(Handlers.Server), nameof(Handlers.Server.Unbanning))]
     [EventPatch(typeof(Handlers.Server), nameof(Handlers.Server.Unbanned))]
+    [HarmonyPatch]
     internal class Unban
     {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        [HarmonyPatch(typeof(BanHandler), nameof(BanHandler.RemoveBan))]
+        [HarmonyTranspiler]
+        private static IEnumerable<CodeInstruction> Transpiler(
+            IEnumerable<CodeInstruction> instructions,
+            ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
@@ -34,7 +38,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             Label continueLabel = generator.DefineLabel();
 
-            newInstructions.InsertRange(0, new CodeInstruction[]
+            newInstructions.InsertRange(0, new[]
             {
                 // id
                 new(OpCodes.Ldarg_0),
@@ -83,7 +87,66 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             });
 
             for (int z = 0; z < newInstructions.Count; z++)
+            {
+                yield return newInstructions[z];
+            }
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+
+        [HarmonyPatch(typeof(BanHandler), nameof(BanHandler.ValidateBans), typeof(BanHandler.BanType))]
+        [HarmonyTranspiler]
+        private static IEnumerable<CodeInstruction> BanHandlerTranspiler(
+            IEnumerable<CodeInstruction> instructions,
+            ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+
+            LocalBuilder ev = generator.DeclareLocal(typeof(UnbanningEventArgs));
+
+            Label continueLabel = generator.DefineLabel();
+
+            const int offset = 2;
+            int index = newInstructions.FindIndex(instruction =>
+                instruction.Calls(Method(typeof(BanHandler), nameof(BanHandler.CheckExpiration)))) + offset;
+
+            CodeInstruction addToUnbannedListInstruction = newInstructions[index];
+            newInstructions.InsertRange(index, new[]
+            {
+                // id
+                new CodeInstruction(OpCodes.Ldloc, 4).MoveLabelsFrom(addToUnbannedListInstruction),
+
+                // type
+                new(OpCodes.Ldarg_0),
+
+                // true
+                new(OpCodes.Ldc_I4_1),
+
+                // UnbanningEventArgs ev = new(string, BanHandler.BanType, true);
+                new(OpCodes.Newobj, GetDeclaredConstructors(typeof(UnbanningEventArgs))[0]),
+
+                new(OpCodes.Dup),
+                new(OpCodes.Dup),
+                new(OpCodes.Stloc_S, ev.LocalIndex),
+
+                // Handlers.Server.OnUnbanning(ev);
+                new(OpCodes.Call, Method(typeof(Handlers.Server), nameof(Handlers.Server.OnUnbanning))),
+
+                // if (!ev.IsAllowed)
+                //    return;
+                new(OpCodes.Callvirt, PropertyGetter(typeof(UnbanningEventArgs), nameof(UnbanningEventArgs.IsAllowed))),
+                new(OpCodes.Brtrue_S, continueLabel),
+
+                new(OpCodes.Ret),
+            });
+
+            // Add label to ldloc.1
+            addToUnbannedListInstruction.WithLabels(continueLabel);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+            {
                 yield return newInstructions[z];
+            }
 
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }