Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml

Author: NotActuallyMarty

.github/workflows/labeler-review.yml

@@ -14,19 +14,27 @@ on:
 jobs:
   add_label:
     # Change the repository name after you've made sure the team name is correct for your fork!
-    if: ${{ (github.repository == 'Goob-Station/Goob-Station') && (github.event.review.state == 'APPROVED') }}
+    if: ${{ (github.repository == 'ProjectOmu/OmuStation') && (github.event.review.state == 'APPROVED') }}
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: tspascoal/get-user-teams-membership@v3
-      id: checkUserMember
+   # - uses: tspascoal/get-user-teams-membership@v3 #Omu, only maints can approve anyway, so this isnt needed.
+   #   id: checkUserMember
+   #   with:
+   #     username: ${{ github.actor }}
+   #     team: "maintainers"
+   #     GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+    # - if: "${{ contains(github.event.pull_request.labels.*.name, 'S: Needs Second Approval') }}"
+    #   uses: actions-ecosystem/action-add-labels@v1
+    #   with:
+    #     labels: "S: Approved"
+    - if: "${{ contains(github.event.pull_request.labels.*.name, 'S: Needs Second Approval') }}"
+      uses: actions-ecosystem/action-remove-labels@v1
       with:
-        username: ${{ github.actor }}
-        team: "maintainers"
-        GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-    - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'true' }}
+        labels: "S: Needs Second Approval"
+    - if: "${{ false == contains(github.event.pull_request.labels.*.name, 'S: Needs Second Approval') }}"
       uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "S: Approved"
+        labels: "S: Needs Second Approval"

Content.Client/Actions/ActionsSystem.cs

@@ -207,7 +207,7 @@ private void OnActionAutoHandleState(Entity<ActionComponent> ent, ref AfterAutoH
         public override void UpdateAction(Entity<ActionComponent> ent)
         {
             // TODO: Decouple this.
-            ent.Comp.IconColor = _sharedCharges.GetCurrentCharges(ent.Owner) == 0 ? ent.Comp.DisabledIconColor : ent.Comp.OriginalIconColor;
+            ent.Comp.IconColor = _sharedCharges.GetCurrentCharges(ent.Owner) == 0 || !ent.Comp.Enabled ? ent.Comp.DisabledIconColor : ent.Comp.OriginalIconColor; // WD EDIT
             base.UpdateAction(ent);
             if (_playerManager.LocalEntity != ent.Comp.AttachedEntity)
                 return;

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -188,6 +188,7 @@
 using Robust.Shared.Enums;
 using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Physics.Systems;
 using Robust.Shared.Utility;
 using Direction = Robust.Shared.Maths.Direction;
 
@@ -390,9 +391,7 @@ public HumanoidProfileEditor(
             };
 
             // begin Goobstation: port EE height/width sliders
-            #region Height and Width
-
-            var prototype = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
+            #region Height and Width            
 
             UpdateHeightWidthSliders();
             UpdateDimensions(SliderUpdate.Both);
@@ -402,12 +401,14 @@ public HumanoidProfileEditor(
 
             HeightReset.OnPressed += _ =>
             {
+                var prototype = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
                 HeightSlider.Value = prototype.DefaultHeight;
                 UpdateDimensions(SliderUpdate.Height);
             };
 
             WidthReset.OnPressed += _ =>
             {
+                var prototype = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
                 WidthSlider.Value = prototype.DefaultWidth;
                 UpdateDimensions(SliderUpdate.Width);
             };
@@ -1698,13 +1699,18 @@ private void UpdateHeightWidthSliders()
 
             var species = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
 
+            // we increase the min/max values of the sliders before we set their value, just so that we don't accidentally clamp down on a value loaded from a profile when we shouldn't
+            HeightSlider.MinValue = 0;
+            HeightSlider.MaxValue = 2;
+            HeightSlider.SetValueWithoutEvent(Profile?.Height ?? species.DefaultHeight);
             HeightSlider.MinValue = species.MinHeight;
             HeightSlider.MaxValue = species.MaxHeight;
-            HeightSlider.SetValueWithoutEvent(Profile?.Height ?? species.DefaultHeight);
 
+            WidthSlider.MinValue = 0;
+            WidthSlider.MaxValue = 2;
+            WidthSlider.SetValueWithoutEvent(Profile?.Width ?? species.DefaultWidth);
             WidthSlider.MinValue = species.MinWidth;
             WidthSlider.MaxValue = species.MaxWidth;
-            WidthSlider.SetValueWithoutEvent(Profile?.Width ?? species.DefaultWidth);
 
             var height = MathF.Round(species.AverageHeight * HeightSlider.Value);
             HeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
@@ -1745,8 +1751,8 @@ private void UpdateDimensions(SliderUpdate updateType)
             heightValue = Math.Clamp(heightValue, species.MinHeight, species.MaxHeight);
             widthValue = Math.Clamp(widthValue, species.MinWidth, species.MaxWidth);
 
-            HeightSlider.Value = heightValue;
-            WidthSlider.Value = widthValue;
+            HeightSlider.SetValueWithoutEvent(heightValue);
+            WidthSlider.SetValueWithoutEvent(widthValue);
 
             SetProfileHeight(heightValue);
             SetProfileWidth(widthValue);
@@ -1767,14 +1773,12 @@ private void UpdateWeight()
 
             var species = _species.Find(x => x.ID == Profile.Species) ?? _species.First();
             //  TODO: Remove obsolete method
-            _prototypeManager.Index(species.Prototype).TryGetComponent<FixturesComponent>(out var fixture);
+            _prototypeManager.Index(species.Prototype).TryGetComponent<FixturesComponent>(out var fixture, _entManager.ComponentFactory);
 
             if (fixture != null)
             {
-                var radius = fixture.Fixtures["fix1"].Shape.Radius;
-                var density = fixture.Fixtures["fix1"].Density;
                 var avg = (Profile.Width + Profile.Height) / 2;
-                var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
+                var weight = FixtureSystem.GetMassData(fixture.Fixtures["fix1"].Shape, fixture.Fixtures["fix1"].Density).Mass * avg;
                 WeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
             }
             else // Whelp, the fixture doesn't exist, guesstimate it instead

Content.Client/Pinpointer/PinpointerSystem.cs

@@ -10,6 +10,7 @@
 //
 // SPDX-License-Identifier: MIT
 
+using Content.Client.Alerts;
 using Content.Shared.Pinpointer;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -21,6 +22,32 @@ public sealed class PinpointerSystem : SharedPinpointerSystem
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
+    // WD EDIT START
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PinpointerComponent, UpdateAlertSpriteEvent>(OnUpdateAlertSprite);
+    }
+
+    private void OnUpdateAlertSprite(EntityUid uid, PinpointerComponent component, ref UpdateAlertSpriteEvent args)
+    {
+        if (args.Alert.ID != component.Alert)
+            return;
+
+        var sprite = args.SpriteViewEnt.Comp;
+        var eye = _eyeManager.CurrentEye;
+        var angle = component.DistanceToTarget switch
+        {
+            Distance.Close or Distance.Medium or Distance.Far => component.ArrowAngle + eye.Rotation,
+            _ => Angle.Zero
+        };
+
+        _sprite.LayerSetRotation((args.SpriteViewEnt, sprite), PinpointerLayers.Screen, angle);
+        sprite.LayerSetState(PinpointerLayers.Screen, component.DistanceToTarget.ToString().ToLower());
+    }
+    // WD EDIT END
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -33,6 +60,11 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<PinpointerComponent, SpriteComponent>();
         while (query.MoveNext(out var uid, out var pinpointer, out var sprite))
         {
+            // WD EDIT START
+            if (!sprite.LayerExists(PinpointerLayers.Screen))
+                continue;
+            // WD EDIT END
+
             if (!pinpointer.HasTarget)
             {
                 sprite.LayerSetRotation(PinpointerLayers.Screen, Angle.Zero); // Goob edit

Content.Client/RoundEnd/RoundEndSummaryWindow.cs

@@ -51,6 +51,7 @@
 using System.Numerics;
 using Content.Client.Message;
 using Content.Shared.GameTicking;
+using Content.Goobstation.Common.StationReport;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Utility;
@@ -82,6 +83,7 @@ public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan,
             var roundEndTabs = new TabContainer();
             roundEndTabs.AddChild(MakeRoundEndSummaryTab(gm, roundEnd, roundTimeSpan, roundId));
             roundEndTabs.AddChild(MakePlayerManifestTab(info));
+            roundEndTabs.AddChild(MakeStationReportTab()); //goob
 
             Contents.AddChild(roundEndTabs);
 
@@ -216,6 +218,38 @@ private BoxContainer MakePlayerManifestTab(RoundEndMessageEvent.RoundEndPlayerIn
 
             return playerManifestTab;
         }
+        private BoxContainer MakeStationReportTab() //Goob edit start
+        {
+            //gets the stationreport varibible and sets the station report tab text to it if the map doesn't have a tablet will say No station report submitted
+            var stationReportSystem = _entityManager.System<Content.Goobstation.Common.StationReport.StationReportSystem>();
+            string stationReportText = stationReportSystem.StationReportText ?? Loc.GetString("no-station-report-summited");
+            var stationReportTab = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                Name = Loc.GetString("round-end-summary-window-station-report-tab-title")
+            };
+            var StationReportContainerScrollbox = new ScrollContainer
+            {
+                VerticalExpand = true,
+                Margin = new Thickness(10),
+                HScrollEnabled = false,
+            };
+            var StationReportContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
+            var StationReportLabel = new RichTextLabel();
+            var StationReportmessage = new FormattedMessage();
+            StationReportmessage.AddMarkupOrThrow(stationReportText);
+            StationReportLabel.SetMessage(StationReportmessage);
+            StationReportContainer.AddChild(StationReportLabel);
+
+
+            StationReportContainerScrollbox.AddChild(StationReportContainer);
+            stationReportTab.AddChild(StationReportContainerScrollbox);
+            return stationReportTab;
+        }
+        //Goob edit end
     }
 
-}
+}

Content.Client/StatusIcon/StatusIconSystem.cs

@@ -85,8 +85,8 @@ public bool IsVisible(Entity<MetaDataComponent> ent, StatusIconData data)
     {
         var viewer = _playerManager.LocalSession?.AttachedEntity;
 
-        // Always show our icons to our entity
-        if (viewer == ent.Owner)
+
+        if (data.VisibleToOwner && viewer == ent.Owner) // WD EDIT: not always show our icons to our entity
             return true;
 
         if (data.VisibleToGhosts && HasComp<GhostComponent>(viewer))
@@ -106,4 +106,4 @@ public bool IsVisible(Entity<MetaDataComponent> ent, StatusIconData data)
 
         return true;
     }
-}
+}

Content.Client/_White/Overlays/XenomorphInfectionIconSystem.cs

@@ -0,0 +1,32 @@
+using Content.Shared._White.Xenomorphs.Infection;
+using Content.Shared._White.Xenomorphs.Larva;
+using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._White.Overlays;
+
+public sealed class XenomorphInfectionIconSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<XenomorphInfectedComponent, GetStatusIconsEvent>(OnXenomorphInfectedGetStatusIconsEvent);
+        SubscribeLocalEvent<XenomorphLarvaVictimComponent, GetStatusIconsEvent>(OnXenomorphLarvaVictimGetStatusIconsEvent);
+    }
+
+    private void OnXenomorphInfectedGetStatusIconsEvent(EntityUid uid, XenomorphInfectedComponent component, ref GetStatusIconsEvent args)
+    {
+        if (component.InfectedIcons.TryGetValue(component.GrowthStage, out var infectedIcon)
+            && _prototype.TryIndex(infectedIcon, out var icon))
+            args.StatusIcons.Add(icon);
+    }
+
+    private void OnXenomorphLarvaVictimGetStatusIconsEvent(EntityUid uid, XenomorphLarvaVictimComponent component, ref GetStatusIconsEvent args)
+    {
+        if (component.InfectedIcon.HasValue && _prototype.TryIndex(component.InfectedIcon.Value, out var icon))
+            args.StatusIcons.Add(icon);
+    }
+}