From 3588d4044c12fa245af4bfbef43d1a79abadf8a2 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 26 Dec 2020 20:57:09 +0000
Subject: [PATCH] Heat Traits
For fun and for anyone wanting to do their heat/breeding fetish. Opt-in required.
---
code/__DEFINES/traits.dm | 2 ++
.../mob/living/carbon/human/examine.dm | 6 +++++-
hyperstation/code/datums/traits/neutral.dm | 21 +++++++++++++++++--
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 69eaa46d..55538277 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -123,6 +123,8 @@
#define TRAIT_CALCIUM_HEALER "calcium_healer"
#define TRAIT_ALCOHOL_LIGHTWEIGHT "alcohol_lightweight" //Skyrat port
#define TRAIT_CURSED_BLOOD "cursed_blood" //Yo dawg I heard you like bloodborne references so I put a
+#define TRAIT_HEAT_DETECT "heat_detect"
+#define TRAIT_HEAT "heat"
#define TRAIT_RADRESONANCE "radioactive_resonance" //Hyperstation edit
#define TRAIT_SWIMMING "swimming" //only applied by /datum/element/swimming, for checking
#define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index cbda3597..d370cd36 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -126,6 +126,10 @@
if(can_be_held)
. += "[t_He] might be able to be picked up with Alt+Click!\n"
+ //Heat Detection
+ if(breedable && HAS_TRAIT(src, TRAIT_HEAT_DETECT) && HAS_TRAIT(user, TRAIT_HEAT))
+ . += "[t_He] [t_is] currently in heat."
+
//CIT CHANGES START HERE - adds genital details to examine text
if(LAZYLEN(internal_organs))
for(var/obj/item/organ/genital/dicc in internal_organs)
@@ -162,7 +166,7 @@
. += "It appears that [t_his] brain is missing..."
var/temp = getBruteLoss() //no need to calculate each of these twice
-
+
var/list/msg = list()
var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
diff --git a/hyperstation/code/datums/traits/neutral.dm b/hyperstation/code/datums/traits/neutral.dm
index dc7cbe3c..228c8049 100644
--- a/hyperstation/code/datums/traits/neutral.dm
+++ b/hyperstation/code/datums/traits/neutral.dm
@@ -1,5 +1,5 @@
//Skyrat port start
-/datum/quirk/alcohol_lightweight
+/datum/quirk/alcohol_lightweight
name = "Alcoholic Lightweight"
desc = "Alcohol really goes straight to your head, gotta be careful with what you drink."
value = 0
@@ -15,4 +15,21 @@
mob_trait = TRAIT_CURSED_BLOOD
gain_text = "A curse from a land where men return as beasts runs deep in your blood. Best to stay away from holy water... Hell water, on the other hand..."
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."
\ No newline at end of file
+ medical_record_text = "Patient suffers from an unknown type of aversion to holy reagents. Keep them away from a chaplain."
+
+/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
+ mob_trait = TRAIT_HEAT_DETECT
+ gain_text = "You feel your senses adjust, allowing a animalistic sense of other mammals fertility."
+ lose_text = "You feel your sense of other mammals 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 other people who can detect it. This requires a womb that can be impregnated."
+ value = 0
+ mob_trait = TRAIT_HEAT
+ gain_text = "You body burns with the desire to be bred."
+ lose_text = "You feel more in control of your body and thoughts."