diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 8ca069fe..2b3f5934 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -181,8 +181,6 @@
#define TRAIT_CROCRIN_IMMUNE "crocin_immune"
#define TRAIT_NYMPHO "nymphomania"
#define TRAIT_DISTANT "headpat_hater"
-//#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"
@@ -207,7 +205,6 @@
#define TRAIT_STRONGLEGS "strong_legs"
//Hyper
-#define TRAIT_VIRILE "virile" //you have 20% more chance of impreg
#define TRAIT_MACROPHILE "macrophile" //likes the big
#define TRAIT_MICROPHILE "microphile" //likes the small
#define TRAIT_APATHETIC "apathetic" //doesn't care
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 309e554e..8abde669 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -833,10 +833,6 @@
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] has praised me!!"), 5)
if(HAS_TRAIT(L, TRAIT_NYMPHO))
L.adjustArousalLoss(2*power_multiplier)
- if(HAS_TRAIT(L, TRAIT_MASO))
- E.enthrallTally -= power_multiplier
- E.resistanceTally += power_multiplier
- E.cooldown += 1
else
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've been praised for doing a good job!"), 5)
E.resistanceTally -= power_multiplier
@@ -854,11 +850,6 @@
if(L == user)
continue
if (L.client?.prefs.lewdchem)
- if(HAS_TRAIT(L, TRAIT_MASO))
- L.adjustArousalLoss(3*power_multiplier)
- descmessage += "And yet, it feels so good..!" //I don't really understand masco, is this the right sort of thing they like?
- E.enthrallTally += power_multiplier
- E.resistanceTally -= power_multiplier
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've let [E.enthrallGender] down...!"), 5)
else
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've let [E.enthrallGender] down..."), 5)
diff --git a/hyperstation/code/datums/traits/neutral.dm b/hyperstation/code/datums/traits/neutral.dm
index 01e1482c..f8c4f8dd 100644
--- a/hyperstation/code/datums/traits/neutral.dm
+++ b/hyperstation/code/datums/traits/neutral.dm
@@ -19,17 +19,6 @@
lose_text = "You feel the weight of the curse in your blood finally gone."
medical_record_text = "Patient suffers from an unknown type of aversion to holy reagents. Keep them away from a chaplain."
-/* Disabled for now, some scripts not working.
-/datum/quirk/heat
- name = "Estrus Detection"
- desc = "You have a animalistic sense of detecting if someone is in heat, and can get pregnant."
- value = 0
- category = CATEGORY_SEXUAL
- mob_trait = TRAIT_HEAT_DETECT
- gain_text = "You feel your senses adjust, allowing a animalistic sense of others' fertility."
- lose_text = "You feel your sense of others' fertility fade."
-*/
-
/datum/quirk/inheat
name = "In Heat"
desc = "Your system burns with the desire to be bred, your body will betray you and alert others' to your desire when examining you. Satisfying your lust will make you happy, but ignoring it may cause you to become sad and needy."
@@ -39,39 +28,6 @@
gain_text = "You body burns with the desire to be bred."
lose_text = "You feel more in control of your body and thoughts."
-// /datum/quirk/overweight
-// name = "Overweight"
-// desc = "You're particularly fond of food, and join the round being overweight."
-// value = 0
-// category = CATEGORY_FOOD
-// gain_text = "You feel a bit chubby!"
-// //no lose_text cause why would there be?
-
-// /datum/quirk/overweight/on_spawn()
-// var/mob/living/M = quirk_holder
-// M.nutrition = rand(NUTRITION_LEVEL_FULL + NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_FULL + NUTRITION_LEVEL_START_MAX)
-// M.overeatduration = 100
-// ADD_TRAIT(M, TRAIT_FAT, OBESITY)
-
-/datum/quirk/virile
- name = "Virile"
- desc = "Either through higher quality sperms, more of them, or just being more horny, your impregnation chance will increase by 20-30%."
- value = 0
- category = CATEGORY_SEXUAL
- medical_record_text = "Patient has a higher sperm count."
- mob_trait = TRAIT_VIRILE
- gain_text = "You feel more potent."
- lose_text = "You feel less potent."
- var/ichange = 0
-
-/datum/quirk/virile/add()
- ichange = rand(20,30)
- quirk_holder.impregchance += ichange
-
-/datum/quirk/virile/remove()
- if(quirk_holder)
- quirk_holder.impregchance -= ichange
-
/datum/quirk/macrophile
name = "Macrophile"
desc = "You are attracted to larger people, and being stepped on by them."
diff --git a/modular_citadel/code/datums/traits/neutral.dm b/modular_citadel/code/datums/traits/neutral.dm
index 20530dcc..ca117f25 100644
--- a/modular_citadel/code/datums/traits/neutral.dm
+++ b/modular_citadel/code/datums/traits/neutral.dm
@@ -24,15 +24,6 @@
to_chat(quirk_holder, "Having high libido is useless when you can't feel arousal at all!")
qdel(src)
-/datum/quirk/maso
- name = "Masochism"
- desc = "You are aroused by pain."
- value = 0
- category = CATEGORY_SEXUAL
- mob_trait = TRAIT_MASO
- 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."
@@ -52,13 +43,3 @@
var/active = FALSE
var/power = 0
var/cachedmoveCalc = 1
-/*
-/datum/quirk/fluid_leak
- name = "Leaky breasts"
- desc = "You don't stop making milk, and you have a habit of leaking everywhere when your breasts are full"
- mob_trait = TRAIT_FLUID_LEAK
- value = 0
- medical_record_text = "Patient poorly controls their fluids."
- gain_text = "You feel like your leaking everywhere."
- lose_text = "You feel like you can control your fluids."
-*/