[Fix] Fixes / Исправления

Content.Client/Doors/AirlockSystem.cs

@@ -90,12 +90,14 @@ private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref Appear
                             && lights && (state == DoorState.Closed || state == DoorState.Welded);
 
             emergencyLightsVisible = _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.EmergencyLights, out var eaLights, args.Component) && eaLights;
+
             unlitVisible =
                     (state == DoorState.Closing
                 ||  state == DoorState.Opening
                 ||  state == DoorState.Denying
-                || (state == DoorState.Open && comp.OpenUnlitVisible)
-                || (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights))
+                ||  state == DoorState.Open && comp.OpenUnlitVisible
+                ||  state == DoorState.Closed && comp.OpenUnlitVisible // WD EDIT
+                || _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights)
                     && !boltedVisible && !emergencyLightsVisible;
         }
 

Content.Server/Administration/Commands/AdminWhoCommand.cs

@@ -7,7 +7,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AnyCommand] // WD EDIT
 public sealed class AdminWhoCommand : IConsoleCommand
 {
     public string Command => "adminwho";
@@ -33,15 +33,17 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         var first = true;
         foreach (var admin in adminMgr.ActiveAdmins)
         {
-            if (!first)
-                sb.Append('\n');
-            first = false;
-
+            // WD EDIT START
             var adminData = adminMgr.GetAdminData(admin)!;
             DebugTools.AssertNotNull(adminData);
 
             if (adminData.Stealth && !seeStealth)
                 continue;
+            // WD EDIT END
+
+            if (!first)
+                sb.Append('\n');
+            first = false;
 
             sb.Append(admin.Name);
             if (adminData.Title is { } title)

Content.Shared/Doors/Components/AirlockComponent.cs

@@ -76,7 +76,7 @@ public sealed partial class AirlockComponent : Component
     /// Whether the door lights should be visible.
     /// </summary>
     [DataField]
-    public bool OpenUnlitVisible = false;
+    public bool OpenUnlitVisible = true; // WD EDIT
 
     /// <summary>
     /// Whether the door should display emergency access lights.

Content.Shared/Prying/Components/PryingComponent.cs

@@ -75,6 +75,7 @@ public record struct GetPryTimeModifierEvent
     public readonly EntityUid User;
     public float PryTimeModifier = 1.0f;
     public float BaseTime = 5.0f;
+    public float Neglect = 5f; // WD EDIT
 
     public GetPryTimeModifierEvent(EntityUid user)
     {

Content.Shared/Prying/Systems/PryingSystem.cs

@@ -133,7 +133,14 @@ private bool StartPry(EntityUid target, EntityUid user, EntityUid? tool, float t
         var modEv = new GetPryTimeModifierEvent(user);
 
         RaiseLocalEvent(target, ref modEv);
-        var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(modEv.BaseTime * modEv.PryTimeModifier / toolModifier), new DoorPryDoAfterEvent(), target, target, tool)
+
+        // WD EDIT START
+        var time = modEv.BaseTime * modEv.PryTimeModifier / toolModifier;
+
+        if (time <= modEv.Neglect)
+            time = 0;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(time), new DoorPryDoAfterEvent(), target, target, tool) // WD EDIT END
         {
             BreakOnDamage = true,
             BreakOnUserMove = true,
@@ -167,7 +174,7 @@ private void OnDoAfter(EntityUid uid, DoorComponent door, DoorPryDoAfterEvent ar
             return;
         }
 
-        if (args.Used != null && comp != null)
+        if (args.Used != null && comp != null && door.State is not DoorState.Closing and not DoorState.Opening) // WD EDIT
         {
             _audioSystem.PlayPredicted(comp.UseSound, args.Used.Value, args.User);
         }

Content.Shared/Throwing/ThrownItemComponent.cs

@@ -50,5 +50,7 @@ public sealed partial class ThrownItemComponent : Component
         /// </summary>
         [DataField]
         public Vector2? OriginalScale = null;
+
+        public readonly List<EntityUid> Processed = new(); // WD EDIT
     }
 }

Content.Shared/Throwing/ThrownItemSystem.cs

@@ -65,7 +65,13 @@ private void HandleCollision(EntityUid uid, ThrownItemComponent component, ref S
             if (args.OtherEntity == component.Thrower)
                 return;
 
+            // WD EDIT START
+            if (component.Processed.Contains(args.OtherEntity))
+                return;
+            // WD EDIT END
+
             ThrowCollideInteraction(component, args.OurEntity, args.OtherEntity);
+            component.Processed.Add(args.OtherEntity); // WD EDIT
         }
 
         private void PreventCollision(EntityUid uid, ThrownItemComponent component, ref PreventCollideEvent args)
@@ -110,6 +116,7 @@ public void StopThrow(EntityUid uid, ThrownItemComponent thrownItemComponent)
 
             EntityManager.EventBus.RaiseLocalEvent(uid, new StopThrowEvent { User = thrownItemComponent.Thrower }, true);
             EntityManager.RemoveComponent<ThrownItemComponent>(uid);
+            thrownItemComponent.Processed.Clear(); // WD EDIT
         }
 
         public void LandComponent(EntityUid uid, ThrownItemComponent thrownItem, PhysicsComponent physics, bool playSound)
@@ -137,10 +144,10 @@ public void ThrowCollideInteraction(ThrownItemComponent component, EntityUid thr
                 _adminLogger.Add(LogType.ThrowHit, LogImpact.Low,
                     $"{ToPrettyString(thrown):thrown} thrown by {ToPrettyString(component.Thrower.Value):thrower} hit {ToPrettyString(target):target}.");
 
-            if (component.Thrower is not null)// Nyano - Summary: Gotta check if there was a thrower. 
+            if (component.Thrower is not null)// Nyano - Summary: Gotta check if there was a thrower.
                 RaiseLocalEvent(target, new ThrowHitByEvent(component.Thrower.Value, thrown, target, component), true); // Nyano - Summary: Gotta update for who threw it.
             else
-                RaiseLocalEvent(target, new ThrowHitByEvent(null, thrown, target, component), true); // Nyano - Summary: No thrower. 
+                RaiseLocalEvent(target, new ThrowHitByEvent(null, thrown, target, component), true); // Nyano - Summary: No thrower.
             RaiseLocalEvent(thrown, new ThrowDoHitEvent(thrown, target, component), true);
         }
 

Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs

@@ -18,7 +18,7 @@ public sealed partial class ToolTileCompatibleComponent : Component
     /// The time it takes to modify the tile.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+    public TimeSpan Delay = TimeSpan.FromSeconds(0); // WD EDIT
 
     /// <summary>
     /// Whether or not the tile being modified must be unobstructed

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

@@ -4,7 +4,7 @@
   suffix: Freezer
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/freezer.rsi # WD EDIT
   - type: Wires
     layoutId: AirlockService
 
@@ -14,7 +14,7 @@
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/engineering.rsi # WD EDIT
   - type: PaintableAirlock
     department: Engineering
   - type: Wires
@@ -26,15 +26,15 @@
   suffix: Atmospherics
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/atmospherics.rsi # WD EDIT
 
 - type: entity
   parent: Airlock
   id: AirlockCargo
   suffix: Logistics # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/cargo.rsi # WD EDIT
   - type: PaintableAirlock
     department: Logistics
   - type: Wires
@@ -46,7 +46,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/medical.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/medical.rsi # WD EDIT
   - type: PaintableAirlock
     department: Medical
   - type: Wires
@@ -58,7 +58,7 @@
   suffix: Virology
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/virology.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/virology.rsi # WD EDIT
 
 - type: entity
   parent: AirlockMedical
@@ -71,7 +71,7 @@
   suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/science.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/science.rsi # WD EDIT
   - type: PaintableAirlock
     department: Epistemics
   - type: Wires
@@ -83,7 +83,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/command.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/command.rsi # WD EDIT
   - type: WiresPanelSecurity
     securityLevel: medSecurity
   - type: PaintableAirlock
@@ -97,7 +97,7 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/security.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/security.rsi # WD EDIT
   - type: PaintableAirlock
     department: Security
   - type: Wires
@@ -109,23 +109,23 @@
   name: maintenance access
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/maint.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/maint.rsi # WD EDIT
 
 - type: entity
   parent: AirlockSecurity # if you get syndie door somehow it counts as sec
   id: AirlockSyndicate
   suffix: Syndicate
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/syndicate.rsi # WD EDIT
 
 - type: entity
   parent: AirlockCargo
   id: AirlockMining
   suffix: Mining(Salvage)
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/mining.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/mining.rsi # WD EDIT
   - type: Wires
     layoutId: AirlockCargo
 
@@ -135,23 +135,23 @@
   suffix: Central Command
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/centcomm.rsi # WD EDIT
 
 - type: entity
   parent: Airlock
   id: AirlockHatch
   name: airtight hatch
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/hatch.rsi # WD EDIT
 
 - type: entity
   parent: Airlock
   id: AirlockHatchMaintenance
   name: maintenance hatch
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
+    sprite: _White/Structures/Doors/Airlocks/Standard/hatch_maint.rsi # WD EDIT
 
 # Glass
 - type: entity
@@ -160,7 +160,7 @@
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/engineering.rsi # WD EDIT
   - type: PaintableAirlock
     department: Engineering
   - type: Wires
@@ -172,23 +172,23 @@
   suffix: Maintenance
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/maint.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/maint.rsi # WD EDIT
 
 - type: entity
   parent: AirlockEngineeringGlass
   id: AirlockAtmosphericsGlass
   suffix: Atmospherics
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/atmospherics.rsi # WD EDIT
 
 - type: entity
   parent: AirlockGlass
   id: AirlockCargoGlass
   suffix: Logistics # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/cargo.rsi # WD EDIT
   - type: PaintableAirlock
     department: Logistics
   - type: Wires
@@ -200,7 +200,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/medical.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/medical.rsi # WD EDIT
   - type: PaintableAirlock
     department: Medical
   - type: Wires
@@ -217,15 +217,15 @@
   suffix: Virology
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/virology.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/virology.rsi # WD EDIT
 
 - type: entity
   parent: AirlockGlass
   id: AirlockScienceGlass
   suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/science.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/science.rsi # WD EDIT
   - type: PaintableAirlock
     department: Epistemics
   - type: Wires
@@ -237,7 +237,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/command.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/command.rsi # WD EDIT
   - type: PaintableAirlock
     department: Command
   - type: WiresPanelSecurity
@@ -251,7 +251,7 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/security.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/security.rsi # WD EDIT
   - type: PaintableAirlock
     department: Security
   - type: Wires
@@ -263,20 +263,20 @@
   suffix: Syndicate
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/syndicate.rsi # WD EDIT
 
 - type: entity
   parent: AirlockCargoGlass
   id: AirlockMiningGlass
   suffix: Mining(Salvage)
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/mining.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/mining.rsi # WD EDIT
 
 - type: entity
   parent: AirlockCommandGlass # see standard
   id: AirlockCentralCommandGlass
   suffix: Central Command
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
+    sprite: _White/Structures/Doors/Airlocks/Glass/centcomm.rsi # WD EDIT