From 267661e0782647be942663d7a382264a2f441f5d Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 17 May 2019 01:56:44 -0400 Subject: [PATCH] Tail Wagging Makes it so nymphos will continue wagging their tails when booty or face slapped --- code/modules/mob/living/carbon/human/species.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index b7243de8f7..599e7380a5 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1461,7 +1461,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) user.visible_message("[user] slaps [target] in the face!", "You slap [target] in the face! ",\ "You hear a slap.") - stop_wagging_tail(target) + if (!target.has_trait(TRAIT_NYMPHO)) + stop_wagging_tail(target) return FALSE var/aim_for_groin = user.zone_selected == "groin" var/target_aiming_for_groin = target.zone_selected == "groin" @@ -1470,11 +1471,12 @@ GLOBAL_LIST_EMPTY(roundstart_races) user.visible_message("[user] slaps [target]'s ass!", "You slap [target]'s ass! ",\ "You hear a slap.") - stop_wagging_tail(target) if (target.canbearoused) target.adjustArousalLoss(5) if (target.getArousalLoss() >= 100 && ishuman(target) && target.has_trait(TRAIT_NYMPHO) && target.has_dna()) target.mob_climax(forced_climax=TRUE) + if (!target.has_trait(TRAIT_NYMPHO)) + stop_wagging_tail(target) return FALSE else if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) to_chat(user, "You're too exhausted.")