Merge branch 'master' into Plushie-Update

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.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/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

@@ -143,7 +143,7 @@ private bool IsHeater(GasThermoMachineComponent comp)
 
         private void OnToggleMessage(EntityUid uid, GasThermoMachineComponent thermoMachine, GasThermomachineToggleMessage args)
         {
-            var powerState = _power.TogglePower(uid);
+            var powerState = _power.TryTogglePower(uid);
             _adminLogger.Add(LogType.AtmosPowerChanged, $"{ToPrettyString(args.Session.AttachedEntity)} turned {(powerState ? "On" : "Off")} {ToPrettyString(uid)}");
             DirtyUI(uid, thermoMachine);
         }

Content.Server/Atmos/Portable/SpaceHeaterSystem.cs

@@ -98,7 +98,7 @@ private void OnToggle(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeat
         if (!Resolve(uid, ref powerReceiver))
             return;
 
-        _power.TogglePower(uid);
+        _power.TryTogglePower(uid);
 
         UpdateAppearance(uid);
         DirtyUI(uid, spaceHeater);

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>

Content.Server/Body/Systems/BloodstreamSystem.cs

@@ -120,12 +120,15 @@ public override void Update(float frameTime)
 
             // Removes blood for Blood Deficiency constantly.
             if (bloodstream.HasBloodDeficiency)
+            {
                 if (!_mobStateSystem.IsDead(uid))
                     RemoveBlood(uid, bloodstream.BloodDeficiencyLossAmount, bloodstream);
+            }
             // Adds blood to their blood level if it is below the maximum.
-            else if (bloodSolution.Volume < bloodSolution.MaxVolume)
-                if (!_mobStateSystem.IsDead(uid))
-                    TryModifyBloodLevel(uid, bloodstream.BloodRefreshAmount, bloodstream);
+            else if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
+            {
+                TryModifyBloodLevel(uid, bloodstream.BloodRefreshAmount, bloodstream);
+            }
 
             // Removes blood from the bloodstream based on bleed amount (bleed rate)
             // as well as stop their bleeding to a certain extent.

Content.Server/Botany/Components/TeleportingTraitComponent.cs

@@ -0,0 +1,31 @@
+namespace Content.Server.Botany
+{
+    [RegisterComponent]
+
+    public sealed partial class TeleportingTraitComponent : Component
+    {
+        /// <summary>
+        ///     Teleportation radius of produce.
+        /// </summary>
+        [DataField]
+        public float ProduceTeleportRadius;
+
+        /// <summary>
+        ///     How much to divide the potency.
+        /// </summary>
+        [DataField]
+        public float PotencyDivide = 10f;
+
+        /// <summary>
+        ///     Potency of fruit.
+        /// </summary>
+        [DataField]
+        public float Potency;
+
+        /// <summary>
+        ///     Chance of deletion.
+        /// </summary>
+        [DataField]
+        public float DeletionChance = .5f;
+    }
+}

Content.Server/Botany/SeedPrototype.cs

@@ -205,6 +205,11 @@ public partial class SeedData
     /// </summary>
     [DataField("ligneous")] public bool Ligneous;
 
+    /// <summary>
+    ///     If true, teleports both fruit and player if slippable.
+    /// </summary>
+    [DataField] public bool Teleporting;
+
     // No, I'm not removing these.
     // if you re-add these, make sure that they get cloned.
     //public PlantSpread Spread { get; set; }
@@ -215,7 +220,6 @@ public partial class SeedData
     //public bool Hematophage { get; set; }
     //public bool Thorny { get; set; }
     //public bool Stinging { get; set; }
-    // public bool Teleporting { get; set; }
     // public PlantJuicy Juicy { get; set; }
 
     #endregion
@@ -295,6 +299,7 @@ public SeedData Clone()
             Slip = Slip,
             Sentient = Sentient,
             Ligneous = Ligneous,
+            Teleporting = Teleporting,
 
             PlantRsi = PlantRsi,
             PlantIconState = PlantIconState,
@@ -358,6 +363,7 @@ public SeedData SpeciesChange(SeedData other)
             Slip = Slip,
             Sentient = Sentient,
             Ligneous = Ligneous,
+            Teleporting = Teleporting,
 
             PlantRsi = other.PlantRsi,
             PlantIconState = other.PlantIconState,

Content.Server/Botany/Systems/BotanySystem.Seed.cs

@@ -207,6 +207,11 @@ public IEnumerable<EntityUid> GenerateProduct(SeedData proto, EntityCoordinates
                 var collisionWake = EnsureComp<CollisionWakeComponent>(entity);
                 _colWakeSystem.SetEnabled(entity, false, collisionWake);
             }
+            if (proto.Teleporting)
+            {
+                var teleporting = EnsureComp<TeleportingTraitComponent>(entity);
+                TeleportingTraitSystem.SetPotencyRadius(proto.Potency, teleporting);
+            }
         }
 
         return products;

Content.Server/Botany/Systems/MutationSystem.cs

@@ -40,7 +40,7 @@ public void MutateSeed(ref SeedData seed, float severity)
         }
 
         // Add up everything in the bits column and put the number here.
-        const int totalbits = 275;
+        const int totalbits = 285;
 
         // Tolerances (55)
         MutateFloat(ref seed.NutrientConsumption  , 0.05f, 1.2f, 5, totalbits, severity);
@@ -66,11 +66,12 @@ public void MutateSeed(ref SeedData seed, float severity)
         // Kill the plant (30)
         MutateBool(ref seed.Viable        , false, 30, totalbits, severity);
 
-        // Fun (90)
+        // Fun (100)
         MutateBool(ref seed.Seedless      , true , 10, totalbits, severity);
         MutateBool(ref seed.Slip          , true , 10, totalbits, severity);
         MutateBool(ref seed.Sentient      , true , 10, totalbits, severity);
         MutateBool(ref seed.Ligneous      , true , 10, totalbits, severity);
+        MutateBool(ref seed.Teleporting   , true , 10, totalbits, severity);
         MutateBool(ref seed.Bioluminescent, true , 10, totalbits, severity);
         MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity);
         MutateBool(ref seed.CanScream     , true , 10, totalbits, severity);
@@ -120,6 +121,7 @@ public SeedData Cross(SeedData a, SeedData b)
         CrossBool(ref result.Slip, a.Slip);
         CrossBool(ref result.Sentient, a.Sentient);
         CrossBool(ref result.Ligneous, a.Ligneous);
+        CrossBool(ref result.Teleporting, a.Teleporting);
         CrossBool(ref result.Bioluminescent, a.Bioluminescent);
         CrossBool(ref result.TurnIntoKudzu, a.TurnIntoKudzu);
         CrossBool(ref result.CanScream, a.CanScream);