Upstream sync

Content.Benchmarks/MapLoadBenchmark.cs

@@ -46,7 +46,7 @@ public async Task Cleanup()
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Box", "Aspid", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Saltern", "Packed", "Omega", "Cluster", "Gemini", "Reach", "Origin", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Barratry" };
+    public static readonly string[] MapsSource = { "Empty", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Saltern", "Packed", "Omega", "Cluster", "Reach", "Origin", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Barratry" };
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;

Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs

@@ -1,6 +1,8 @@
+using Content.Client.Items.Systems;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Hands;
 using Content.Shared.Rounding;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
@@ -10,11 +12,13 @@ namespace Content.Client.Chemistry.Visualizers;
 public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionContainerVisualsComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly ItemSystem _itemSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<SolutionContainerVisualsComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<SolutionContainerVisualsComponent, GetInhandVisualsEvent>(OnGetHeldVisuals);
     }
 
     private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
@@ -111,6 +115,35 @@ protected override void OnAppearanceChange(EntityUid uid, SolutionContainerVisua
             }
         }
 
+        // in-hand visuals
+        _itemSystem.VisualsChanged(uid);
+    }
+
+    private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent component, GetInhandVisualsEvent args)
+    {
+        if (component.InHandsFillBaseName == null)
+            return;
+
+        if (!TryComp(uid, out AppearanceComponent? appearance))
+            return;
+
+        if (!AppearanceSystem.TryGetData<float>(uid, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
+            return;
 
+        int closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, component.InHandsMaxFillLevels + 1);
+
+        if (closestFillSprite > 0)
+        {
+            var layer = new PrototypeLayerData();
+
+            var key = "inhand-" + args.Location.ToString().ToLowerInvariant() + component.InHandsFillBaseName + closestFillSprite;
+
+            layer.State = key;
+
+            if (component.ChangeColor && AppearanceSystem.TryGetData<Color>(uid, SolutionContainerVisuals.Color, out var color, appearance))
+                layer.Color = color;
+
+            args.Layers.Add((key, layer));
+        }
     }
 }

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -66,7 +66,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             );
 
             Temperature.Text = Loc.GetString("health-analyzer-window-entity-temperature-text",
-                ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - 273f:F1} °C")
+                ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - 273f:F1} °C ({msg.Temperature:F1} °K)")
             );
 
             BloodLevel.Text = Loc.GetString("health-analyzer-window-entity-blood-level-text",

Content.Client/Power/Generator/GeneratorWindow.xaml.cs

@@ -135,6 +135,14 @@ public void Update(PortableGeneratorComponentBuiState state)
 
     private bool TryGetStartProgress(out float progress)
     {
+        // Try to check progress of auto-revving first
+        if (_entityManager.TryGetComponent<ActiveGeneratorRevvingComponent>(_entity, out var activeGeneratorRevvingComponent) && _entityManager.TryGetComponent<PortableGeneratorComponent>(_entity, out var portableGeneratorComponent))
+        {
+            var calculatedProgress = activeGeneratorRevvingComponent.CurrentTime / portableGeneratorComponent.StartTime;
+            progress = (float) calculatedProgress;
+            return true;
+        }
+
         var doAfterSystem = _entityManager.EntitySysManager.GetEntitySystem<DoAfterSystem>();
         return doAfterSystem.TryFindActiveDoAfter<GeneratorStartedEvent>(_entity, out _, out _, out progress);
     }

Content.Client/Stylesheets/StyleNano.cs

@@ -31,7 +31,7 @@ public static Font NotoStack(this IResourceCache resCache, string variation = "R
                 {
                     $"/Fonts/NotoSans{ds}/NotoSans{ds}-{variation}.ttf",
                     $"/Fonts/NotoSans/NotoSansSymbols-{sv}.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf",
+                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
                 },
                 size
             );

Content.Client/Throwing/ThrownItemVisualizerSystem.cs

@@ -0,0 +1,87 @@
+using Content.Shared.Throwing;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Shared.Animations;
+
+namespace Content.Client.Throwing;
+
+/// <summary>
+///     Handles animating thrown items.
+/// </summary>
+public sealed class ThrownItemVisualizerSystem : EntitySystem
+{
+    [Dependency] private readonly AnimationPlayerSystem _anim = default!;
+
+    private const string AnimationKey = "thrown-item";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ThrownItemComponent, AfterAutoHandleStateEvent>(OnAutoHandleState);
+        SubscribeLocalEvent<ThrownItemComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnAutoHandleState(EntityUid uid, ThrownItemComponent component, ref AfterAutoHandleStateEvent args)
+    {
+        if (!TryComp<SpriteComponent>(uid, out var sprite))
+            return;
+
+        var animationPlayer = EnsureComp<AnimationPlayerComponent>(uid);
+
+        if (_anim.HasRunningAnimation(uid, animationPlayer, AnimationKey))
+            return;
+
+        var anim = GetAnimation((uid, component, sprite));
+        if (anim == null)
+            return;
+
+        component.OriginalScale = sprite.Scale;
+        _anim.Play((uid, animationPlayer), anim, AnimationKey);
+    }
+
+    private void OnShutdown(EntityUid uid, ThrownItemComponent component, ComponentShutdown args)
+    {
+        if (!_anim.HasRunningAnimation(uid, AnimationKey))
+            return;
+
+        if (TryComp<SpriteComponent>(uid, out var sprite) && component.OriginalScale != null)
+            sprite.Scale = component.OriginalScale.Value;
+
+        _anim.Stop(uid, AnimationKey);
+    }
+
+    private static Animation? GetAnimation(Entity<ThrownItemComponent, SpriteComponent> ent)
+    {
+        if (ent.Comp1.LandTime - ent.Comp1.ThrownTime is not { } length)
+            return null;
+
+        if (length <= TimeSpan.Zero)
+            return null;
+
+        length += TimeSpan.FromSeconds(ThrowingSystem.FlyTime);
+        var scale = ent.Comp2.Scale;
+        var lenFloat = (float) length.TotalSeconds;
+
+        // TODO use like actual easings here
+        return new Animation
+        {
+            Length = length,
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Scale),
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(scale, 0.0f),
+                        new AnimationTrackProperty.KeyFrame(scale * 1.4f, lenFloat * 0.25f),
+                        new AnimationTrackProperty.KeyFrame(scale, lenFloat * 0.75f)
+                    },
+                    InterpolationMode = AnimationInterpolationMode.Linear
+                }
+            }
+        };
+    }
+}

Content.Client/Tools/UI/WelderStatusControl.cs

@@ -17,11 +17,11 @@ public sealed class WelderStatusControl : Control
     private readonly ItemToggleComponent? _toggleComponent;
     private readonly RichTextLabel _label;
 
-    public WelderStatusControl(WelderComponent parent, EntityUid? uid = null)
+    public WelderStatusControl(Entity<WelderComponent> parent)
     {
         _parent = parent;
         _entMan = IoCManager.Resolve<IEntityManager>();
-        if (_entMan.TryGetComponent<ItemToggleComponent>(uid, out var itemToggle))
+        if (_entMan.TryGetComponent<ItemToggleComponent>(parent, out var itemToggle))
             _toggleComponent = itemToggle;
         _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
         AddChild(_label);

Content.Client/Weapons/Ranged/GunSpreadOverlay.cs

@@ -56,11 +56,11 @@ protected override void Draw(in OverlayDrawArgs args)
             return;
 
         // (☞ﾟヮﾟ)☞
-        var maxSpread = gun.MaxAngle;
-        var minSpread = gun.MinAngle;
+        var maxSpread = gun.MaxAngleModified;
+        var minSpread = gun.MinAngleModified;
         var timeSinceLastFire = (_timing.CurTime - gun.NextFire).TotalSeconds;
-        var currentAngle = new Angle(MathHelper.Clamp(gun.CurrentAngle.Theta - gun.AngleDecay.Theta * timeSinceLastFire,
-            gun.MinAngle.Theta, gun.MaxAngle.Theta));
+        var currentAngle = new Angle(MathHelper.Clamp(gun.CurrentAngle.Theta - gun.AngleDecayModified.Theta * timeSinceLastFire,
+            gun.MinAngleModified.Theta, gun.MaxAngleModified.Theta));
         var direction = (mousePos.Position - mapPos.Position);
 
         worldHandle.DrawLine(mapPos.Position, mousePos.Position + direction, Color.Orange);

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 Robust.Shared.Spawners;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
@@ -195,7 +194,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         {
             if (throwItems)
             {
-                Recoil(user, direction, gun.CameraRecoilScalar);
+                Recoil(user, direction, gun.CameraRecoilScalarModified);
                 if (IsClientSide(ent!.Value))
                     Del(ent.Value);
                 else
@@ -210,8 +209,8 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                     {
                         SetCartridgeSpent(ent!.Value, cartridge, true);
                         MuzzleFlash(gunUid, cartridge, user);
-                        Audio.PlayPredicted(gun.SoundGunshot, gunUid, user);
-                        Recoil(user, direction, gun.CameraRecoilScalar);
+                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+                        Recoil(user, direction, gun.CameraRecoilScalarModified);
                         // TODO: Can't predict entity deletions.
                         //if (cartridge.DeleteOnSpawn)
                         //    Del(cartridge.Owner);
@@ -228,16 +227,16 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                     break;
                 case AmmoComponent newAmmo:
                     MuzzleFlash(gunUid, newAmmo, user);
-                    Audio.PlayPredicted(gun.SoundGunshot, gunUid, user);
-                    Recoil(user, direction, gun.CameraRecoilScalar);
+                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+                    Recoil(user, direction, gun.CameraRecoilScalarModified);
                     if (IsClientSide(ent!.Value))
                         Del(ent.Value);
                     else
                         RemoveShootable(ent.Value);
                     break;
                 case HitscanPrototype:
-                    Audio.PlayPredicted(gun.SoundGunshot, gunUid, user);
-                    Recoil(user, direction, gun.CameraRecoilScalar);
+                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+                    Recoil(user, direction, gun.CameraRecoilScalarModified);
                     break;
             }
         }

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -59,7 +59,6 @@ public sealed class PostMapInitTest
             "Fland",
             "Meta",
             "Packed",
-            "Aspid",
             "Cluster",
             "Omega",
             "Bagel",
@@ -70,7 +69,6 @@ public sealed class PostMapInitTest
             "Saltern",
             "Core",
             "Marathon",
-            "Gemini",
             "MeteorArena",
             "Atlas",
             "Reach"    

Content.Server/Administration/Components/AdminMinigunComponent.cs

@@ -0,0 +1,7 @@
+namespace Content.Server.Administration.Components;
+
+[RegisterComponent]
+public sealed partial class AdminMinigunComponent : Component
+{
+
+}

Content.Server/Administration/Systems/AdminGunSystem.cs

@@ -0,0 +1,17 @@
+using Content.Server.Administration.Components;
+using Content.Shared.Weapons.Ranged.Events;
+
+namespace Content.Server.Administration.Systems;
+
+public sealed class AdminGunSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<AdminMinigunComponent, GunRefreshModifiersEvent>(OnGunRefreshModifiers);
+    }
+
+    private void OnGunRefreshModifiers(Entity<AdminMinigunComponent> ent, ref GunRefreshModifiersEvent args)
+    {
+        args.FireRate = 15;
+    }
+}

Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs

@@ -12,6 +12,7 @@
 using Content.Server.Stack;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
@@ -52,6 +53,7 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly BatterySystem _batterySystem = default!;
     [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly GunSystem _gun = default!;
 
     private void AddTricksVerbs(GetVerbsEvent<Verb> args)
     {
@@ -697,7 +699,8 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi"), "icon"),
                 Act = () =>
                 {
-                    gun.FireRate = 15;
+                    EnsureComp<AdminMinigunComponent>(args.Target);
+                    _gun.RefreshModifiers((args.Target, gun));
                 },
                 Impact = LogImpact.Medium,
                 Message = Loc.GetString("admin-trick-minigun-fire-description"),

Content.Server/Anomaly/AnomalySystem.Generator.cs

@@ -119,6 +119,8 @@ public void SpawnOnRandomGridLocation(EntityUid grid, string toSpawn)
             // don't spawn inside of solid objects
             var physQuery = GetEntityQuery<PhysicsComponent>();
             var valid = true;
+
+            // TODO: This should be using static lookup.
             foreach (var ent in gridComp.GetAnchoredEntities(tile))
             {
                 if (!physQuery.TryGetComponent(ent, out var body))
@@ -143,9 +145,9 @@ public void SpawnOnRandomGridLocation(EntityUid grid, string toSpawn)
                 if (antiXform.MapID != mapPos.MapId)
                     continue;
 
-                var antiCoordinates = _transform.GetMapCoordinates(antiXform);
+                var antiCoordinates = _transform.GetWorldPosition(antiXform);
 
-                var delta = antiCoordinates.Position - mapPos.Position;
+                var delta = antiCoordinates - mapPos.Position;
                 if (delta.LengthSquared() < zone.ZoneRadius * zone.ZoneRadius)
                 {
                     valid = false;

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -402,7 +402,7 @@ public override void Update(float frameTime)
                     if (TryComp(uid, out TemperatureComponent? temp))
                         _temperatureSystem.ChangeHeat(uid, 12500 * damageScale, false, temp);
 
-                    _damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale);
+                    _damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale, interruptsDoAfters: false);
 
                     AdjustFireStacks(uid, flammable.FirestackFade * (flammable.Resisting ? 10f : 1f), flammable);
                 }

Content.Server/Atmos/Rotting/RottingSystem.cs

@@ -133,7 +133,8 @@ private void OnPerishableExamined(Entity<PerishableComponent> perishable, ref Ex
             return;
         }
 
-        var description = "perishable-" + stage;
+        var isMob = HasComp<MobStateComponent>(perishable);
+        var description = "perishable-" + stage + (!isMob ? "-nonmob" : string.Empty);
         args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager))));
     }