From afaf15bc594bd20d432ea47ffcdc59e6ea8205cf Mon Sep 17 00:00:00 2001 From: Sishen Date: Tue, 14 May 2019 10:29:04 -0400 Subject: [PATCH 1/3] Booty Calls! Added butt slaps --- code/modules/mob/living/carbon/human/species.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e2e9e5149f..487d242ac3 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1451,7 +1451,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) target.forcesay(GLOB.hit_appends) /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) - // CITADEL EDIT slap mouthy gits + // CITADEL EDIT slap mouthy gits and booty var/aim_for_mouth = user.zone_selected == "mouth" var/target_on_help_and_unarmed = target.a_intent == INTENT_HELP && !target.get_active_held_item() var/target_aiming_for_mouth = target.zone_selected == "mouth" @@ -1463,6 +1463,15 @@ GLOBAL_LIST_EMPTY(roundstart_races) "You hear a slap.") stop_wagging_tail(target) return FALSE + var/aim_for_groin = user.zone_selected == "groin" + var/target_aiming_for_groin = target.zone_selected == "groin" + if(aim_for_groin && ( target_on_help_and_unarmed || target_restrained || target_aiming_for_groin)) + playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1) + user.visible_message("[user] slaps [target]'s ass!", + "You slap [target]'s ass! ",\ + "You hear a slap.") + stop_wagging_tail(target) + return FALSE else if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) to_chat(user, "You're too exhausted.") return FALSE From ac04e23e31639b186a778277d6bae60f5e664732 Mon Sep 17 00:00:00 2001 From: Sishen Date: Thu, 16 May 2019 10:17:16 -0400 Subject: [PATCH 2/3] Nympho Traiting & Arousal! Butt slaps 2.0 Added nympho to defined traits, added arousal damage to ass slapping (arousal system needs to be enabled), and added forced orgasms to nymphos at max arousal --- code/__DEFINES/traits.dm | 1 + code/modules/mob/living/carbon/human/species.dm | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 99f1813f3c..805e72cfcb 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -70,6 +70,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" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 487d242ac3..b7243de8f7 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1465,12 +1465,16 @@ GLOBAL_LIST_EMPTY(roundstart_races) return FALSE var/aim_for_groin = user.zone_selected == "groin" var/target_aiming_for_groin = target.zone_selected == "groin" - if(aim_for_groin && ( target_on_help_and_unarmed || target_restrained || target_aiming_for_groin)) + if(aim_for_groin && (target_on_help_and_unarmed || target_restrained || target_aiming_for_groin)) playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1) 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) return FALSE else if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) to_chat(user, "You're too exhausted.") From 267661e0782647be942663d7a382264a2f441f5d Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 17 May 2019 01:56:44 -0400 Subject: [PATCH 3/3] 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.")