From 1d461ec78526632e0034ef3d8152bc80f6447699 Mon Sep 17 00:00:00 2001 From: dakamakat Date: Mon, 1 Jul 2024 15:28:11 +0200 Subject: [PATCH 1/2] feat(MobStateSystem): do not disable collision and stop moving in crit --- Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs index 51991332539e57..87579034b03ff2 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs @@ -91,14 +91,7 @@ private void OnStateEnteredSubscribers(EntityUid target, MobStateComponent compo _appearance.SetData(target, MobStateVisuals.State, MobState.Critical); break; case MobState.Dead: - EnsureComp(target); _standing.Down(target); - - if (_standing.IsDown(target) && TryComp(target, out var physics)) - { - _physics.SetCanCollide(target, false, body: physics); - } - _appearance.SetData(target, MobStateVisuals.State, MobState.Dead); break; case MobState.Invalid: From b83dd52d3e25e6171f7cf36d9cd5ecdc76ec192e Mon Sep 17 00:00:00 2001 From: dakamakat Date: Wed, 3 Jul 2024 13:56:12 +0200 Subject: [PATCH 2/2] apply review requirements --- Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs index 87579034b03ff2..17df042435c7e8 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs @@ -91,6 +91,7 @@ private void OnStateEnteredSubscribers(EntityUid target, MobStateComponent compo _appearance.SetData(target, MobStateVisuals.State, MobState.Critical); break; case MobState.Dead: + EnsureComp(target); _standing.Down(target); _appearance.SetData(target, MobStateVisuals.State, MobState.Dead); break;