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