Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix (#508)

Browse Source
This commit is contained in:
Spatison
2024-07-28 21:02:54 +03:00
committed by GitHub
parent 5854304cc4
commit bd7537f568
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Shared/Blocking/BlockingSystem.cs
View File

@@ -212,6 +212,7 @@ public sealed partial class BlockingSystem : EntitySystem
hard: true, hard: true,
collisionLayer: (int) CollisionGroup.WallLayer, collisionLayer: (int) CollisionGroup.WallLayer,
body: physicsComponent); body: physicsComponent);
_physics.SetBodyType(user, BodyType.Static, body: physicsComponent);
} }
component.IsBlocking = true; component.IsBlocking = true;

3
Content.Shared/Damage/Systems/StaminaSystem.cs
View File

@@ -38,7 +38,6 @@ public sealed partial class StaminaSystem : EntitySystem
[Dependency] private readonly SharedColorFlashEffectSystem _color = default!; [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
[Dependency] private readonly SharedStunSystem _stunSystem = default!; [Dependency] private readonly SharedStunSystem _stunSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; // WD EDIT
/// <summary> /// <summary>
/// How much of a buffer is there between the stun duration and when stuns can be re-applied. /// How much of a buffer is there between the stun duration and when stuns can be re-applied.
@@ -365,7 +364,7 @@ public sealed partial class StaminaSystem : EntitySystem
continue; continue;
// We were in crit so come out of it and continue. // We were in crit so come out of it and continue.
if (!_statusEffectsSystem.HasStatusEffect(uid, "Stun") && comp.Critical) // WD EIT if (comp.Critical)
{ {
ExitStamCrit(uid, comp); ExitStamCrit(uid, comp);
continue; continue;

1
Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
View File

@@ -164,3 +164,4 @@
components: components:
- type: SurveillanceCameraRouter - type: SurveillanceCameraRouter
subnetFrequency: SurveillanceCameraSecurity subnetFrequency: SurveillanceCameraSecurity
subnetColor: "#DE3A3AFF"