diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs index 3e1ff4284c..e52cbd622c 100644 --- a/Content.Shared/Blocking/BlockingSystem.cs +++ b/Content.Shared/Blocking/BlockingSystem.cs @@ -212,6 +212,7 @@ public sealed partial class BlockingSystem : EntitySystem hard: true, collisionLayer: (int) CollisionGroup.WallLayer, body: physicsComponent); + _physics.SetBodyType(user, BodyType.Static, body: physicsComponent); } component.IsBlocking = true; diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs index 1324e4f822..31c8689bac 100644 --- a/Content.Shared/Damage/Systems/StaminaSystem.cs +++ b/Content.Shared/Damage/Systems/StaminaSystem.cs @@ -38,7 +38,6 @@ public sealed partial class StaminaSystem : EntitySystem [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; [Dependency] private readonly SharedStunSystem _stunSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; // WD EDIT /// /// 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; // 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); continue; diff --git a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml index 662c01118b..890d7d734e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml @@ -164,3 +164,4 @@ components: - type: SurveillanceCameraRouter subnetFrequency: SurveillanceCameraSecurity + subnetColor: "#DE3A3AFF"