Upstream sync

.vscode/tasks.json

@@ -10,7 +10,7 @@
             "args": [
                 "build",
                 "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
-                "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "/consoleloggerparameters:'ForceNoAlign;NoSummary'" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
             ],
             "group": {
                 "kind": "build",
@@ -29,9 +29,9 @@
                 "build",
                 "${workspaceFolder}/Content.YAMLLinter/Content.YAMLLinter.csproj",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "/consoleloggerparameters:'ForceNoAlign;NoSummary'"
             ],
             "problemMatcher": "$msCompile"
         }
     ]
-}
+}

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs

@@ -1,4 +1,4 @@
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
@@ -13,6 +13,7 @@ public sealed partial class ObjectsTabEntry : PanelContainer
 
     public Action<NetEntity>? OnTeleport;
     public Action<NetEntity>? OnDelete;
+    private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
     public ObjectsTabEntry(IClientAdminManager manager, string name, NetEntity nent, StyleBox styleBox)
     {
@@ -27,6 +28,13 @@ public ObjectsTabEntry(IClientAdminManager manager, string name, NetEntity nent,
         DeleteButton.Disabled = !manager.CanCommand("delete");
 
         TeleportButton.OnPressed += _ => OnTeleport?.Invoke(nent);
-        DeleteButton.OnPressed += _ => OnDelete?.Invoke(nent);
+        DeleteButton.OnPressed += _ =>
+        {
+            if (!AdminUIHelpers.TryConfirm(DeleteButton, _confirmations))
+            {
+                return;
+            }
+            OnDelete?.Invoke(nent);
+        };
     }
 }

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -73,6 +73,16 @@ public void SetEntity(EntityUid uid)
         MaterialsList.SetOwner(Entity);
     }
 
+    protected override void Opened()
+    {
+        base.Opened();
+
+        if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComp))
+        {
+            AmountLineEdit.SetText(latheComp.DefaultProductionAmount.ToString());
+        }
+    }
+
     /// <summary>
     /// Populates the list of all the recipes
     /// </summary>

Content.Client/Materials/RecyclerVisualizerSystem.cs

@@ -0,0 +1,27 @@
+using Content.Shared.Conveyor;
+using Content.Shared.Materials;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Materials;
+
+public sealed class RecyclerVisualizerSystem : VisualizerSystem<RecyclerVisualsComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, RecyclerVisualsComponent component, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null || !args.Sprite.LayerMapTryGet(RecyclerVisualLayers.Main, out var layer))
+            return;
+
+        AppearanceSystem.TryGetData<ConveyorState>(uid, ConveyorVisuals.State, out var running);
+        AppearanceSystem.TryGetData<bool>(uid, RecyclerVisuals.Bloody, out var bloody);
+        AppearanceSystem.TryGetData<bool>(uid, RecyclerVisuals.Broken, out var broken);
+
+        var activityState = running == ConveyorState.Off ? 0 : 1;
+        if (broken) //breakage overrides activity
+            activityState = 2;
+
+        var bloodyKey = bloody ? component.BloodyKey : string.Empty;
+
+        var state = $"{component.BaseKey}{activityState}{bloodyKey}";
+        args.Sprite.LayerSetState(layer, state);
+    }
+}

Content.Client/Materials/RecyclerVisualsComponent.cs

@@ -0,0 +1,17 @@
+namespace Content.Client.Materials;
+
+[RegisterComponent]
+public sealed partial class RecyclerVisualsComponent : Component
+{
+    /// <summary>
+    /// Key appended to state string if bloody.
+    /// </summary>
+    [DataField]
+    public string BloodyKey = "bld";
+
+    /// <summary>
+    /// Base key for the visual state.
+    /// </summary>
+    [DataField]
+    public string BaseKey = "grinder-o";
+}

Content.Client/Options/UI/Tabs/MiscTab.xaml.cs

@@ -33,7 +33,7 @@ public MiscTab()
         var layoutEntries = new List<OptionDropDownCVar<string>.ValueOption>();
         foreach (var layout in Enum.GetValues(typeof(ScreenType)))
         {
-            layoutEntries.Add(new OptionDropDownCVar<string>.ValueOption(layout.ToString()!, layout.ToString()!));
+            layoutEntries.Add(new OptionDropDownCVar<string>.ValueOption(layout.ToString()!, Loc.GetString($"ui-options-hud-layout-{layout.ToString()!.ToLower()}")));
         }
 
         // Channel can be null in replays so.

Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs

@@ -11,6 +11,7 @@ namespace Content.Client.Radiation.Overlays;
 public sealed class RadiationDebugOverlay : Overlay
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
+    private readonly SharedMapSystem _mapSystem;
     private readonly RadiationSystem _radiation;
 
     private readonly Font _font;
@@ -21,6 +22,7 @@ public RadiationDebugOverlay()
     {
         IoCManager.InjectDependencies(this);
         _radiation = _entityManager.System<RadiationSystem>();
+        _mapSystem = _entityManager.System<SharedMapSystem>();
 
         var cache = IoCManager.Resolve<IResourceCache>();
         _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 8);
@@ -67,7 +69,7 @@ private void DrawScreenRays(OverlayDrawArgs args)
 
                 foreach (var (tile, rads) in blockers)
                 {
-                    var worldPos = grid.GridTileToWorldPos(tile);
+                    var worldPos = _mapSystem.GridTileToWorldPos(gridUid, grid, tile);
                     var screenCenter = args.ViewportControl.WorldToScreen(worldPos);
                     handle.DrawString(_font, screenCenter, rads.ToString("F2"), 1.5f, Color.White);
                 }
@@ -95,8 +97,8 @@ private void DrawScreenResistance(OverlayDrawArgs args)
             var offset = new Vector2(grid.TileSize, -grid.TileSize) * 0.25f;
             foreach (var (tile, value) in resMap)
             {
-                var localPos = grid.GridTileToLocal(tile).Position + offset;
-                var worldPos = grid.LocalToWorld(localPos);
+                var localPos = _mapSystem.GridTileToLocal(gridUid, grid, tile).Position + offset;
+                var worldPos = _mapSystem.LocalToWorld(gridUid, grid, localPos);
                 var screenCenter = args.ViewportControl.WorldToScreen(worldPos);
                 handle.DrawString(_font, screenCenter, value.ToString("F2"), color: Color.White);
             }
@@ -129,7 +131,7 @@ private void DrawWorld(in OverlayDrawArgs args)
                 if (!_entityManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
                     continue;
                 var (destTile, _) = blockers.Last();
-                var destWorld = grid.GridTileToWorldPos(destTile);
+                var destWorld = _mapSystem.GridTileToWorldPos(gridUid, grid, destTile);
                 handle.DrawLine(ray.Source, destWorld, Color.Red);
             }
         }

Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.Message;
 using Content.Shared.Salvage;
 using Content.Shared.Salvage.Magnet;
 using Robust.Client.UserInterface;
@@ -99,7 +100,31 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
                     break;
                 case SalvageOffering salvage:
-                    option.Title = Loc.GetString($"salvage-map-proto-{salvage.SalvageMap.ID}");
+                    option.Title = Loc.GetString($"salvage-map-wreck");
+
+                    var salvContainer = new BoxContainer
+                    {
+                        Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                        HorizontalExpand = true,
+                    };
+
+                    var sizeLabel = new Label
+                    {
+                        Text = Loc.GetString("salvage-map-wreck-desc-size"),
+                        HorizontalAlignment = Control.HAlignment.Left,
+                    };
+
+                    var sizeValueLabel = new RichTextLabel
+                    {
+                        HorizontalAlignment = Control.HAlignment.Right,
+                        HorizontalExpand = true,
+                    };
+                    sizeValueLabel.SetMarkup(Loc.GetString(salvage.SalvageMap.SizeString));
+
+                    salvContainer.AddChild(sizeLabel);
+                    salvContainer.AddChild(sizeValueLabel);
+
+                    option.AddContent(salvContainer);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();

Content.Server/Actions/ActionOnInteractSystem.cs

@@ -154,21 +154,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
         args.Handled = true;
     }
 
-    private bool ValidAction(BaseActionComponent action, bool canReach = true)
-    {
-        if (!action.Enabled)
-            return false;
-
-        if (action.Charges.HasValue && action.Charges <= 0)
-            return false;
-
-        var curTime = _timing.CurTime;
-        if (action.Cooldown.HasValue && action.Cooldown.Value.End > curTime)
-            return false;
-
-        return canReach || action is BaseTargetActionComponent { CheckCanAccess: false };
-    }
-
     private List<(EntityUid Id, T Comp)> GetValidActions<T>(List<EntityUid>? actions, bool canReach = true) where T : BaseActionComponent
     {
         var valid = new List<(EntityUid Id, T Comp)>();
@@ -180,7 +165,7 @@ private bool ValidAction(BaseActionComponent action, bool canReach = true)
         {
             if (!_actions.TryGetActionData(id, out var baseAction) ||
                 baseAction as T is not { } action ||
-                !ValidAction(action, canReach))
+                !_actions.ValidAction(action, canReach))
             {
                 continue;
             }

Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs

@@ -6,7 +6,6 @@
 using Content.Shared.Database;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Teleportation.Components;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Collections;
 using Robust.Shared.Random;
@@ -34,8 +33,11 @@ private void OnPulse(EntityUid uid, BluespaceAnomalyComponent component, ref Ano
         var xformQuery = GetEntityQuery<TransformComponent>();
         var xform = xformQuery.GetComponent(uid);
         var range = component.MaxShuffleRadius * args.Severity * args.PowerModifier;
+        // get a list of all entities in range with the MobStateComponent
+        // we filter out those inside a container
+        // otherwise borg brains get removed from their body, or PAIs from a PDA
         var mobs = new HashSet<Entity<MobStateComponent>>();
-        _lookup.GetEntitiesInRange(xform.Coordinates, range, mobs);
+        _lookup.GetEntitiesInRange(xform.Coordinates, range, mobs, flags: LookupFlags.Uncontained);
         var allEnts = new ValueList<EntityUid>(mobs.Select(m => m.Owner)) { uid };
         var coords = new ValueList<Vector2>();
         foreach (var ent in allEnts)
@@ -59,7 +61,7 @@ private void OnSupercritical(EntityUid uid, BluespaceAnomalyComponent component,
         var radius = component.SupercriticalTeleportRadius * args.PowerModifier;
         var gridBounds = new Box2(mapPos - new Vector2(radius, radius), mapPos + new Vector2(radius, radius));
         var mobs = new HashSet<Entity<MobStateComponent>>();
-        _lookup.GetEntitiesInRange(xform.Coordinates, component.MaxShuffleRadius, mobs);
+        _lookup.GetEntitiesInRange(xform.Coordinates, component.MaxShuffleRadius, mobs, flags: LookupFlags.Uncontained);
         foreach (var comp in mobs)
         {
             var ent = comp.Owner;

Content.Server/Body/Systems/RespiratorSystem.cs

@@ -290,7 +290,7 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
             var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
             foreach (var entity in organs)
             {
-                _alertsSystem.ShowAlert(entity.Owner, entity.Comp1.Alert);
+                _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
             }
         }
 
@@ -306,7 +306,7 @@ private void StopSuffocation(Entity<RespiratorComponent> ent)
         var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
         foreach (var entity in organs)
         {
-            _alertsSystem.ClearAlert(entity.Owner, entity.Comp1.Alert);
+            _alertsSystem.ClearAlert(ent, entity.Comp1.Alert);
         }
 
         _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);

Content.Server/Botany/SeedPrototype.cs

@@ -227,9 +227,12 @@ public partial class SeedData
 
     [DataField("plantIconState")] public string PlantIconState { get; set; } = "produce";
 
+    /// <summary>
+    /// Screams random sound, could be strict sound SoundPathSpecifier or collection SoundCollectionSpecifier
+    /// base class is SoundSpecifier
+    /// </summary>
     [DataField("screamSound")]
-    public SoundSpecifier ScreamSound = new SoundPathSpecifier("/Audio/Voice/Human/malescream_1.ogg");
-
+    public SoundSpecifier ScreamSound = new SoundCollectionSpecifier("PlantScreams", AudioParams.Default.WithVolume(-10));
 
     [DataField("screaming")] public bool CanScream;
 

Content.Server/Botany/Systems/MutationSystem.cs

@@ -153,6 +153,12 @@ private void MutateFloat(ref float val, float min, float max, int bits, int tota
         if (!Random(probBitflip))
             return;
 
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
         // Starting number of bits that are high, between 0 and bits.
         // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
         int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
@@ -186,10 +192,22 @@ private void MutateInt(ref int val, int min, int max, int bits, int totalbits, f
         if (!Random(probBitflip))
             return;
 
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
+        // Starting number of bits that are high, between 0 and bits.
+        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
+        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
+        // val may be outside the range of min/max due to starting prototype values, so clamp.
+        valInt = Math.Clamp(valInt, 0, bits);
+
         // Probability that the bit flip increases n.
-        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasive it it.
+        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasing it.
         // In other words, it tends to go to the middle.
-        float probIncrease = 1 - (float)val / bits;
+        float probIncrease = 1 - (float)valInt / bits;
         int valMutated;
         if (Random(probIncrease))
         {

Content.Server/Botany/Systems/PlantHolderSystem.cs

@@ -313,11 +313,8 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
             var displayName = Loc.GetString(component.Seed.DisplayName);
             _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message",
                 ("seedName", displayName)), args.User);
-
-            if (component.Seed != null && component.Seed.CanScream)
-            {
-                _audio.PlayPvs(component.Seed.ScreamSound, uid, AudioParams.Default.WithVolume(-2));
-            }
+
+            DoScream(entity.Owner, component.Seed);
 
             if (_random.Prob(0.3f))
                 component.Sampled = true;
@@ -525,10 +522,9 @@ public void Update(EntityUid uid, PlantHolderComponent? component = null)
 
         var environment = _atmosphere.GetContainingMixture(uid, true, true) ?? GasMixture.SpaceGas;
 
+        component.MissingGas = 0;
         if (component.Seed.ConsumeGasses.Count > 0)
         {
-            component.MissingGas = 0;
-
             foreach (var (gas, amount) in component.Seed.ConsumeGasses)
             {
                 if (environment.GetMoles(gas) < amount)
@@ -748,6 +744,19 @@ public bool DoHarvest(EntityUid plantholder, EntityUid user, PlantHolderComponen
         return true;
     }
 
+    /// <summary>
+    /// Force do scream on PlantHolder (like plant is screaming) using seed's ScreamSound specifier (collection or soundPath)
+    /// </summary>
+    /// <returns></returns>
+    public bool DoScream(EntityUid plantholder, SeedData? seed = null)
+    {
+        if (seed == null || seed.CanScream == false)
+            return false;
+
+        _audio.PlayPvs(seed.ScreamSound, plantholder);
+        return true;
+    }
+
     public void AutoHarvest(EntityUid uid, PlantHolderComponent? component = null)
     {
         if (!Resolve(uid, ref component))
@@ -768,8 +777,7 @@ private void AfterHarvest(EntityUid uid, PlantHolderComponent? component = null)
         component.Harvest = false;
         component.LastProduce = component.Age;
 
-        if (component.Seed != null && component.Seed.CanScream)
-            _audio.PlayPvs(component.Seed.ScreamSound, uid, AudioParams.Default.WithVolume(-2));
+        DoScream(uid, component.Seed);
 
         if (component.Seed?.HarvestRepeat == HarvestType.NoRepeat)
             RemovePlant(uid, component);