i am therefore i must coom (new quirk) #804
Conversation
adds the hair trigger quirk
replaced sleep with spawn, mb oopsie hehe
| @@ -202,6 +202,7 @@ | |||
| #define TRAIT_NEVERBONER "never_aroused" | |||
| #define TRAIT_NYMPHO "nymphomaniac" | |||
| #define TRAIT_MASO "masochism" | |||
| #define TRAIT_HAIR_TRIGGER "hair_trigger" | |||
There was a problem hiding this comment.
This should be in our modular traits defines file
| @@ -34,6 +34,7 @@ | |||
| var/lastlusttime = 0 | |||
| var/lust = 0 | |||
| var/multiorgasms = 1 | |||
| var/hair_trigger_mul = 1 | |||
There was a problem hiding this comment.
Rather than adding a variable to the mob you should probably just check if the mob has the trait when the add_lust proc is called and multiply the added lust if so
| if((cur + add) < 0) //in case we retract lust, doesn't have to account for hair trigger, since we aren't multiplying with a negative | ||
| lust = 0 | ||
| else | ||
| lust = cur + add | ||
| lust = cur + add * hair_trigger_mul | ||
|
|
There was a problem hiding this comment.
This can be made into a modular edit by just modifying the add variable by the multiplier before it calls . = ..()
| @@ -820,3 +820,55 @@ | |||
| var/obj/item/clothing/mask/gas/cosmetic/gasmask = new(get_turf(quirk_holder)) // Uses a custom gas mask | |||
| H.equip_to_slot(gasmask, ITEM_SLOT_MASK) | |||
| H.regenerate_icons() | |||
|
|
|||
| /datum/quirk/prem | |||
There was a problem hiding this comment.
you'll wanna change the class name to something more descriptive like hair_trigger
| /datum/quirk/prem/proc/quirk_examine_prem(atom/examine_target, mob/living/carbon/human/examiner, list/examine_list) | ||
| SIGNAL_HANDLER | ||
|
|
||
| var/mob/living/carbon/human/H = examine_target | ||
| if(!istype(examiner) || H.get_lust() < 10) // if the target is horny, people WILL notice it | ||
| return | ||
| examine_list += span_lewd("[H.p_they(TRUE)] [H.p_are()] fidgeting with arousal.") | ||
|
|
||
| /datum/quirk/prem/proc/hear_teasing(datum/source, list/hearing_args) | ||
| SIGNAL_HANDLER | ||
|
|
||
| var/mob/living/carbon/human/H = quirk_holder | ||
| var/static/regex/sexywords = regex("sex|fuck|hump|dick|cock|penis|pussy|clit|cum|jizz|orgasm|spurt") | ||
| var/list/nnngh = list( | ||
| "Hearing that really got you going...", | ||
| "Calm down... it's just words...", | ||
| "That sounds exciting...", | ||
| "It's hard to keep your composure with that kinda talk!", | ||
| ) | ||
| if (H == hearing_args[HEARING_SPEAKER]) | ||
| return | ||
| if (findtext(lowertext(hearing_args[HEARING_RAW_MESSAGE]), sexywords) && sexword_delay < world.time) | ||
| H.handle_post_sex(5, null, null) | ||
| sexword_delay = world.time + 10 SECONDS | ||
| spawn(2) // this is just for aesthetics so the notification is placed after the message in chatbox, if it causes issues feel free to remove :dawgdoin: | ||
| to_chat(H, span_lewd(pick(nnngh))) |
There was a problem hiding this comment.
In my opinion, in order to make the quirk actually a trigger with words rather than just kinda adding extra lust all the time, you should make it so that the multiplier also only takes effect for a certain time after hearing the triggering word
There was a problem hiding this comment.
nah, I personally wanted it to be a "really sensitive to arousal" thing sorta like nympho was with the extra function of being turned on by getting teased
putting the whole sensitivity behind a "trigger word activator" defeats the purpose, for me at least
There was a problem hiding this comment.
hair trigger is just sorta phrasing for cumming really easily, having trigger words is more like a secondary function that coincides with the name of the quirk
About The Pull Request
Creates the neutral "Hair Trigger" quirk, which quintuplifies the amount of arousal you receive and also makes it so that if people talk about lewd stuff around you it will make you excited. (yes, you can cum just from people teasing you)
I tried my best to modularize, but if I missed stuff, please do it
Why It's Good For The Game
Because there is a severe lack of instantaneous orgasms :dawgdoin:
A Port?
no
Pre-Merge Checklist
Changelog
馃啈
add: Hair Trigger quirk
/:cl: