Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Barotrauma/BarotraumaShared/SharedSource/StatusEffects/DelayedEffect.cs

@@ -113,6 +113,7 @@ namespace Barotrauma
         public override void Apply(ActionType type, float deltaTime, Entity entity, IReadOnlyList<ISerializableEntity> targets, Vector2? worldPosition = null)
         {
             if (this.type != type) { return; }
+            if (Disabled) { return; }
             if (ShouldWaitForInterval(entity, deltaTime)) { return; }
             if (!HasRequiredItems(entity)) { return; }
             if (delayType == DelayTypes.ReachCursor && Character.Controlled == null) { return; }

Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs

@@ -855,6 +855,9 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Disabled effects will no longer be executed. Used to make <see cref="oneShot">oneshot</> effects only execute once.
+        /// </summary>
         public bool Disabled { get; private set; }
 
         public static StatusEffect Load(ContentXElement element, string parentDebugName)