Revert "Merge branch 'master' into Languages"

This reverts commit f2adcee, reversing
changes made to 90f3588.

Content.Client/Weapons/Ranged/Systems/GunSystem.cs

@@ -3,7 +3,6 @@
 using Content.Client.Weapons.Ranged.Components;
 using Content.Shared.Camera;
 using Content.Shared.CombatMode;
-using Content.Shared.Mech.Components;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
@@ -142,11 +141,6 @@ public override void Update(float frameTime)
 
         var entity = entityNull.Value;
 
-        if (TryComp<MechPilotComponent>(entity, out var mechPilot))
-        {
-            entity = mechPilot.Mech;
-        }
-
         if (!TryGetGun(entity, out var gunUid, out var gun))
         {
             return;

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -50,7 +50,6 @@ public sealed class PostMapInitTest
             "MeteorArena",
             "NukieOutpost",
             "Pebble", //DeltaV
-            "Saltern", //Syndicate Station
             "Edge", //DeltaV
             "Shoukou", //DeltaV
             "Tortuga", //DeltaV

Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs

@@ -1,11 +1,14 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
+using Content.Shared.Audio;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Physics;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.EntitySystems
@@ -48,7 +51,8 @@ private void UpdateHighPressure(float frameTime)
                 comp.Accumulator = 0f;
                 toRemove.Add(ent);
 
-                if (TryComp<PhysicsComponent>(uid, out var body))
+                if (HasComp<MobStateComponent>(uid) &&
+                    TryComp<PhysicsComponent>(uid, out var body))
                 {
                     _physics.SetBodyStatus(body, BodyStatus.OnGround);
                 }
@@ -68,7 +72,7 @@ private void UpdateHighPressure(float frameTime)
             }
         }
 
-        private void AddMovedByPressure(EntityUid uid, MovedByPressureComponent component, PhysicsComponent body)
+        private void AddMobMovedByPressure(EntityUid uid, MovedByPressureComponent component, PhysicsComponent body)
         {
             if (!TryComp<FixturesComponent>(uid, out var fixtures))
                 return;
@@ -158,7 +162,7 @@ private void HighPressureMovements(Entity<GridAtmosphereComponent> gridAtmospher
                         (entity, pressureMovements),
                         gridAtmosphere.Comp.UpdateCounter,
                         tile.PressureDifference,
-                        tile.PressureDirection,
+                        tile.PressureDirection, 0,
                         tile.PressureSpecificTarget != null ? _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.PressureSpecificTarget.GridIndices) : EntityCoordinates.Invalid,
                         gridWorldRotation,
                         xforms.GetComponent(entity),
@@ -179,13 +183,12 @@ private void ConsiderPressureDifference(GridAtmosphereComponent gridAtmosphere,
             tile.PressureDirection = differenceDirection;
         }
 
-        //The EE version of this function drops pressureResistanceProbDelta, since it's not needed. If you are for whatever reason calling this function
-        //And it isn't working, you've probably still got the ResistancePobDelta line included.
         public void ExperiencePressureDifference(
             Entity<MovedByPressureComponent> ent,
             int cycle,
             float pressureDifference,
             AtmosDirection direction,
+            float pressureResistanceProbDelta,
             EntityCoordinates throwTarget,
             Angle gridWorldRotation,
             TransformComponent? xform = null,
@@ -198,34 +201,55 @@ public void ExperiencePressureDifference(
             if (!Resolve(uid, ref xform))
                 return;
 
+            // TODO ATMOS stuns?
+
+            var maxForce = MathF.Sqrt(pressureDifference) * 2.25f;
+            var moveProb = 100f;
+
+            if (component.PressureResistance > 0)
+                moveProb = MathF.Abs((pressureDifference / component.PressureResistance * MovedByPressureComponent.ProbabilityBasePercent) -
+                                     MovedByPressureComponent.ProbabilityOffset);
+
             // Can we yeet the thing (due to probability, strength, etc.)
-            if (physics.BodyType != BodyType.Static
-                && !float.IsPositiveInfinity(component.MoveResist)
-                && physics.Mass != 0)
+            if (moveProb > MovedByPressureComponent.ProbabilityOffset && _robustRandom.Prob(MathF.Min(moveProb / 100f, 1f))
+                                                                      && !float.IsPositiveInfinity(component.MoveResist)
+                                                                      && (physics.BodyType != BodyType.Static
+                                                                          && (maxForce >= (component.MoveResist * MovedByPressureComponent.MoveForcePushRatio)))
+                || (physics.BodyType == BodyType.Static && (maxForce >= (component.MoveResist * MovedByPressureComponent.MoveForceForcePushRatio))))
             {
-                var moveForce = pressureDifference / physics.Mass;
+                if (HasComp<MobStateComponent>(uid))
+                {
+                    AddMobMovedByPressure(uid, component, physics);
+                }
 
-                if (moveForce > physics.Mass)
+                if (maxForce > MovedByPressureComponent.ThrowForce)
                 {
-                    AddMovedByPressure(uid, component, physics);
+                    var moveForce = maxForce;
+                    moveForce /= (throwTarget != EntityCoordinates.Invalid) ? SpaceWindPressureForceDivisorThrow : SpaceWindPressureForceDivisorPush;
+                    moveForce *= MathHelper.Clamp(moveProb, 0, 100);
+
+                    // Apply a sanity clamp to prevent being thrown through objects.
+                    var maxSafeForceForObject = SpaceWindMaxVelocity * physics.Mass;
+                    moveForce = MathF.Min(moveForce, maxSafeForceForObject);
+
                     // Grid-rotation adjusted direction
                     var dirVec = (direction.ToAngle() + gridWorldRotation).ToWorldVec();
-                    var maxSafeForceForObject = SpaceWindMaxVelocity * physics.Mass;
 
                     // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
                         var pos = ((throwTarget.ToMap(EntityManager).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
-                        _physics.ApplyLinearImpulse(uid, pos * Math.Clamp(moveForce, 0, maxSafeForceForObject), body: physics);
+                        _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
                     }
                     else
                     {
-                        _physics.ApplyLinearImpulse(uid, dirVec * Math.Clamp(moveForce, 0, maxSafeForceForObject), body: physics);
+                        moveForce = MathF.Min(moveForce, SpaceWindMaxPushForce);
+                        _physics.ApplyLinearImpulse(uid, dirVec * moveForce, body: physics);
                     }
 
                     component.LastHighPressureMovementAirCycle = cycle;
                 }
             }
         }
     }
-}
+}

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -12,7 +12,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
-using Content.Shared.Mech.Components;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
@@ -306,11 +305,6 @@ public void Ignite(EntityUid uid, EntityUid ignitionSource, FlammableComponent?
             if (!Resolve(uid, ref flammable))
                 return;
 
-            // I would rather there be a cancellable event for this but I really don't wanna fuck with this janky system more than I have too.
-            // FlammableSystem rework when?
-            if (TryComp<MechPilotComponent>(uid, out var mechPilot) && TryComp<MechComponent>(mechPilot.Mech, out var mech) && mech.Airtight)
-                return;
-
             if (flammable.AlwaysCombustible)
             {
                 flammable.FireStacks = Math.Max(flammable.FirestacksOnIgnite, flammable.FireStacks);

Content.Server/Chat/Systems/ChatSystem.cs

@@ -324,7 +324,7 @@ public void TrySendInGameOOCMessage(
     /// <param name="colorOverride">Optional color for the announcement message</param>
     public void DispatchGlobalAnnouncement(
         string message,
-        string sender = "High Command",
+        string sender = "Central Command",
         bool playSound = true,
         SoundSpecifier? announcementSound = null,
         Color? colorOverride = null
@@ -350,7 +350,7 @@ public void DispatchGlobalAnnouncement(
     public void DispatchStationAnnouncement(
         EntityUid source,
         string message,
-        string sender = "High Command",
+        string sender = "Central Command",
         bool playDefaultSound = true,
         SoundSpecifier? announcementSound = null,
         Color? colorOverride = null)

Content.Server/Mech/Systems/MechSystem.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Mech.Components;
 using Content.Server.Power.Components;

Content.Server/Weapons/Ranged/Systems/GunSystem.cs

@@ -3,7 +3,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Cargo.Systems;
 using Content.Server.Interaction;
-using Content.Server.Mech.Equipment.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
@@ -12,7 +11,6 @@
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.Interaction.Components;
-using Content.Shared.Mech.Equipment.Components;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged;
@@ -172,12 +170,9 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
 
                     // Something like ballistic might want to leave it in the container still
                     if (!cartridge.DeleteOnSpawn && !Containers.IsEntityInContainer(ent!.Value))
-                    {
                         EjectCartridge(ent.Value, angle);
-                    }
 
                     Dirty(ent!.Value, cartridge);
-
                     break;
                 // Ammo shoots itself
                 case AmmoComponent newAmmo:

Content.Shared/Mech/EntitySystems/SharedMechSystem.cs

@@ -15,7 +15,6 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Melee;
-using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
@@ -44,9 +43,7 @@ public override void Initialize()
     {
         SubscribeLocalEvent<MechComponent, MechToggleEquipmentEvent>(OnToggleEquipmentAction);
         SubscribeLocalEvent<MechComponent, MechEjectPilotEvent>(OnEjectPilotEvent);
-
         SubscribeLocalEvent<MechComponent, InteractNoHandEvent>(RelayInteractionEvent);
-
         SubscribeLocalEvent<MechComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<MechComponent, DestructionEventArgs>(OnDestruction);
         SubscribeLocalEvent<MechComponent, GetAdditionalAccessEvent>(OnGetAdditionalAccess);