Skip to content

Commit

Permalink
Quirk data overhauls
Browse files Browse the repository at this point in the history
Reorganizes the data for all modular quirks.
- Adds missing traits
- Adds missing flavor text
- Adds mail items
- Adds hardcore values
- Adds comments tagging non-functional quirks
- Reorders variables for consistency
- Changes some minor grammar and spelling
- Restores disabled quirks
- Removes potentially erroneous cold immunity from Vacuum Resistance
  • Loading branch information
LeDrascol committed Oct 28, 2024
1 parent 4ccb251 commit a24f0d9
Show file tree
Hide file tree
Showing 36 changed files with 216 additions and 93 deletions.
6 changes: 6 additions & 0 deletions code/__DEFINES/~~~splurt_defines/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@
#define TRAIT_MESSY "messy"
#define TRAIT_RESTORATIVE_METABOLISM "restorative_metabolism"
#define TRAIT_KISS_SLUT "kiss_slut"
#define TRAIT_FLIMSY "flimsy"
#define TRAIT_GARGOYLE "gargoyle"
#define TRAIT_MASKED_MOOK "masked_mook"
#define TRAIT_TOUGH "tough"
#define TRAIT_ARACHNID "arachnid"
#define TRAIT_ASHRESISTANCE "ash_resistance"
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
name = "Dumb For Cum"
desc = "For one reason or another, you're totally obsessed with seminal fluids. The heat of it, the smell... the taste... It's quite simply euphoric."
value = -1
mob_trait = TRAIT_DUMB_CUM
quirk_flags = /datum/quirk::quirk_flags | QUIRK_MOODLET_BASED
gain_text = span_notice("You feel an insatiable craving for seminal fluids.")
lose_text = span_notice("Cum didn't even taste that good, anyways.")
medical_record_text = "Patient seems to have an unhealthy psychological obsession with seminal fluids."
quirk_flags = /datum/quirk::quirk_flags | QUIRK_MOODLET_BASED
mob_trait = TRAIT_DUMB_CUM
icon = FA_ICON_DROPLET
mail_goodies = list (
/datum/glass_style/drinking_glass/cum = 1
)
var/timer
var/timer_trigger = 15 MINUTES

Expand Down
4 changes: 3 additions & 1 deletion modular_zzplurt/code/datums/quirks/negative_quirks/flimsy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
name = "Flimsy"
desc = "Your body is a little more fragile then most, decreasing total health by 20%."
value = -2
medical_record_text = "Patient has abnormally low capacity for injury."
gain_text = span_notice("You feel like you could break with a single hit.")
lose_text = span_notice("You feel more durable.")
medical_record_text = "Patient has abnormally low capacity for injury."
mob_trait = TRAIT_FLIMSY
hardcore_value = 1
icon = FA_ICON_USER_INJURED

/datum/quirk/flimsy/add(client/client_source)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
/datum/quirk/body_morpher
name = "Body Morpher"
desc = "Somehow you developed an ability allowing your body to morph and shift itself to modify bodyparts, much like a slimeperson can."
desc = "You've developed an ability allowing your body to morph and shift itself to modify body parts, much like a slimeperson can."
value = 0
mob_trait = TRAIT_BODY_MORPHER
gain_text = span_notice("Your body feels more malleable...")
lose_text = span_notice("Your body is more firm.")
gain_text = span_notice("Your body feels more malleable.")
lose_text = span_notice("Your body returns to a normal consistency.")
medical_record_text = "Patient's body seems unusually malleable."
mob_trait = TRAIT_BODY_MORPHER
icon = FA_ICON_PEOPLE_ARROWS
mail_goodies = list (
/obj/item/toy/foamblade = 1 // Fake changeling
)
var/datum/action/innate/alter_form/alter_form_action

/datum/quirk/body_morpher/add(client/client_source)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/datum/quirk/buns_of_steel
name = "Buns of Steel"
desc = "You've never skipped ass day. You are completely immune to all forms of ass slapping and anyone who tries to slap your rock hard ass usually gets a broken hand."
desc = "You've never skipped ass day. You are completely immune to all forms of ass slapping, and anyone who tries to slap your rock-hard ass usually gets a broken hand!"
value = 0
mob_trait = TRAIT_STEEL_ASS
gain_text = span_notice("Your ass rivals those of golems.")
lose_text = span_notice("Your butt feels more squishy and slappable.")
medical_record_text = "Patient's posterior displays incredible resilience."
mob_trait = TRAIT_STEEL_ASS
icon = FA_ICON_HAND
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
name = "Choke Slut"
desc = "You are aroused by suffocation."
value = 0
mob_trait = TRAIT_CHOKE_SLUT //Not implemented yet due to the lack of the arousal system
gain_text = span_notice("You feel like you want to feel fingers around your neck, choking you until you pass out or make a mess... Maybe both.")
lose_text = span_notice("Seems you don't have a kink for suffocation anymore.")
medical_record_text = "Patient exhibits an abnormal obsession with restricted breathing."
mob_trait = TRAIT_CHOKE_SLUT // Not implemented yet due to the lack of the arousal system
icon = FA_ICON_LUNGS
mail_goodies = list (
/obj/item/reagent_containers/hypospray/medipen = 1 // Fix your oxy loss
)
19 changes: 14 additions & 5 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/cosglow.dm
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
//You are a CIA agent.
// You might be an undercover agent.
/datum/quirk/cosglow
name = "Cosmetic Glow"
desc = "You glow! Be it an obscure radiation emission, or simple Bioluminescent properties.."
desc = "You glow! Be it an obscure radiation emission, governmental affiliation, or simple bioluminescent properties."
value = 0
mob_trait = TRAIT_COSGLOW
gain_text = span_notice("You feel empowered by a three-letter agency!")
lose_text = span_notice("You realize that working for the space CIA sucks!")
lose_text = span_notice("You realize that working for the space agency sucks!")
medical_record_text = "Patient emits a subtle emissive aura."
mob_trait = TRAIT_COSGLOW
icon = FA_ICON_PERSON_RAYS

mail_goodies = list (
/obj/item/flashlight/glowstick = 1,
/obj/item/flashlight/glowstick/red = 1,
/obj/item/flashlight/glowstick/blue = 1,
/obj/item/flashlight/glowstick/cyan = 1,
/obj/item/flashlight/glowstick/orange = 1,
/obj/item/flashlight/glowstick/yellow = 1,
/obj/item/flashlight/glowstick/pink = 1
)
/datum/quirk/cosglow/add()
// Define quirk holder mob
var/mob/living/carbon/human/quirk_mob = quirk_holder
Expand Down
5 changes: 3 additions & 2 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/cum_plus.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* needs genital fluids and also to affect more than just your balls
// UNIMPLEMENTED QUIRK!
/datum/quirk/cum_plus
name = "Extra-Productive Genitals"
desc = "Your genitals produce and hold more than normal."
Expand All @@ -7,8 +7,9 @@
lose_text = span_notice("You feel a weight lifted from your groin.")
medical_record_text = "Patient exhibits increased production of sexual fluids."
icon = FA_ICON_DROPLET
var/increasedcum
//var/increasedcum // Currently unused

/* needs genital fluids and also to affect more than just your balls
/datum/quirk/cum_plus/add()
var/mob/living/carbon/M = quirk_holder
if(M.getorganslot("testicles"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// UNIMPLEMENTED QUIRK!
/datum/quirk/cum_sniff
name = "Ball Sniffer" //lol
desc = "You've built so much experience savoring other people's genitals through your life that you can easily tell what liquids they're full of, besides reagents in their blood that is."
name = "Genital Sniffer"
desc = "You've had so much experience with other people's genitals that you can easily tell what reagents they produce."
value = 0
mob_trait = TRAIT_GFLUID_DETECT //TODO: add the ball sniffing system
mob_trait = TRAIT_GFLUID_DETECT // TODO: Add the reagent detection system
gain_text = span_notice("You begin sensing peculiar smells from people's bits...")
lose_text = span_notice("People's genitals start smelling all the same to you...")
medical_record_text = "Patient attempted to get their doctor to drag his balls accross their face."
medical_record_text = "Patient has exemplary olfactory capability for specific body regions."
icon = FA_ICON_SOCCER_BALL
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@
name = "Cursed Blood"
desc = "Your lineage is cursed with the paleblood curse. Best to stay away from holy water... Hell water, on the other hand..."
value = 0
mob_trait = TRAIT_CURSED_BLOOD
gain_text = span_notice("A curse from a land where men return as beasts runs deep in your blood.")
lose_text = span_notice("You feel the weight of the curse in your blood finally gone.")
medical_record_text = "Patient suffers from an unknown type of aversion to holy reagents. Keep them away from a chaplain."
medical_record_text = "Patient suffers from an unknown type of aversion to holy reagents. Keep them away from chaplains."
mob_trait = TRAIT_CURSED_BLOOD
hardcore_value = 1
icon = FA_ICON_FIRE_FLAME_CURVED
mail_goodies = list (
// This may be the only way to get hell water.
/obj/item/reagent_containers/cup/glass/bottle/holywater/hell = 1
)
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
/* Commented until we have the genital fluid options
// UNIMPLEMENTED QUIRK!
/datum/quirk/fluid_infuser
name = "Fluid Infuser"
desc = "You just couldn't wait to get one of NanoTrasen's new fluid inducers when they first came out, so now you can hop in the station with editable titty milk!"
desc = "You just couldn't wait to get one of NanoTrasen's new fluid inducers when they first came out, so now you can hop in the station with editable bodily fluids!"
value = 0
gain_text = "Your Fluid Infuser implant has been activated."
lose_text = "Your Fluid Infuser implant encounters a critical error."
medical_record_text = "Patient has been implanted with a Fluid Infuser implant."
// No mob trait
icon = FA_ICON_BOTTLE_DROPLET

/* Commented until we have the genital fluid options
/datum/quirk/fluid_infuser/on_spawn()
. = ..()
var/obj/item/implant/genital_fluid/put_in = new
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
/datum/quirk/gargoyle //Mmmm yes stone time
/datum/quirk/gargoyle
name = "Gargoyle"
desc = "You are some form of gargoyle! You can only leave your stone form for so long, and will have to return to it to regain energy. On the bright side, you heal in statue form!"
value = 0
quirk_flags = /datum/quirk::quirk_flags | QUIRK_PROCESSES
gain_text = "You feel a strange longing to perch atop buildings."
lose_text = "The stone curse leaves your body."
medical_record_text = "Patient has a tenancy to solidify into stone."
mob_trait = TRAIT_GARGOYLE
icon = FA_ICON_MONUMENT
mail_goodies = list (
/obj/item/chisel = 1 // Build yourself a friend
)
var/energy = 0
var/transformed = 0
var/cooldown = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
name = "Hypnotic Gaze"
desc = "Be it through mysterious patterns, flickering colors, or some genetic oddity, prolonged eye contact with you will place the viewer into a highly-suggestible hypnotic trance."
value = 0
mob_trait = TRAIT_HYPNOTIC_GAZE
gain_text = span_notice("Your eyes glimmer hypnotically...")
lose_text = span_notice("Your eyes return to normal.")
medical_record_text = "Prolonged exposure to Patient's eyes exhibits soporific effects."
medical_record_text = "Patient's eyes exhibits soporific effects. Additional testing may be necessary."
mob_trait = TRAIT_HYPNOTIC_GAZE
icon = FA_ICON_ARROWS_TO_EYE

/datum/quirk/Hypnotic_gaze/add()
Expand Down
10 changes: 8 additions & 2 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/incubus.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
/datum/quirk/incubus
name = "Incubus"
desc = "Your seductor-like metabolism can only be sated by milk. (And semen, if you're a Succubus as well.)"
desc = "Your seductress-like metabolism can only be sated by milk."
value = 0
mob_trait = TRAIT_INCUBUS
quirk_flags = /datum/quirk::quirk_flags | QUIRK_PROCESSES
gain_text = "You feel a craving for dairy products."
lose_text = "Your dairy craving fades back away."
medical_record_text = "Patient claims to subsist entirely on milk based products."
mob_trait = TRAIT_INCUBUS
icon = FA_ICON_COW
mail_goodies = list (
/obj/item/reagent_containers/condiment/milk = 1
)

/datum/quirk/incubus/add(client/client_source)
. = ..()
Expand Down
10 changes: 7 additions & 3 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/jiggly_ass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
name = "Buns of Thunder"
desc = "That pants-stretching, seat-creaking, undie-devouring butt of yours is as satisfying as it is difficult to keep balanced when smacked!"
value = 0
mob_trait = TRAIT_JIGGLY_ASS
gain_text = span_notice("Your butt feels extremely smackable.")
lose_text = span_notice("Your butt feels normally smackable again.")
COOLDOWN_DECLARE(wiggle_cooldown)
lose_text = span_notice("Your butt no longer feels like it needs smacking.")
medical_record_text = "Patient is endowed with a superior posterior."
mob_trait = TRAIT_JIGGLY_ASS
icon = FA_ICON_CAKE
mail_goodies = list (
/obj/item/food/cake = 1 // You know why
)
COOLDOWN_DECLARE(wiggle_cooldown)

/datum/quirk/jiggly_ass/add()
// Add examine text
Expand Down
12 changes: 8 additions & 4 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/kiss_slut.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/datum/quirk/kiss_slut
name = "Kiss Slut"
desc = "The sheer thought of kissing someone makes you blush and overheat, effectively increasing your arousal with each smooch."
desc = "The sheer thought of kissing someone makes you blush and overheat, sending you into a spiral of passion."
value = 0
mob_trait = TRAIT_KISS_SLUT //No use for this yet
gain_text = span_purple("You feel like kissing someone...")
lose_text = span_notice("You don't feel like kissing someone anymore...")
gain_text = span_purple("Thoughts of smooching invade your mind.")
lose_text = span_notice("You feel like your lips have had enough for now.")
medical_record_text = "Patient seems to demonstrate an extraordinary liking in kissing."
mob_trait = TRAIT_KISS_SLUT //No use for this yet
icon = FA_ICON_FACE_KISS_WINK_HEART
mail_goodies = list (
/obj/item/lipstick/random = 20,
/obj/item/lipstick/hypnosyndie = 1 // Very small chance of ERP lipstick
)
14 changes: 10 additions & 4 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/masked_mook.dm
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
/datum/quirk/masked_mook
name = "Bane Syndrome"
desc = "For some reason you don't feel... right without wearing some kind of gas mask."
gain_text = span_danger("You start feeling unwell without any gas mask on.")
lose_text = span_notice("You no longer have a need to wear some gas mask.")
value = 0
medical_record_text = "Patient feels more secure when wearing a gas mask."
quirk_flags = /datum/quirk::quirk_flags | QUIRK_MOODLET_BASED | QUIRK_PROCESSES
gain_text = span_danger("You start feeling unwell without a gas mask on.")
lose_text = span_notice("You no longer feel the need to wear a gas mask.")
medical_record_text = "Patient feels a strong psychological attachment to gas masks."
mob_trait = TRAIT_MASKED_MOOK
hardcore_value = 1
icon = FA_ICON_MASK_VENTILATOR
mail_goodies = list (
/obj/item/gas_filter = 1
)

// TODO: Change this to not require processing.
/datum/quirk/masked_mook/process(seconds_per_tick)
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/mask/gas/gasmask = H.get_item_by_slot(ITEM_SLOT_MASK)
Expand All @@ -21,7 +27,7 @@

var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/mask/gas/cosmetic/gasmask = new(get_turf(quirk_holder)) // Uses a custom gas mask
H.equip_to_slot_if_possible(gasmask, ITEM_SLOT_MASK) // If character have a loadout mask, the custom one will not overwrite it but instead will be dropped on floor
H.equip_to_slot_if_possible(gasmask, ITEM_SLOT_MASK) // If character has a loadout mask, the custom one will not overwrite it but instead will be dropped on floor
H.regenerate_icons()

/datum/mood_event/masked_mook
Expand Down
11 changes: 7 additions & 4 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
/datum/quirk/messy
name = "Messy"
desc = "Due to your unique biology/construction/bluespace magic you always manage to make a mess when you cum, even if it's not possible in normal circumstances."
desc = "You always manage to make a mess when you cum, even if it's not possible in normal circumstances. This could be due to unique biology, special construction, or bluespace magic."
value = 0
gain_text = span_purple("You feel prepared to cover something in layer of bodily fluids.")
lose_text = span_notice("You don't feel the need to make a mess anymore.")
medical_record_text = "Patient's body has above-average fluid production capability."
mob_trait = TRAIT_MESSY
gain_text = span_purple("You feel like covering something in layer of your fluids.")
lose_text = span_notice("You don't feel 'messy' anymore.")
medical_record_text = "Had to be sedated after covering entire hospital wing with cum."
icon = FA_ICON_DROPLET
mail_goodies = list (
/obj/item/mop = 1 // Clean this mess up!
)
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/datum/quirk/modularlimbs
name = "Modular Limbs"
desc = "Your limbs are able to be attached and detached easily... Unfortunately, everyone around you can alter your limbs too!"
icon = FA_ICON_PUZZLE_PIECE
desc = "Your limbs are able to be attached and detached easily. Unfortunately, this means everyone else can alter your limbs too!"
value = 0
medical_record_text = "Patient's limbs seem to be easily detachable and reattachable."
gain_text = "Your limbs feel like they could come off with a bit of effort."
lose_text = "Your limbs feel more firmly attached."
medical_record_text = "Patient has undergone an experimental ligament hook surgery."
icon = FA_ICON_PUZZLE_PIECE

/datum/quirk/modularlimbs/add(client/client_source)
var/mob/living/carbon/human/C = quirk_holder
Expand Down
6 changes: 5 additions & 1 deletion modular_zzplurt/code/datums/quirks/neutral_quirks/nudist.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
/datum/quirk/nudist
name = "Nudist"
desc = "Wearing most types of clothing unnerves you. Bring a gear harness!"
value = 0
gain_text = span_notice("You feel spiritually connected to your natural form.")
lose_text = span_notice("It feels like clothing could fit you comfortably.")
medical_record_text = "Patient expresses a psychological need to remain unclothed."
value = 0
mob_trait = TRAIT_NUDIST
quirk_flags = /datum/quirk::quirk_flags | QUIRK_MOODLET_BASED
icon = FA_ICON_LEAF
mail_goodies = list (
// /datum/reagent/consumable/ethanol/panty_dropper = 1 // Not yet implemented
)
var/is_nude

/datum/quirk/nudist/add(client/client_source)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/datum/quirk/sodiumsensetivity
/datum/quirk/sodium_sensetivity
name = "Sodium Sensitivity"
desc = "Your body is sensitive to sodium, and is burnt upon contact. Ingestion or contact with it is not advised."
icon = FA_ICON_BIOHAZARD
value = 0
gain_text = "You remember that advice about reducing your sodium intake."
lose_text = "You remember how good salt makes things taste!"
medical_record_text = "Patient is highly allergic to to sodium, and should not come into contact with it under any circumstances."
mob_trait = TRAIT_SALT_SENSITIVE
medical_record_text = "Patient should not come into contact with sodium."
hardcore_value = 1
icon = FA_ICON_BIOHAZARD

/datum/reagent/consumable/salt/expose_mob(mob/living/M, method=TOUCH, reac_volume)
. = ..()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/datum/quirk/storage_concealment
name = "Dorsualiphobic Augmentation"
desc = "You despise the idea of being seen wearing any type of back-mounted storage apparatus! A new technology shields you from the immense shame you may experience, by hiding your equipped backpack."
value = 0
gain_text = "Your Chameleon Storage Concealment Implant has been activated."
lose_text = "Your Chameleon Storage Concealment Implant encounters a critical error."
medical_record_text = "Patient has exhibited concerns about being seen wearing a backpack."
icon = FA_ICON_BRIEFCASE

// UNUSED: Enable by setting these values to TRUE
Expand Down
10 changes: 8 additions & 2 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/succubus.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
/datum/quirk/succubus
name = "Succubus"
desc = "Your seductress-like metabolism can only be sated by semen. (And milk, if you're an Incubus as well.)"
desc = "Your seductress-like metabolism can only be sated by semen."
value = 0
mob_trait = TRAIT_SUCCUBUS
quirk_flags = /datum/quirk::quirk_flags | QUIRK_PROCESSES
gain_text = "You feel a craving for certain reproductive fluids."
lose_text = "Your bodily fluid craving fades back away."
medical_record_text = "Patient claims to subsist entirely on milk based products."
mob_trait = TRAIT_SUCCUBUS
icon = FA_ICON_DROPLET
mail_goodies = list (
/datum/glass_style/drinking_glass/cum = 1
)

/datum/quirk/succubus/add(client/client_source)
. = ..()
Expand Down
Loading

0 comments on commit a24f0d9

Please sign in to comment.