From d9b56d55ecdf5ee8a0b968f0a72ba72d603292a4 Mon Sep 17 00:00:00 2001
From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
Date: Wed, 19 Feb 2020 04:25:14 +0000
Subject: [PATCH] Diona no longer split into nymphs when they cryo. (#8301)

---
 code/controllers/subsystems/job.dm                          | 2 ++
 code/modules/mob/living/carbon/human/species/species.dm     | 5 ++++-
 .../mob/living/carbon/human/species/station/diona/diona.dm  | 5 +++++
 html/changelogs/diona_nymph_cryopod_nosplit.yml             | 6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/diona_nymph_cryopod_nosplit.yml

diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index ddbb1b65b79..442cb9aae8f 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -704,6 +704,8 @@
 	H.ckey = null
 
 	// Delete the mob.
+	if(H.species)
+		H.species.handle_despawn(H)
 	qdel(H)
 
 // Equips a human-type with their custom loadout crap.
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 6dc6f21988c..e914b479d69 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -580,4 +580,7 @@
 	return "nutriment"
 
 /datum/species/proc/can_commune()
-	return FALSE
\ No newline at end of file
+	return FALSE
+
+/datum/species/proc/handle_despawn()
+	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm
index ade21e88fb8..e2ebb89f43a 100644
--- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm
@@ -178,3 +178,8 @@
 	if(H.get_total_health() <= config.health_threshold_dead)
 		return TRUE
 	return FALSE
+
+/datum/species/diona/handle_despawn(var/mob/living/carbon/human/H)
+	for(var/mob/living/carbon/alien/diona/D in H.contents)
+		if((!D.client && !D.mind) || D.stat == DEAD)
+			qdel(D)
\ No newline at end of file
diff --git a/html/changelogs/diona_nymph_cryopod_nosplit.yml b/html/changelogs/diona_nymph_cryopod_nosplit.yml
new file mode 100644
index 00000000000..fc86c77ad7b
--- /dev/null
+++ b/html/changelogs/diona_nymph_cryopod_nosplit.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Diona will no longer split into nymphs when they cryo."
\ No newline at end of file