new special trait specifically for dionae radiation damage

BeeStation · Aug 19, 2024 · 72428f6 · 72428f6
1 parent afa30c4
commit 72428f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -183,6 +183,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_RESISTHIGHPRESSURE	"resist_high_pressure"
 #define TRAIT_RESISTLOWPRESSURE	"resist_low_pressure"
 #define TRAIT_RADIMMUNE			"rad_immunity"
+#define TRAIT_NORADDAMAGE		"no_rad_damage"
 #define TRAIT_VIRUSIMMUNE		"virus_immunity"
 #define TRAIT_PIERCEIMMUNE		"pierce_immunity"
 #define TRAIT_NODISMEMBER		"dismember_immunity"

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -47,6 +47,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE,
 		"TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE,
 		"TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE,
+		"TRAIT_NORADDAMAGE" = TRAIT_NORADDAMAGE,
 		"TRAIT_VIRUSIMMUNE" = TRAIT_VIRUSIMMUNE,
 		"TRAIT_PIERCEIMMUNE" = TRAIT_PIERCEIMMUNE,
 		"TRAIT_NODISMEMBER" = TRAIT_NODISMEMBER,

diff --git a/code/modules/mob/living/carbon/human/species_types/diona.dm b/code/modules/mob/living/carbon/human/species_types/diona.dm
@@ -6,7 +6,7 @@
 	bodyflag = FLAG_DIONA
 	default_color = "59CE00"
 	species_traits = list(MUTCOLORS,EYECOLOR,AGENDER,NOHUSK,NO_DNA_COPY,NOMOUTH,NO_UNDERWEAR,NOSOCKS,NOTRANSSTING,NOEYESPRITES)
-	inherent_traits = list(TRAIT_ALWAYS_CLEAN, TRAIT_BEEFRIEND, TRAIT_NONECRODISEASE, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTCOLD)
+	inherent_traits = list(TRAIT_ALWAYS_CLEAN, TRAIT_BEEFRIEND, TRAIT_NONECRODISEASE, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTCOLD, TRAIT_NORADDAMAGE)
 	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
 	mutant_bodyparts = list("diona_leaves", "diona_thorns", "diona_flowers", "diona_moss", "diona_mushroom", "diona_antennae", "diona_eyes", "diona_pbody")
 	mutant_organs = list(/obj/item/organ/nymph_organ/r_arm, /obj/item/organ/nymph_organ/l_arm, /obj/item/organ/nymph_organ/l_leg, /obj/item/organ/nymph_organ/r_leg, /obj/item/organ/nymph_organ/chest)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -1160,7 +1160,7 @@
 /mob/living/rad_act(amount)
 	. = ..()
 
-	if(!amount || (amount < RAD_MOB_SKIN_PROTECTION) || HAS_TRAIT(src, TRAIT_RADIMMUNE))
+	if(!amount || (amount < RAD_MOB_SKIN_PROTECTION) || HAS_TRAIT(src, TRAIT_RADIMMUNE) || HAS_TRAIT(src, TRAIT_NORADDAMAGE))
 		return
 
 	amount -= RAD_BACKGROUND_RADIATION // This will always be at least 1 because of how skin protection is calculated