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

Felinid fixes and stuff. (#524)

Browse Source 
* - add: Felinid fixes and stuff.

* - fix: Fix felinids disappearing.
This commit is contained in:
Aviu00
2024-08-01 00:36:09 +00:00
committed by GitHub
parent 537417d39f
commit c8548f8dd6
6 changed files with 113 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Stunnable/SharedStunSystem.cs
View File

@@ -16,6 +16,7 @@ using Content.Shared.Standing.Systems;
using Content.Shared.StatusEffect;
using Content.Shared.Throwing;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
namespace Content.Shared.Stunnable;
@@ -27,6 +28,7 @@ public abstract class SharedStunSystem : EntitySystem
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedStandingStateSystem _standingState = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
/// <summary>
/// Friction modifier for knocked down players.
@@ -115,7 +117,7 @@ public abstract class SharedStunSystem : EntitySystem
if (!TryComp(uid, out StandingStateComponent? standing) || !(!standing.CanLieDown || standing.AutoGetUp)) // WD EDIT
return;
if (standing.AutoGetUp) // WD EDIT
if (standing.AutoGetUp && !_container.IsEntityInContainer(uid)) // WD EDIT
{
_standingState.TryStandUp(uid, standing);
return;