Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Experimental Cloner Won't Spit out a Body if it has no Ghost #1956

Merged
merged 3 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions monkestation/code/game/machinery/cloning.dm
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,9 @@

if(!mob_occupant)
return

exp_clone_check(mob_occupant)

current_insurance = null
REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
REMOVE_TRAIT(mob_occupant, TRAIT_STABLELIVER, CLONING_POD_TRAIT)
Expand Down Expand Up @@ -412,6 +415,9 @@
unattached_flesh.Cut()

occupant = null

/obj/machinery/clonepod/proc/exp_clone_check(mob_occupant)
return

/obj/machinery/clonepod/proc/malfunction()
var/mob/living/mob_occupant = occupant
Expand Down
3 changes: 3 additions & 0 deletions monkestation/code/game/machinery/exp_cloner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
attempting = FALSE
return CLONING_SUCCESS //so that we don't spam clones with autoprocess unless we leave a body in the scanner

/obj/machinery/clonepod/experimental/exp_clone_check(mob/living/carbon/human/mob_occupant)
if(!mob_occupant?.mind) //When experimental cloner fails to get a ghost, it won't spit out a body, so we don't get an army of brainless rejects.
qdel(mob_occupant)

/obj/machinery/clonepod/experimental/proc/get_clone_preview(datum/dna/clone_dna)
RETURN_TYPE(/image)
Expand Down
Loading