Merge branch 'master' into Xenowear

Signed-off-by: FoxxoTrystan <[email protected]>

Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs → Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs

@@ -1,10 +1,9 @@
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.CartridgeLoader.Cartridges;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {

Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml → Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml

@@ -1,4 +1,4 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Nyanotrasen.CartridgeLoader.Cartridges"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
                                  xmlns="https://spacestation14.io" Margin="1 0 2 0">
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">

Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs → Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs

@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Nyanotrasen.UserInterface;
+using Content.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.CartridgeLoader.Cartridges;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer

Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs → Content.Client/Chat/PsionicChatUpdateSystem.cs

@@ -2,7 +2,7 @@
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Nyanotrasen.Chat
+namespace Content.Client.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {

Content.Client/Eye/PenLight/UI/PenLightBoundUserInterface.cs

@@ -0,0 +1,47 @@
+using Content.Shared.Medical;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Eye.PenLight.UI
+{
+    [UsedImplicitly]
+    public sealed class PenLightBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private PenLightWindow? _window;
+
+        public PenLightBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+        protected override void Open()
+        {
+            base.Open();
+            _window = new PenLightWindow
+            {
+                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
+            };
+            _window.OnClose += Close;
+            _window.OpenCentered();
+        }
+
+        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+        {
+            if (_window == null
+                || message is not PenLightUserMessage cast)
+                return;
+
+            _window.Diagnose(cast);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing)
+                return;
+
+            if (_window != null)
+                _window.OnClose -= Close;
+
+            _window?.Dispose();
+        }
+    }
+}

Content.Client/Eye/PenLight/UI/PenLightWindow.xaml

@@ -0,0 +1,11 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc 'pen-light-exam-title'}"
+    SetSize="0 -300">
+    <ScrollContainer VerticalExpand="True">
+        <BoxContainer Name="RootContainer" Orientation="Vertical" HorizontalExpand="True">
+            <Label Name="NoPatientDataText" Text="{Loc 'pen-light-window-no-patient-data-text'}" Visible="False"/>
+            <Label Name="ExamDataLabel"/>
+        </BoxContainer>
+    </ScrollContainer>
+</controls:FancyWindow>

Content.Client/Eye/PenLight/UI/PenLightWindow.xaml.cs

@@ -0,0 +1,78 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Damage;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Medical;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+using System.Text;
+
+
+namespace Content.Client.Eye.PenLight.UI
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class PenLightWindow : FancyWindow
+    {
+        private readonly IEntityManager _entityManager;
+        private const int LightHeight = 150;
+        private const int LightWidth = 900;
+
+        public PenLightWindow()
+        {
+            RobustXamlLoader.Load(this);
+
+            var dependencies = IoCManager.Instance!;
+            _entityManager = dependencies.Resolve<IEntityManager>();
+        }
+        public void Diagnose(PenLightUserMessage msg)
+        {
+            var target = _entityManager.GetEntity(msg.TargetEntity);
+
+            if (target == null || !_entityManager.TryGetComponent<DamageableComponent>(target, out var damageable))
+            {
+                NoPatientDataText.Visible = true;
+                ExamDataLabel.Text = string.Empty;
+                return;
+            }
+
+            NoPatientDataText.Visible = false;
+
+
+            string entityName = Loc.GetString("pen-light-window-entity-unknown-text");
+            if (_entityManager.HasComponent<MetaDataComponent>(target.Value))
+                entityName = Identity.Name(target.Value, _entityManager);
+
+            var sb = new StringBuilder();
+            sb.AppendLine(Loc.GetString("pen-light-window-entity-eyes-text", ("entityName", entityName)));
+
+            // Check if Blind and return early if true
+            if (msg.Blind == true)
+            {
+                sb.AppendLine(Loc.GetString("pen-light-exam-blind-text"));
+                ExamDataLabel.Text = sb.ToString();
+                SetHeight = LightHeight;
+                SetWidth = LightWidth;
+                return;
+            }
+            // EyeDamage
+            if (msg.EyeDamage == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-eyedamage-text"));
+
+            // Drunk
+            if (msg.Drunk == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-drunk-text"));
+
+            // Hallucinating
+            if (msg.SeeingRainbows == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-hallucinating-text"));
+
+            // Healthy
+            if (msg.Healthy == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-healthy-text"));
+
+            ExamDataLabel.Text = sb.ToString();
+
+            SetHeight = LightHeight;
+            SetWidth = LightWidth;
+        }
+    }
+}

Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs → Content.Client/UserInterface/GlimmerGraph.cs

@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Nyanotrasen.UserInterface;
+namespace Content.Client.UserInterface;
 
 public sealed class GlimmerGraph : Control
 {

Content.Client/UserInterface/Systems/Chat/ChatUIController.cs

@@ -38,7 +38,6 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace.
 
 namespace Content.Client.UserInterface.Systems.Chat;
 

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.Gameplay;
+using Content.Shared.CCVar;
 using Content.Shared.CombatMode;
 using Content.Shared.Effects;
 using Content.Shared.Hands.Components;
@@ -16,8 +17,6 @@
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Weapons.Melee;
 
@@ -223,12 +222,12 @@ private void ClientHeavyAttack(EntityUid user, EntityCoordinates coordinates, En
 
         var userPos = TransformSystem.GetWorldPosition(userXform);
         var direction = targetMap.Position - userPos;
-        var distance = MathF.Min(component.Range, direction.Length());
+        var distance = MathF.Min(component.Range * component.HeavyRangeModifier, direction.Length());
 
         // This should really be improved. GetEntitiesInArc uses pos instead of bounding boxes.
         // Server will validate it with InRangeUnobstructed.
         var entities = GetNetEntityList(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, user).ToList());
-        RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
+        RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(component.MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
     }
 
     private void OnMeleeLunge(MeleeLungeEvent ev)

Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs → Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs

@@ -6,13 +6,9 @@
 using Content.Server.EUI;
 using Content.Server.Psionics;
 using Content.Server.Mind;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.Player;
 
 namespace Content.Server.Abilities.Psionics
@@ -22,13 +18,14 @@ public sealed class PsionicAbilitiesSystem : EntitySystem
         [Dependency] private readonly IComponentFactory _componentFactory = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly EuiManager _euiManager = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
 
+        private ISawmill _sawmill = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -46,17 +43,11 @@ private void OnPlayerAttached(EntityUid uid, PsionicAwaitingPlayerComponent comp
 
         public void AddPsionics(EntityUid uid, bool warn = true)
         {
-            if (Deleted(uid))
-                return;
-
-            if (HasComp<PsionicComponent>(uid))
+            if (Deleted(uid)
+                || HasComp<PsionicComponent>(uid))
                 return;
 
-            //Don't know if this will work. New mind state vs old.
-            if (!TryComp<MindContainerComponent>(uid, out var mindContainer) ||
-                !_mindSystem.TryGetMind(uid, out _, out var mind ))
-            //||
-            //!_mindSystem.TryGetMind(uid, out var mind, mindContainer))
+            if (!_mindSystem.TryGetMind(uid, out _, out var mind))
             {
                 EnsureComp<PsionicAwaitingPlayerComponent>(uid);
                 return;
@@ -65,18 +56,16 @@ public void AddPsionics(EntityUid uid, bool warn = true)
             if (!_mindSystem.TryGetSession(mind, out var client))
                 return;
 
-            if (warn && TryComp<ActorComponent>(uid, out var actor))
+            if (warn && HasComp<ActorComponent>(uid))
                 _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), client);
             else
                 AddRandomPsionicPower(uid);
         }
 
         public void AddPsionics(EntityUid uid, string powerComp)
         {
-            if (Deleted(uid))
-                return;
-
-            if (HasComp<PsionicComponent>(uid))
+            if (Deleted(uid)
+                || HasComp<PsionicComponent>(uid))
                 return;
 
             AddComp<PsionicComponent>(uid);
@@ -93,7 +82,7 @@ public void AddRandomPsionicPower(EntityUid uid)
 
             if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
             {
-                Logger.Error("Can't index the random psionic power pool!");
+                _sawmill.Error("Can't index the random psionic power pool!");
                 return;
             }
 
@@ -108,15 +97,13 @@ public void AddRandomPsionicPower(EntityUid uid)
 
         public void RemovePsionics(EntityUid uid)
         {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            if (!psionic.Removable)
+            if (!TryComp<PsionicComponent>(uid, out var psionic)
+                || !psionic.Removable)
                 return;
 
             if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
             {
-                Logger.Error("Can't index the random psionic power pool!");
+                _sawmill.Error("Can't index the random psionic power pool!");
                 return;
             }
 
@@ -127,13 +114,10 @@ public void RemovePsionics(EntityUid uid)
                 if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower))
                     RemComp(uid, psionicPower);
             }
-            if (psionic.PsionicAbility != null){
-                _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility );
-                if (psiAbility != null){
-                    var owner = psiAbility.Owner;
-                    _actionsSystem.RemoveAction(uid, psiAbility.Owner);
-                }
-            }
+            if (psionic.PsionicAbility != null
+                && _actionsSystem.TryGetActionData(psionic.PsionicAbility, out var psiAbility)
+                && psiAbility is not null)
+                _actionsSystem.RemoveAction(uid, psionic.PsionicAbility);
 
             _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
 

Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs

@@ -247,7 +247,11 @@ public override void Update(float frameTime)
                     var damageScale = MathF.Min(((pressure / Atmospherics.HazardHighPressure) - 1) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
 
                     _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false);
-
+                    if (!barotrauma.TakingDamage)
+                    {
+                        barotrauma.TakingDamage = true;
+                        _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} started taking high pressure damage");
+                    }
                     _alertsSystem.ShowAlert(uid, AlertType.HighPressure, 2);
                 }
                 else
@@ -258,11 +262,6 @@ public override void Update(float frameTime)
                         barotrauma.TakingDamage = false;
                         _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} stopped taking pressure damage");
                     }
-                    if (!barotrauma.TakingDamage)
-                    {
-                        barotrauma.TakingDamage = true;
-                        _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} started taking high pressure damage");
-                    }
                     // Set correct alert.
                     switch (pressure)
                     {

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -12,7 +12,7 @@
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem), typeof(BloodDeficiencySystem))]
+    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem), typeof(BloodDeficiencySystem), typeof(HemophiliaSystem))]
     public sealed partial class BloodstreamComponent : Component
     {
         public static string DefaultChemicalsSolutionName = "chemicals";
@@ -177,6 +177,7 @@ public sealed partial class BloodstreamComponent : Component
         ///     If this is true, the entity will not passively regenerate blood,
         ///     and instead will slowly lose blood.
         /// </summary>
+        [DataField]
         public bool HasBloodDeficiency = false;
 
         /// <summary>