diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index a5617e6148..99f1813f3c 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -69,6 +69,7 @@
 #define	TRAIT_TAGGER			"tagger"
 #define	TRAIT_PHOTOGRAPHER		"photographer"
 #define	TRAIT_MUSICIAN			"musician"
+#define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 4fc30de473..f299e9904a 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -84,3 +84,12 @@
 /datum/quirk/monochromatic/remove()
 	if(quirk_holder)
 		quirk_holder.remove_client_colour(/datum/client_colour/monochrome)
+
+/datum/quirk/crocrin_immunity
+	name = "Crocin Immunity"
+	desc = "You're one of the few people in the galaxy who are genetically immune to Crocin and Hexacrocin products and their addictive properties! However, you can still get brain damage from Hexacrocin addiction."
+	mob_trait = TRAIT_CROCRIN_IMMUNE
+	value = 0
+	gain_text = "<span class='notice'>You feel more prudish.</span>"
+	lose_text = "<span class='notice'>You don't feel as prudish as before.</span>"
+	medical_record_text = "Patient exhibits a special gene that makes them immune to Crocin and Hexacrocin."
diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
index e46174b5a9..061f941043 100644
--- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
+++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
@@ -97,7 +97,7 @@
 	color = "#FFADFF"//PINK, rgb(255, 173, 255)
 
 /datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M)
-	if(M && M.canbearoused)
+	if(M && M.canbearoused && !M.has_trait(TRAIT_CROCRIN_IMMUNE))
 		if(prob(33))
 			M.adjustArousalLoss(2)
 		if(prob(5))
@@ -119,7 +119,7 @@
 	overdose_threshold = 20
 
 /datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M)
-	if(M && M.canbearoused)
+	if(M && M.canbearoused && !M.has_trait(TRAIT_CROCRIN_IMMUNE))
 		if(prob(33))
 			M.adjustArousalLoss(6)//not quite six times as powerful, but still considerably more powerful.
 		if(prob(5))
@@ -151,7 +151,7 @@
 	..()
 
 /datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
-	if(M && M.canbearoused && prob(33))
+	if(M && M.canbearoused && !M.has_trait(TRAIT_CROCRIN_IMMUNE) && prob(33))
 		if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
 			var/mob/living/carbon/human/H = M
 			if(prob(50)) //Less spam