diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index e674a78a..397a3983 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -151,6 +151,7 @@
#define TRAIT_NYMPHO "nymphomania"
//#define TRAIT_FLUID_LEAK "leaky_fluids" removed because milk snail trails are not okay
#define TRAIT_MASO "masochism"
+#define TRAIT_CHOKE_SLUT "choke_slut"
#define TRAIT_HIGH_BLOOD "high_blood"
#define TRAIT_PHARMA "hepatic_pharmacokinesis"
#define TRAIT_PARA "paraplegic"
@@ -194,7 +195,6 @@
#define STASIS_MUTE "stasis"
#define GENETICS_SPELL "genetics_spell"
#define EYES_COVERED "eyes_covered"
-#define CULT_TRAIT "cult"
#define CLOWN_NUKE_TRAIT "clown-nuke"
#define STICKY_MOUSTACHE_TRAIT "sticky-moustache"
#define CHAINSAW_FRENZY_TRAIT "chainsaw-frenzy"
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 91b7dbaf..b1c26675 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -74,7 +74,13 @@
if((times_fired % next_breath) == 0 || failed_last_breath)
breathe() //Breathe per 4 ticks if healthy, down to 2 if our lungs or heart are damaged, unless suffocating
if(failed_last_breath)
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
+ var/mob/living/carbon/human/B = src
+ if(HAS_TRAIT(B, TRAIT_CHOKE_SLUT))
+ B.adjustArousalLoss(7)
+ if (B.getArousalLoss() >= 100 && ishuman(B) && B.has_dna())
+ B.mob_climax(forced_climax=TRUE)
+ else
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
else
SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "suffocation")
else
diff --git a/modular_citadel/code/datums/traits/neutral.dm b/modular_citadel/code/datums/traits/neutral.dm
index 5e48909e..de682418 100644
--- a/modular_citadel/code/datums/traits/neutral.dm
+++ b/modular_citadel/code/datums/traits/neutral.dm
@@ -32,6 +32,14 @@
gain_text = "You desire to be hurt."
lose_text = "Pain has become less exciting for you."
+/datum/quirk/choke_slut
+ name = "Choke Slut"
+ desc = "You are aroused by suffocation."
+ value = 0
+ mob_trait = TRAIT_CHOKE_SLUT
+ gain_text = "You feel like you want to feel fingers around your neck, choking you until you pass out or make a mess... Maybe both."
+ lose_text = "Seems you don't have a kink for suffocation anymore."
+
/datum/quirk/pharmacokinesis //Prevents unwanted organ additions.
name = "Acute hepatic pharmacokinesis"
desc = "You've a rare genetic disorder that causes Incubus draft and Sucubus milk to be absorbed by your liver instead."