Merge branch 'master' of github.com:lyricalpaws/Hyper-Station-13

code/modules/mob/living/carbon/human/examine.dm

@@ -127,7 +127,7 @@
 		. += "[t_He] might be able to be picked up with <b>Alt+Click</b>!\n"
 
 	//Heat Detection
-	if(breedable && HAS_TRAIT(src, TRAIT_HEAT_DETECT) && HAS_TRAIT(user, TRAIT_HEAT))
+	if(breedable && HAS_TRAIT(user, TRAIT_HEAT))
 		. += "<span class='love'>[t_He] [t_is] currently in heat.</span>"
 
 	//CIT CHANGES START HERE - adds genital details to examine text

hyperstation/code/datums/traits/neutral.dm

@@ -17,6 +17,7 @@
 	lose_text = "<span class='notice'>You feel the weight of the curse in your blood finally gone.</span>"
 	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."
@@ -24,11 +25,11 @@
 	mob_trait = TRAIT_HEAT_DETECT
 	gain_text = "<span class='notice'>You feel your senses adjust, allowing a animalistic sense of others' fertility.</span>"
 	lose_text = "<span class='notice'>You feel your sense of others' fertility fade.</span>"
-
+*/
 
 /datum/quirk/inheat
 	name = "In Heat"
-	desc = "Your system burns with the desire to be bred, your body will betray you and alert other people who can detect it. This requires a womb that can be impregnated."
+	desc = "Your system burns with the desire to be bred, your body will betray you and alert other when examining you. This requires a womb that can be impregnated."
 	value = 0
 	mob_trait = TRAIT_HEAT
 	gain_text = "<span class='notice'>You body burns with the desire to be bred.</span>"