From 043cd9ebb59091324e32990290f7518de95e7ad7 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 26 May 2026 13:57:53 -0400
Subject: [PATCH] Diona Null Invoke Fix (#22493)

Fix for https://aurorastation.sentry.io/issues/7409286369

Which produced a runtime error (and associated hard del) when a Diona
enters a cryopod.
---
 code/modules/mob/living/carbon/diona_base.dm       | 9 ++++-----
 html/changelogs/hellfirejag-diona-regen-bugfix.yml | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/hellfirejag-diona-regen-bugfix.yml

diff --git a/code/modules/mob/living/carbon/diona_base.dm b/code/modules/mob/living/carbon/diona_base.dm
index 4fe9ca0082e..4e28ee2c62c 100644
--- a/code/modules/mob/living/carbon/diona_base.dm
+++ b/code/modules/mob/living/carbon/diona_base.dm
@@ -370,15 +370,14 @@ and some alternative things that are toxic to other life, such as radium and mut
 
 	updatehealth()
 
-/mob/living/carbon/human/proc/diona_regen_progress(var/datum/dionastats/DS)
+/mob/living/carbon/human/proc/diona_regen_progress(datum/dionastats/DS)
 	if(!DS)
 		return
 	if(DS.regen_limb_progress > LIMB_REGROW_REQUIREMENT)
-		DS.regen_limb.Invoke()
+		DS.regen_limb?.Invoke()
 		DS.regen_limb = null
-		if(DS.regen_extra)
-			DS.regen_extra.Invoke()
-			DS.regen_extra = null
+		DS.regen_extra?.Invoke()
+		DS.regen_extra = null
 	var/progress = nutrition * 0.45
 	adjustNutritionLoss(nutrition * 0.15)
 	progress += DS.stored_energy * 0.3
diff --git a/html/changelogs/hellfirejag-diona-regen-bugfix.yml b/html/changelogs/hellfirejag-diona-regen-bugfix.yml
new file mode 100644
index 00000000000..e7c3bb80322
--- /dev/null
+++ b/html/changelogs/hellfirejag-diona-regen-bugfix.yml
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "Fixed a runtime error caused by a diona entering a cryopod."