fix

WWhiteDreamProject · Aug 22, 2024 · 5e913b3 · 5e913b3
1 parent bb534ff
commit 5e913b3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Content.Shared/_White/Standing/SharedLayingDownSystem.cs b/Content.Shared/_White/Standing/SharedLayingDownSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.DoAfter;
+using Content.Shared.Gravity;
 using Content.Shared.Input;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Systems;
@@ -15,7 +16,7 @@ public abstract class SharedLayingDownSystem : EntitySystem
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly StandingStateSystem _standing = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
 
     public override void Initialize()
     {
@@ -40,8 +41,11 @@ public override void Shutdown()
     private void ToggleStanding(ICommonSession? session)
     {
         if (session?.AttachedEntity == null ||
-            !HasComp<LayingDownComponent>(session.AttachedEntity))
+            !HasComp<LayingDownComponent>(session.AttachedEntity) ||
+            _gravity.IsWeightless(session.AttachedEntity.Value))
+        {
             return;
+        }
 
         RaiseNetworkEvent(new ChangeLayingDownEvent());
     }
@@ -59,7 +63,9 @@ private void OnChangeState(ChangeLayingDownEvent ev, EntitySessionEventArgs args
 
         if (!TryComp(uid, out StandingStateComponent? standing) ||
             !TryComp(uid, out LayingDownComponent? layingDown))
+        {
             return;
+        }
 
         RaiseNetworkEvent(new CheckAutoGetUpEvent(GetNetEntity(uid)));
 
@@ -76,10 +82,13 @@ private void OnStandingUpDoAfter(EntityUid uid, StandingStateComponent component
     {
         if (args.Handled || args.Cancelled || HasComp<KnockedDownComponent>(uid) ||
             _mobState.IsIncapacitated(uid) || !_standing.Stand(uid))
+        {
             component.CurrentState = StandingState.Lying;
+        }
 
         component.CurrentState = StandingState.Standing;
     }
+
     private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args)
     {
         if (_standing.IsDown(uid))
@@ -94,7 +103,9 @@ private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntPa
         if (!TryComp<StandingStateComponent>(uid, out var standingState)
             || standingState.CurrentState is StandingState.Standing
             || Transform(uid).GridUid != null)
+        {
             return;
+        }
 
         TryStandUp(uid, component, standingState);
     }
@@ -106,7 +117,9 @@ public bool TryStandUp(EntityUid uid, LayingDownComponent? layingDown = null, St
             standingState.CurrentState is not StandingState.Lying ||
             !_mobState.IsAlive(uid) ||
             TerminatingOrDeleted(uid))
+        {
             return false;
+        }
 
         var args = new DoAfterArgs(EntityManager, uid, layingDown.StandingUpTime, new StandingUpDoAfterEvent(), uid)
         {

diff --git a/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl b/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl
@@ -1,2 +1 @@
-ui-options-function-look-up = Look up
 ui-options-function-auto-get-up = Automatically get up after falling
diff --git a/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl b/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl
@@ -1,2 +1 @@
-ui-options-function-look-up = Присмотреться
 ui-options-function-auto-get-up = Автоматически вставать при падении