From e6c4977709d462850fe924c0cf073456574e15a6 Mon Sep 17 00:00:00 2001
From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
Date: Fri, 29 Dec 2023 20:09:12 +0300
Subject: [PATCH] QOL changes on the matter of life and death (#782)

* Fix cremation accepting connected players

* Fix ghostrespawn

* Support for components that are carried over to cloned bodies

* Whitespace
---
 Content.Server/Body/Systems/BodySystem.cs        |  3 ++-
 Content.Server/Cloning/CloningSystem.cs          | 16 ++++++++++++++++
 Content.Server/Morgue/CrematoriumSystem.cs       | 15 +++++++++++++++
 .../Item/PseudoItem/PseudoItemComponent.cs       |  4 +++-
 .../_NF/SizeAttribute/SizeAttributeComponent.cs  |  4 +++-
 .../_NF/Cloning/ITransferredByCloning.cs         |  9 +++++++++
 6 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 Content.Shared/_NF/Cloning/ITransferredByCloning.cs

diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 242b02d78c1..b55cb70cf9b 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -42,7 +42,8 @@ private void OnRelayMoveInput(EntityUid uid, BodyComponent component, ref MoveIn
     {
         if (_mobState.IsDead(uid) && _mindSystem.TryGetMind(uid, out var mindId, out var mind))
         {
-            mind.TimeOfDeath ??= _gameTiming.RealTime;
+            // mind.TimeOfDeath ??= _gameTiming.RealTime;
+            mind.TimeOfDeath ??= _gameTiming.CurTime; // Frontier - fix returning to body messing with the your TOD
             _ticker.OnGhostAttempt(mindId, true, mind: mind);
         }
     }
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 7eefe02a53c..9749ec28dfc 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -37,7 +37,9 @@
 using Content.Shared.Emag.Systems;
 using Content.Server.Popups;
 using Content.Server.Traits.Assorted;
+using Content.Shared._NF.Cloning;
 using Content.Shared.Bank.Components;
+using Robust.Shared.Serialization.Manager;
 
 namespace Content.Server.Cloning
 {
@@ -65,6 +67,8 @@ public sealed class CloningSystem : EntitySystem
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
         [Dependency] private readonly MetaDataSystem _metaSystem = default!;
         [Dependency] private readonly SharedJobSystem _jobs = default!;
+        // Frontier
+        [Dependency] private readonly ISerializationManager _serialization = default!;
 
         public readonly Dictionary<MindComponent, EntityUid> ClonesWaitingForMind = new();
         public const float EasyModeCloningCost = 0.7f;
@@ -255,6 +259,18 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
                 bankComp.Balance = bank.Balance;
             }
 
+            // Frontier
+            // Transfer of special components, e.g. small/big traits
+            foreach (var comp in EntityManager.GetComponents(bodyToClone))
+            {
+                if (comp is ITransferredByCloning)
+                {
+                    var copy = _serialization.CreateCopy(comp, notNullableOverride: true);
+                    copy.Owner = mob;
+                    EntityManager.AddComponent(mob, copy, overwrite: true);
+                }
+            }
+
             var ev = new CloningEvent(bodyToClone, mob);
             RaiseLocalEvent(bodyToClone, ref ev);
 
diff --git a/Content.Server/Morgue/CrematoriumSystem.cs b/Content.Server/Morgue/CrematoriumSystem.cs
index 8d05d0abd14..377e6dbb069 100644
--- a/Content.Server/Morgue/CrematoriumSystem.cs
+++ b/Content.Server/Morgue/CrematoriumSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.GameTicking;
 using Content.Server.Morgue.Components;
 using Content.Server.Storage.Components;
@@ -7,6 +8,8 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Morgue;
 using Content.Shared.Popups;
 using Content.Shared.Standing;
@@ -14,6 +17,7 @@
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Enums;
 using Robust.Shared.Player;
 
 namespace Content.Server.Morgue;
@@ -27,6 +31,8 @@ public sealed class CrematoriumSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly StandingStateSystem _standing = default!;
     [Dependency] private readonly SharedMindSystem _minds = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!; // Frontier
+    [Dependency] private readonly SharedMindSystem _mind = default!; // frontier
 
     public override void Initialize()
     {
@@ -108,6 +114,15 @@ public bool TryCremate(EntityUid uid, CrematoriumComponent? component = null, En
         if (storage.Open || storage.Contents.ContainedEntities.Count < 1)
             return false;
 
+        // Frontier - refuse to accept alive mobs and dead-but-connected players
+        var entity = storage.Contents.ContainedEntities.First();
+        if (entity is not { Valid: true })
+            return false;
+        if (TryComp<MobStateComponent>(entity, out var comp) && !_mobState.IsDead(entity, comp))
+            return false;
+        if (_mind.TryGetMind(entity, out var _, out var mind) && mind.Session?.State?.Status == SessionStatus.InGame)
+            return false;
+
         return Cremate(uid, component, storage);
     }
 
diff --git a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs
index 4844441a9ba..73ff83f0d1d 100644
--- a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs
+++ b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs
@@ -1,4 +1,6 @@
 
+using Content.Shared._NF.Cloning;
+
 namespace Content.Server.Item.PseudoItem
 {
     /// <summary>
@@ -6,7 +8,7 @@ namespace Content.Server.Item.PseudoItem
     /// but not under most conditions.
     /// </summary>
     [RegisterComponent]
-    public sealed partial class PseudoItemComponent : Component
+    public sealed partial class PseudoItemComponent : Component, ITransferredByCloning
     {
         [DataField("size")]
         public int Size = 120;
diff --git a/Content.Server/_NF/SizeAttribute/SizeAttributeComponent.cs b/Content.Server/_NF/SizeAttribute/SizeAttributeComponent.cs
index 0cb88abe587..4c9926c274b 100644
--- a/Content.Server/_NF/SizeAttribute/SizeAttributeComponent.cs
+++ b/Content.Server/_NF/SizeAttribute/SizeAttributeComponent.cs
@@ -1,8 +1,10 @@
 
+using Content.Shared._NF.Cloning;
+
 namespace Content.Server.SizeAttribute
 {
     [RegisterComponent]
-    public sealed partial class SizeAttributeComponent : Component
+    public sealed partial class SizeAttributeComponent : Component, ITransferredByCloning
     {
         [DataField("short")]
         public bool Short = false;
diff --git a/Content.Shared/_NF/Cloning/ITransferredByCloning.cs b/Content.Shared/_NF/Cloning/ITransferredByCloning.cs
new file mode 100644
index 00000000000..e51136e9f16
--- /dev/null
+++ b/Content.Shared/_NF/Cloning/ITransferredByCloning.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared._NF.Cloning;
+
+/// <summary>
+///   Indicates that this Component should be transferred to the new entity when the entity is cloned (for example, using a cloner)
+/// </summary>
+public interface ITransferredByCloning
+{
+}
+