Skip to content

Commit

Permalink
Minor quirk fixes
Browse files Browse the repository at this point in the history
- Fixes some path typos
- Adds proper QMOOD defines
- Adds more dynamic pronouns
- Updates bad touch attacker negative mood text to account for Buns of Steel
  • Loading branch information
LeDrascol committed Nov 7, 2024
1 parent e43735c commit 90b042b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
3 changes: 3 additions & 0 deletions code/__DEFINES/~~~splurt_defines/traits/defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#define QMOOD_WELL_TRAINED "mood_dom_trained"
#define QMOOD_DUMB_CUM "mood_dumb4cum"
#define QMOOD_HEADPAT_SLUT "mood_headpat_slut"
#define QMOOD_JIGGLY_ASS "mood_jiggly_ass"
#define QMOOD_BADTOUCH_ATTACKER "mood_badtouch_attacker"
#define QMOOD_BADTOUCH_VICTIM "mood_badtouch_victim"

// Trait types
#define DUMB_CUM_TRAIT "dumb4cum"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
icon = FA_ICON_HAND_HOLDING_HEART
erp_quirk = TRUE

/datum/quirk/bad_touch/post_add()
/datum/quirk/headpat_slut/post_add()
// Add examine text status effect
quirk_holder.apply_status_effect(/datum/status_effect/quirk_headpat_slut)

/datum/quirk/bad_touch/remove()
/datum/quirk/headpat_slut/remove()
// Remove examine text status effect
quirk_holder.remove_status_effect(/datum/status_effect/quirk_headpat_slut)

Expand Down
22 changes: 11 additions & 11 deletions modular_zzplurt/code/modules/mob/living/carbon/carbon_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@
"You hear a loud clang!",
ignored_mobs = list(target)
)
to_chat(target, span_danger("[src] tries to slap your ass, but their hand bounces off it!"))
to_chat(target, span_danger("[src] tries to slap your ass, but [src.p_their()] hand bounces off it!"))

// End here
return

// Check for slap request
if(HAS_TRAIT(target, TRAIT_JIGGLY_ASS))
// Get target quirk
var/datum/quirk/jiggly_ass/trait = target.get_quirk(/datum/quirk/jiggly_ass)
var/datum/quirk/jiggly_ass/quirk_jiggle = target.get_quirk(/datum/quirk/jiggly_ass)

// Check for cooldown
if(!COOLDOWN_FINISHED(trait, wiggle_cooldown))
if(!COOLDOWN_FINISHED(quirk_jiggle, wiggle_cooldown))
// Display message
target.visible_message(span_warning("[target]'s big butt is still [ASS_JIGGLE_VERBS_1] about way too much to get a good smack!!"), \
span_boldwarning("[src] tries to smack your jiggly ass, but can't get a lock on it!"))
Expand All @@ -53,11 +53,11 @@

// Cooldown is not active
// Start the cooldown
COOLDOWN_START(trait, wiggle_cooldown, ASS_JIGGLE_COOLDOWN)
COOLDOWN_START(quirk_jiggle, wiggle_cooldown, ASS_JIGGLE_COOLDOWN)

// Add mood bonuses
add_mood_event(TRAIT_JIGGLY_ASS, /datum/mood_event/butt_slap)
target.add_mood_event(TRAIT_JIGGLY_ASS, /datum/mood_event/butt_slapped)
add_mood_event(QMOOD_JIGGLY_ASS, /datum/mood_event/butt_slap)
target.add_mood_event(QMOOD_JIGGLY_ASS, /datum/mood_event/butt_slapped)

// Reduce target stamina (???)
target.adjustStaminaLoss(ASS_JIGGLE_STAMLOSS)
Expand Down Expand Up @@ -135,15 +135,15 @@
toucher.try_lewd_autoemote("moan")

// Add good mood event
toucher.add_mood_event("badtouch_retaliate_victim", /datum/mood_event/badtouch_retaliate/victim_good)
toucher.add_mood_event(QMOOD_BADTOUCH_VICTIM, /datum/mood_event/badtouch_retaliate/victim_good)

// They don't enjoy this
else
// Cause toucher to scream
toucher.emote("scream")

// Add bad mood event
toucher.add_mood_event("badtouch_retaliate_victim", /datum/mood_event/badtouch_retaliate/victim_bad)
toucher.add_mood_event(QMOOD_BADTOUCH_VICTIM, /datum/mood_event/badtouch_retaliate/victim_bad)

// Damage amount to apply
var/retaliate_damage = BADTOUCH_RETALIATE_DAMAGE
Expand All @@ -154,12 +154,12 @@
retaliate_damage *= BADTOUCH_RETALIATE_SADISM_MULT

// Add good mood event
src.add_mood_event("badtouch_retaliate_attacker", /datum/mood_event/badtouch_retaliate/attacker_good)
src.add_mood_event(QMOOD_BADTOUCH_ATTACKER, /datum/mood_event/badtouch_retaliate/attacker_good)

// Target is not a sadist
else
// Add bad mood event
src.add_mood_event("badtouch_retaliate_attacker", /datum/mood_event/badtouch_retaliate/attacker_good)
src.add_mood_event(QMOOD_BADTOUCH_ATTACKER, /datum/mood_event/badtouch_retaliate/attacker_bad)

// Determine toucher's hand
var/which_hand = BODY_ZONE_PRECISE_L_HAND
Expand Down Expand Up @@ -205,7 +205,7 @@

// Bad Touch retaliate mood events
/datum/mood_event/badtouch_retaliate/attacker_bad
description = span_danger("I need to watch my temper.")
description = span_danger("Someone got hurt because of me.")
mood_change = -2
timeout = 2 MINUTES

Expand Down

0 comments on commit 90b042b

Please sign in to comment.