diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index 93fe9cbef4..53744077bd 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -96,8 +96,10 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem private void OnRoundStart(RoundStartingEvent ev) { - CleanupEmergencyConsole(); + // WD EDIT START _roundEndCancelToken?.Cancel(); + CleanupEmergencyConsole(); + // WD EDIT END _roundEndCancelToken = new CancellationTokenSource(); } diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs index 0c01be5369..913ed70786 100644 --- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs @@ -215,7 +215,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem { if (EntityManager.IsQueuedForDeletion(uid)) // WD return; - + if (!ResolveStorage(uid, ref component)) return; diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml index 8c0698038e..40834a6578 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml @@ -184,9 +184,9 @@ - 0.5 - 0.5 - 0.75 - - 1.25 - - 1.25 - - 1.5 - - 1.5 - - 1.5 - - 1.5 + - 0.75 + - 0.75 + - 1 + - 1 + - 1 + - 1