Pre blood commit

This commit is contained in:
Fermi
2019-05-22 18:13:12 +01:00
parent fc3482ec90
commit 41d991e81c
4 changed files with 17 additions and 5 deletions
+1
View File
@@ -72,6 +72,7 @@
#define TRAIT_PHOTOGRAPHER "photographer"
#define TRAIT_MUSICIAN "musician"
#define TRAIT_CROCRIN_IMMUNE "crocin_immune"
#define TRAIT_NYMPHO "nymphomania"
// common trait sources
#define TRAIT_GENERIC "generic"
+1 -1
View File
@@ -575,7 +575,7 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/carbon/human/H = V
if(H.canbearoused && H.has_dna()) // probably a redundant check but for good measure
if(H.canbearoused && H.has_dna() && H.has_trait(TRAIT_NYMPHO)) // probably a redundant check but for good measure
H.mob_climax(forced_climax=TRUE)
//DAB