Merge branch 'master' of https://github.com/SerbiaStrong-220/space-station-14 into Axioma0.1

Author: Kit0vras

Content.Client/SS220/ForcefieldGenerator/ForcefieldOverlay.cs

@@ -0,0 +1,76 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using System.Numerics;
+using Content.Shared.SS220.ForcefieldGenerator;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.SS220.ForcefieldGenerator;
+
+public sealed class ForcefieldOverlay : Overlay
+{
+    private EntityManager _entity;
+    private SharedTransformSystem _transform;
+    private IPrototypeManager _prototype = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities;
+    public override bool RequestScreenTexture => true;
+
+    private readonly ShaderInstance _shader;
+    private readonly ShaderInstance _shader_unshaded;
+
+    public ForcefieldOverlay(EntityManager entMan, IPrototypeManager protoMan)
+    {
+        _entity = entMan;
+        _transform = entMan.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
+        _prototype = protoMan;
+        _shader_unshaded = _prototype.Index<ShaderPrototype>("unshaded").InstanceUnique();
+        _shader = _prototype.Index<ShaderPrototype>("Stealth").InstanceUnique();
+
+        ZIndex = (int) Shared.DrawDepth.DrawDepth.Overdoors;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture == null)
+            return;
+
+        var handle = args.WorldHandle;
+        var queryEnum = _entity.EntityQueryEnumerator<ForcefieldSS220Component>();
+
+        while (queryEnum.MoveNext(out var uid, out var fieldComp))
+        {
+            if (fieldComp.Generator is not { } generator || !_entity.EntityExists(generator))
+            {
+                continue;
+            }
+
+            if (!_entity.TryGetComponent<ForcefieldGeneratorSS220Component>(generator, out var generatorComp))
+            {
+                continue;
+            }
+
+            var boxToRender = new Box2(
+                new Vector2(-generatorComp.FieldLength / 2, -generatorComp.FieldThickness / 2),
+                new Vector2(generatorComp.FieldLength / 2, generatorComp.FieldThickness / 2)
+            );
+
+            var (position, rotation) = _transform.GetWorldPositionRotation(uid);
+
+            var reference = args.Viewport.WorldToLocal(position);
+            reference.X = -reference.X;
+
+            _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+            _shader.SetParameter("reference", reference);
+            var finalVisibility = Math.Clamp(generatorComp.FieldVisibility, -1f, 1f);
+            _shader.SetParameter("visibility", finalVisibility);
+
+            handle.SetTransform(position, rotation);
+            handle.UseShader(_shader);
+            handle.DrawRect(boxToRender, generatorComp.FieldColor);
+        }
+
+        handle.UseShader(null);
+        handle.SetTransform(Matrix3.Identity);
+    }
+}

Content.Client/SS220/ForcefieldGenerator/ForcefieldOverlaySystem.cs

@@ -0,0 +1,27 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Robust.Client.Graphics;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.SS220.ForcefieldGenerator;
+
+public sealed class ForcefieldOverlaySystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private ForcefieldOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _overlay = new(this.EntityManager, _prototype);
+        _overlayManager.AddOverlay(_overlay);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _overlayManager.RemoveOverlay(_overlay);
+    }
+}

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -76,6 +76,8 @@ public sealed class PostMapInitTest
             "220Avrite",
             "220Marathon",
             "220Hive",
+            "VoidZone",
+            "NTvsSSSP"
         };
 
         /// <summary>

Content.Server/Administration/Commands/GarbageClearUpCommand.cs

@@ -12,14 +12,15 @@ public sealed partial class GarbageClearUpCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entMan = default!;
 
-        public string Command => "ClearUpGarbage";
-        public string Description => "Removes all objects with a tag 'trash' from the map";
-        public string Help => "Surgery tommorow";
+        //SS220-clearupgarbage
+        public string Command => "clearupgarbage";
+        public string Description => "Удаляет весь мусор с карты (применимо к объектам с тегом 'trash')";
+        public string Help => $"Usage: {Command} ... surgery tommorow";
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var _containerSystem = _entMan.System<SharedContainerSystem>();
-            int cnt = 0;
+            int processed = 0;
             foreach (var ent in _entMan.GetEntities())
             {
                 if (!_entMan.TryGetComponent<TagComponent>(ent, out var component))
@@ -28,9 +29,9 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                     continue;
 
                 _entMan.DeleteEntity(ent);
-                cnt++;
+                processed++;
             }
-            shell.WriteLine($"Карта очищена от {cnt} объектов мусора!");
+            shell.WriteLine($"Удалено {processed} энтити.");
         }
     }
-}
+}

Content.Server/Kitchen/Components/MicrowaveComponent.cs

@@ -73,7 +73,7 @@ public sealed partial class MicrowaveComponent : Component
         public Container Storage = default!;
 
         [DataField, ViewVariables(VVAccess.ReadWrite)]
-        public int Capacity = 10;
+        public int Capacity = 15; // SS220 - microwave fix 10 -> 15
 
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public ProtoId<ItemSizePrototype> MaxItemSize = "Normal";

Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs

@@ -99,6 +99,10 @@ private void OnCookStop(Entity<ActiveMicrowaveComponent> ent, ref ComponentShutd
         {
             if (!TryComp<MicrowaveComponent>(ent, out var microwaveComponent))
                 return;
+            foreach (var item in microwaveComponent.Storage.ContainedEntities)
+            {
+                RemComp<ActivelyMicrowavedComponent>(item);
+            };
             SetAppearance(ent.Owner, MicrowaveVisualState.Idle, microwaveComponent);
 
             microwaveComponent.PlayingStream = _audio.Stop(microwaveComponent.PlayingStream);

Content.Server/SS220/Commands/Helpers/ClearSpentAmmoCommand.cs

@@ -0,0 +1,34 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Weapons.Ranged.Components;
+using Robust.Shared.Console;
+
+namespace Content.Server.SS220.Commands.Helpers;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class ClearSpentAmmoCommand : IConsoleCommand
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    // ReSharper disable once StringLiteralTypo
+    public string Command => "clearspentammo";
+    public string Description => "Удаляет все отстрелянные патроны в игре";
+    public string Help => $"Usage: {Command}";
+
+    public void Execute(IConsoleShell shell, string argsOther, string[] args)
+    {
+        var processed = 0;
+        var query = _entManager.AllEntityQueryEnumerator<CartridgeAmmoComponent>();
+        while (query.MoveNext(out var entity, out var comp))
+        {
+            if (comp.Spent)
+            {
+                _entManager.QueueDeleteEntity(entity);
+                processed++;
+            }
+        }
+
+        shell.WriteLine($"Удалено {processed} энтити.");
+    }
+}