diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 9f57511f38b..e81d90d184c 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -192,19 +192,15 @@
 
 			if (radiation > 100)
 				radiation = 100
-				if(!get_int_organ(/obj/item/organ/internal/heart/diona))
-					Weaken(10)
-					if(!lying)
-						to_chat(src, "<span class='alert'>You feel weak.</span>")
-						emote("collapse")
+				Weaken(10)
+				if(!lying)
+					to_chat(src, "<span class='alert'>You feel weak.</span>")
+					emote("collapse")
 
 			if (radiation < 0)
 				radiation = 0
 
 			else
-				if(get_int_organ(/obj/item/organ/internal/heart/diona))
-					return
-
 				var/damage = 0
 				switch(radiation)
 					if(0 to 49)
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 5cc20e66bb7..ae20969bc00 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -622,7 +622,7 @@
 	even the simplest concepts of other minds. Their alien physiology allows them survive happily off a diet of nothing but light, \
 	water and other radiation."
 
-	flags = NO_BREATHE | IS_PLANT | NO_BLOOD | NO_PAIN
+	flags = NO_BREATHE | RADIMMUNE | IS_PLANT | NO_BLOOD | NO_PAIN
 	clothing_flags = HAS_SOCKS
 	dietflags = 0		//Diona regenerate nutrition in light, no diet necessary
 
@@ -674,7 +674,7 @@
 
 /datum/species/diona/handle_life(var/mob/living/carbon/human/H)
 	var/rads = H.radiation/25
-	H.radiation -= rads
+	H.radiation = Clamp(H.radiation - rads, 0, 100)
 	H.nutrition += rads
 	H.adjustBruteLoss(-(rads))
 	H.adjustOxyLoss(-(rads))
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 99a4ee0ec07..6e47fd45626 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -72,11 +72,6 @@
 	updatehealth()
 	return 1
 
-/mob/living/carbon/human/apply_effect(var/effect = 0, var/effecttype = STUN, var/blocked = 0, var/negate_armor = 0)
-	if((effecttype == IRRADIATE) && (species.flags & RADIMMUNE))
-		return 0
-	return ..()
-
 /mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/slur = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0, var/stamina = 0, var/jitter = 0)
 	if(blocked >= 100)	return 0
 	if(stun)		apply_effect(stun, STUN, blocked)
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index e47acf9022e..407f2187842 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -157,7 +157,6 @@
 	origin_tech = "biotech=3"
 	parent_organ = "chest"
 	slot = "heart"
-	vital = 1
 
 /obj/item/organ/internal/brain/diona
 	name = "gas bladder"