From 06d55277726d56afb2f39bbd45582519d47112cd Mon Sep 17 00:00:00 2001
From: wrexbe <81056464+wrexbe@users.noreply.github.com>
Date: Sun, 19 Dec 2021 22:28:49 -0800
Subject: [PATCH] Add messages on cloner eject fail (#5846)

---
 .../Cloning/Components/CloningPodComponent.cs          | 10 ++++++++++
 .../en-US/cloning/components/cloning-pod-component.ftl |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/Content.Server/Cloning/Components/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs
index 6a00e39095..1db2badcf4 100644
--- a/Content.Server/Cloning/Components/CloningPodComponent.cs
+++ b/Content.Server/Cloning/Components/CloningPodComponent.cs
@@ -160,6 +160,16 @@ namespace Content.Server.Cloning.Components
                     break;
 
                 case UiButton.Eject:
+                    if (BodyContainer.ContainedEntity == null)
+                    {
+                        obj.Session.AttachedEntity.Value.PopupMessageCursor(Loc.GetString("cloning-pod-component-msg-empty"));
+                        return;
+                    }
+                    if (CloningProgress < CloningTime)
+                    {
+                        obj.Session.AttachedEntity.Value.PopupMessageCursor(Loc.GetString("cloning-pod-component-msg-incomplete"));
+                        return;
+                    }
                     Eject();
                     break;
 
diff --git a/Resources/Locale/en-US/cloning/components/cloning-pod-component.ftl b/Resources/Locale/en-US/cloning/components/cloning-pod-component.ftl
index 61e1eddf73..8a42392cc5 100644
--- a/Resources/Locale/en-US/cloning/components/cloning-pod-component.ftl
+++ b/Resources/Locale/en-US/cloning/components/cloning-pod-component.ftl
@@ -15,4 +15,6 @@ cloning-pod-component-msg-bad-selection = ERROR: Entry Removed During Selection
 cloning-pod-component-msg-already-cloning = ERROR: Pod Network Conflict
 cloning-pod-component-msg-already-alive = ERROR: Metaphysical Conflict
 cloning-pod-component-msg-user-offline = ERROR: Metaphysical Disturbance
+cloning-pod-component-msg-incomplete = ERROR: Cloning in progress
+cloning-pod-component-msg-empty = ERROR: The pod is empty