Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Balances Quirk Points #2745

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Balances Quirk Points #2745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2276c08
quirk balancing
tile4 Mar 2, 2025
0230ea0
Some changes
tile4 Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 35 additions & 71 deletions code/datums/quirks/good.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
/datum/quirk/resistant
name = "Damage Resistant"
desc = "You take 5% less damage from all sources."
value = 4
value = 6
gain_text = "<span class='notice'>You feel a little tougher than before.</span>"
medical_record_text = "Patient has an unnatural endurance and resistance to injuries."
hardcore_value = -8
hardcore_value = -12

/datum/quirk/resistant/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
Expand Down Expand Up @@ -82,50 +82,11 @@
C.adjustBruteLoss(-0.8*delta_time, FALSE)
C.adjustFireLoss(-0.4*delta_time, FALSE)

/datum/quirk/fan_clown
name = "Clown Fan"
desc = "You enjoy clown antics and get a mood boost from wearing your clown pin."
value = 1
mob_trait = TRAIT_FAN_CLOWN
gain_text = "<span class='notice'>You are a big fan of clowns.</span>"
lose_text = "<span class='danger'>The clown doesn't seem so great.</span>"
medical_record_text = "Patient reports being a big fan of clowns."

/datum/quirk/fan_clown/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/accessory/fan_clown_pin/B = new(get_turf(H))
var/list/slots = list (
"backpack" = ITEM_SLOT_BACKPACK,
"hands" = ITEM_SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)

/datum/quirk/fan_mime
name = "Mime Fan"
desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."
value = 1
mob_trait = TRAIT_FAN_MIME
gain_text = "<span class='notice'>You are a big fan of the Mime.</span>"
lose_text = "<span class='danger'>The mime doesn't seem so great.</span>"
medical_record_text = "Patient reports being a big fan of mimes."

/datum/quirk/fan_mime/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/accessory/fan_mime_pin/B = new(get_turf(H))
var/list/slots = list (
"backpack" = ITEM_SLOT_BACKPACK,
"hands" = ITEM_SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)

/datum/quirk/freerunning
name = "Freerunning"
desc = "You're great at quick moves! You can climb tables more quickly and take no damage from short falls."
value = 2
value = 1
mob_trait = TRAIT_FREERUNNING
gain_text = "<span class='notice'>You feel lithe on your feet!</span>"
lose_text = "<span class='danger'>You feel clumsy again.</span>"
Expand Down Expand Up @@ -172,44 +133,47 @@
/datum/quirk/skittish
name = "Skittish"
desc = "You're easy to startle, and hide frequently. Run into a closed locker to jump into it, as long as you have access. You can walk to avoid this."
value = 2
value = 4 //People used this in the past to hide from enemies
mob_trait = TRAIT_SKITTISH
medical_record_text = "Patient demonstrates a high aversion to danger and has described hiding in containers out of fear."

/datum/quirk/spiritual
name = "Spiritual"
desc = "You hold a spiritual belief, whether in God, nature or the arcane rules of the universe. You gain comfort from the presence of holy people, and believe that your prayers are more special than others."
/datum/quirk/voracious
name = "Voracious"
desc = "Nothing gets between you and your food. You eat faster and can binge on junk food! Being fat suits you just fine."
value = 1
mob_trait = TRAIT_VORACIOUS
gain_text = "<span class='notice'>You feel HONGRY.</span>"
lose_text = "<span class='danger'>You no longer feel HONGRY.</span>"

/datum/quirk/nerd
name = "Nerd"
desc = "You take 5% less WHITE damage, but take 10% more RED damage. You spend all your free time playing niche video games and reading Korean light novels."
value = 1
mob_trait = TRAIT_SPIRITUAL
gain_text = "<span class='notice'>You have faith in a higher power.</span>"
lose_text = "<span class='danger'>You lose faith!</span>"
medical_record_text = "Patient reports a belief in a higher power."
gain_text = "<span class='notice'>You feel nervous about touching grass.</span>"
medical_record_text = "Patient displays severe socially avoidant behaviours."

/datum/quirk/spiritual/on_spawn()
/datum/quirk/nerd/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
H.equip_to_slot_or_del(new /obj/item/storage/fancy/candle_box(H), ITEM_SLOT_BACKPACK)
H.equip_to_slot_or_del(new /obj/item/storage/box/matches(H), ITEM_SLOT_BACKPACK)
H.physiology.red_mod += 0.1
H.physiology.white_mod -= 0.05

/datum/quirk/tagger
name = "Tagger"
desc = "You're an experienced artist. People will actually be impressed by your graffiti, and you can get twice as many uses out of drawing supplies."
/datum/quirk/brawler
name = "Brawler"
desc = "You take 5% less RED damage, but take 10% more WHITE damage. Instead of getting an education, you chose to train and become the best Fixer in the City."
value = 1
mob_trait = TRAIT_TAGGER
gain_text = "<span class='notice'>You know how to tag walls efficiently.</span>"
lose_text = "<span class='danger'>You forget how to tag walls properly.</span>"
medical_record_text = "Patient was recently seen for possible paint huffing incident."
gain_text = "<span class='notice'>Time to chew ass and kick bubblegum.</span>"
medical_record_text = "Patient is more physically fit than the average person."

/datum/quirk/tagger/on_spawn()
/datum/quirk/brawler/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/toy/crayon/spraycan/spraycan = new(get_turf(H))
H.put_in_hands(spraycan)
H.equip_to_slot(spraycan, ITEM_SLOT_BACKPACK)
H.regenerate_icons()
H.physiology.red_mod -= 0.05
H.physiology.white_mod += 0.1

/datum/quirk/voracious
name = "Voracious"
desc = "Nothing gets between you and your food. You eat faster and can binge on junk food! Being fat suits you just fine."
/datum/quirk/no_taste
name = "Ageusia"
desc = "You can't taste anything! Toxic food will still poison you."
value = 1
mob_trait = TRAIT_VORACIOUS
gain_text = "<span class='notice'>You feel HONGRY.</span>"
lose_text = "<span class='danger'>You no longer feel HONGRY.</span>"
mob_trait = TRAIT_AGEUSIA
gain_text = "<span class='notice'>You can't taste anything!</span>"
lose_text = "<span class='notice'>You can taste again!</span>"
medical_record_text = "Patient suffers from ageusia and is incapable of tasting food or reagents."
14 changes: 7 additions & 7 deletions code/datums/quirks/negative.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
/datum/quirk/nonviolent //Renamed pacifist trait
name = "Challenge: No Attacking"
desc = "You are unable to inflict violence against Abnormalities or people. This is a horrible idea."
value = -1
value = -2
mob_trait = TRAIT_PACIFISM
gain_text = "<span class='danger'>You feel repulsed by the thought of violence!</span>"
lose_text = "<span class='notice'>You think you can defend yourself again, thank god.</span>"
Expand Down Expand Up @@ -283,12 +283,12 @@
/datum/quirk/deafness
name = "Deaf"
desc = "You are incurably deaf."
value = -2
value = -3 //Can't hear melts occur so it is kinda important
mob_trait = TRAIT_DEAF
gain_text = "<span class='danger'>You can't hear anything.</span>"
lose_text = "<span class='notice'>You're able to hear again!</span>"
medical_record_text = "Patient's cochlear nerve is incurably damaged."
hardcore_value = 4
hardcore_value = 6


/datum/quirk/heavy_sleeper
Expand Down Expand Up @@ -406,12 +406,12 @@
/datum/quirk/insanity
name = "Reality Dissociation Syndrome"
desc = "You suffer from a severe disorder that causes very vivid hallucinations. Mindbreaker toxin can suppress its effects, and you are immune to mindbreaker's hallucinogenic properties. <b>This is not a license to grief.</b>"
value = -4
value = -2
//no mob trait because it's handled uniquely
gain_text = "<span class='userdanger'>...</span>"
lose_text = "<span class='notice'>You feel in tune with the world again.</span>"
medical_record_text = "Patient suffers from acute Reality Dissociation Syndrome and experiences vivid hallucinations."
hardcore_value = 6
hardcore_value = 4

/datum/quirk/insanity/on_process(delta_time)
if(quirk_holder.reagents.has_reagent(/datum/reagent/toxin/mindbreaker, needs_metabolizing = TRUE))
Expand Down Expand Up @@ -507,10 +507,10 @@
/datum/quirk/junkie
name = "Junkie"
desc = "You can't get enough of hard drugs."
value = -1
value = -2 //These drugs aren't easy to get in LC13
gain_text = "<span class='danger'>You suddenly feel the craving for drugs.</span>"
medical_record_text = "Patient has a history of hard drugs."
hardcore_value = 4
hardcore_value = 5
var/drug_list = list(/datum/reagent/drug/crank, /datum/reagent/drug/krokodil, /datum/reagent/medicine/morphine, /datum/reagent/drug/happiness, /datum/reagent/drug/methamphetamine) //List of possible IDs
var/datum/reagent/reagent_type //!If this is defined, reagent_id will be unused and the defined reagent type will be instead.
var/datum/reagent/reagent_instance //! actual instanced version of the reagent
Expand Down
79 changes: 70 additions & 9 deletions code/datums/quirks/neutral.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,6 @@
lose_text = "<span class='danger'>You feel like libraries are boring.</span>"
medical_record_text = "Patient doesn't seem to say much."

/datum/quirk/no_taste
name = "Ageusia"
desc = "You can't taste anything! Toxic food will still poison you."
value = 0
mob_trait = TRAIT_AGEUSIA
gain_text = "<span class='notice'>You can't taste anything!</span>"
lose_text = "<span class='notice'>You can taste again!</span>"
medical_record_text = "Patient suffers from ageusia and is incapable of tasting food or reagents."

/datum/quirk/foreigner
name = "Foreigner"
desc = "You're not from around here. You don't know Galactic Common!"
Expand Down Expand Up @@ -518,3 +509,73 @@
return
var/mob/living/carbon/human/H = quirk_holder
H.remove_language(/datum/language/bong, TRUE, TRUE, LANGUAGE_MIND)

/datum/quirk/fan_clown //These two dont really impact much in LC13
name = "Clown Fan"
desc = "You enjoy clown antics and get a mood boost from wearing your clown pin."
value = 0
mob_trait = TRAIT_FAN_CLOWN
gain_text = "<span class='notice'>You are a big fan of clowns.</span>"
lose_text = "<span class='danger'>The clown doesn't seem so great.</span>"
medical_record_text = "Patient reports being a big fan of clowns."

/datum/quirk/fan_clown/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/accessory/fan_clown_pin/B = new(get_turf(H))
var/list/slots = list (
"backpack" = ITEM_SLOT_BACKPACK,
"hands" = ITEM_SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)

/datum/quirk/fan_mime
name = "Mime Fan"
desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."
value = 0
mob_trait = TRAIT_FAN_MIME
gain_text = "<span class='notice'>You are a big fan of the Mime.</span>"
lose_text = "<span class='danger'>The mime doesn't seem so great.</span>"
medical_record_text = "Patient reports being a big fan of mimes."

/datum/quirk/fan_mime/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/accessory/fan_mime_pin/B = new(get_turf(H))
var/list/slots = list (
"backpack" = ITEM_SLOT_BACKPACK,
"hands" = ITEM_SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)

/datum/quirk/spiritual
name = "Spiritual"
desc = "You hold a spiritual belief, whether in God, nature or the arcane rules of the universe. You gain comfort from the presence of holy people, and believe that your prayers are more special than others."
value = 0
mob_trait = TRAIT_SPIRITUAL
gain_text = "<span class='notice'>You have faith in a higher power.</span>"
lose_text = "<span class='danger'>You lose faith!</span>"
medical_record_text = "Patient reports a belief in a higher power."

/datum/quirk/spiritual/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
H.equip_to_slot_or_del(new /obj/item/storage/fancy/candle_box(H), ITEM_SLOT_BACKPACK)
H.equip_to_slot_or_del(new /obj/item/storage/box/matches(H), ITEM_SLOT_BACKPACK)

/datum/quirk/tagger
name = "Tagger"
desc = "You're an experienced artist. People will actually be impressed by your graffiti, and you can get twice as many uses out of drawing supplies."
value = 0
mob_trait = TRAIT_TAGGER
gain_text = "<span class='notice'>You know how to tag walls efficiently.</span>"
lose_text = "<span class='danger'>You forget how to tag walls properly.</span>"
medical_record_text = "Patient was recently seen for possible paint huffing incident."

/datum/quirk/tagger/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/toy/crayon/spraycan/spraycan = new(get_turf(H))
H.put_in_hands(spraycan)
H.equip_to_slot(spraycan, ITEM_SLOT_BACKPACK)
H.regenerate_icons()
Loading