-
Notifications
You must be signed in to change notification settings - Fork 77
Physical Flaws (Part Two) #1176
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.
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
Open
Icarus-The-Sun
wants to merge
5
commits into
DarkPack13:master
Choose a base branch
from
Icarus-The-Sun:flaws-2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
modular_darkpack/modules/merits_flaws/code/negative_quirks/disfigured.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // VTM pg. 481 | ||
| /datum/quirk/darkpack/disfigured | ||
| name = "Disfigured" | ||
| desc = {"A hideous disfigurement makes your appearance disturbing and memorable. | ||
| The difficulties of all die rolls relating to social interaction are increased by two. | ||
| You may not have an Appearance rating greater than 2."} | ||
| icon = FA_ICON_FACE_GRIMACE | ||
| value = -2 | ||
| gain_text = span_notice("Your face is disfigured!") | ||
| lose_text = span_notice("You feel like you look a lot better.") | ||
| failure_message = span_notice("You don't look too bad.") | ||
| mob_trait = TRAIT_DISFIGURED_APPEARANCE | ||
| excluded_clans = list(VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_HARBINGER)// Anyone who already gets masq violating faces or other issues like that. | ||
| var/appearance_to_subtract | ||
|
|
||
| /datum/quirk/darkpack/disfigured/add(client/client_source) | ||
| . = ..() | ||
| var/mob/living/carbon/human/human_holder = astype(quirk_holder) | ||
| if(!human_holder) | ||
| return | ||
| appearance_to_subtract = human_holder.st_get_stat(STAT_APPEARANCE)-2 | ||
| if(human_holder.st_get_stat(STAT_APPEARANCE) > 2) | ||
| human_holder.st_add_stat_mod(STAT_APPEARANCE, -appearance_to_subtract, "Disfigured") | ||
| to_chat(human_holder, span_warning("Your appearance stat has been lowered as you cannot have an appearance value greater than two.")) | ||
|
|
||
| /datum/quirk/darkpack/disfigured/remove() | ||
| . = ..() | ||
| var/mob/living/carbon/human/human_holder = astype(quirk_holder) | ||
| if(!human_holder) | ||
| return | ||
| human_holder.st_remove_stat_mod(STAT_APPEARANCE, "Disfigured") |
45 changes: 45 additions & 0 deletions
45
modular_darkpack/modules/merits_flaws/code/negative_quirks/glowing_eyes.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // VTM pg. 482 | ||
| /datum/quirk/darkpack/glowing_eyes | ||
| name = "Glowing Eyes" | ||
| desc = {"You have the stereotypical glowing eyes of vampire legend, giving you a -1 difficulty when intimidating mortals. | ||
| However, you MUST constantly disguise your condition, and the glow impairs your vision."} | ||
| icon = FA_ICON_EYE | ||
| value = -3 | ||
| gain_text = span_notice("Your eyes glow with an unnatural light!") | ||
| lose_text = span_notice("The light in your eyes fades.") | ||
| failure_message = span_notice("The light in your eyes fades.") | ||
| mob_trait = TRAIT_GLOWING_EYES | ||
| allowed_splats = list(SPLAT_KINDRED) | ||
| excluded_clans = list(VAMPIRE_CLAN_KIASYD)// They already have masq violating eyes! | ||
|
|
||
| /*You have the stereotypical glowing eyes of vampire | ||
| legend, which gives you a -1 difficulty on Intimidation | ||
| rolls when you’re dealing with mortals. However, the | ||
| tradeoffs are many; you must constantly disguise your | ||
| condition (no, contacts don’t cut it); the glow impairs | ||
| your vision and puts you at +1 difficulty on all sight | ||
| based rolls (including the use of ranged weapons); and | ||
| the radiance emanating from your eye sockets makes | ||
| it difficult to hide (+2 difficulty to Stealth rolls) in the | ||
| dark.*/ | ||
|
|
||
| /datum/quirk/darkpack/glowing_eyes/add(client/client_source) | ||
| . = ..() | ||
| var/mob/living/carbon/human/human_holder = astype(quirk_holder) | ||
| if(!human_holder) | ||
| return | ||
| ADD_TRAIT(quirk_holder, TRAIT_LUMINESCENT_EYES, QUIRK_TRAIT) | ||
| ADD_TRAIT(quirk_holder, TRAIT_MASQUERADE_VIOLATING_EYES, QUIRK_TRAIT) | ||
| human_holder.st_add_stat_mod(STAT_PERCEPTION, -1, "Glowing Eyes") // I guess this works. what would count as a sight-based roll is beyond me rn | ||
| var/obj/item/clothing/glasses/vampire/sun/new_glasses = new(human_holder.loc) // Give them glasses so they aren't immediately breaching on spawn or anything | ||
| human_holder.equip_to_appropriate_slot(new_glasses, TRUE) | ||
|
|
||
| /datum/quirk/darkpack/glowing_eyes/remove() | ||
| . = ..() | ||
| var/mob/living/carbon/human/human_holder = astype(quirk_holder) | ||
| if(!human_holder) | ||
| return | ||
| REMOVE_TRAIT(quirk_holder, TRAIT_LUMINESCENT_EYES, QUIRK_TRAIT) | ||
| REMOVE_TRAIT(quirk_holder, TRAIT_MASQUERADE_VIOLATING_EYES, QUIRK_TRAIT) | ||
| human_holder.st_remove_stat_mod(STAT_PERCEPTION, "Glowing Eyes") | ||
|
|
12 changes: 12 additions & 0 deletions
12
modular_darkpack/modules/merits_flaws/code/negative_quirks/smell_of_the_grave.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // V20 p. 481 | ||
| /datum/quirk/darkpack/smell_of_the_grave | ||
| name = "Smell Of The Grave" | ||
| desc = {"You exude an odor of dampness and newly turned earth, which no amount of scents or perfumes will cover. | ||
| Mortals in your immediate presence become uncomfortable, so the difficulties of all Social rolls to affect mortals increase by one."} | ||
| value = -1 | ||
| mob_trait = TRAIT_GRAVE_SMELL | ||
| gain_text = span_notice("You smell awful.") | ||
| lose_text = span_notice("You feel like you smell a lot better.") | ||
| allowed_splats = list(SPLAT_KINDRED) | ||
| icon = FA_ICON_SPRAY_CAN | ||
| failure_message = span_notice("You feel like you smell a lot better.") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might make sense to genersise this into a "get mortal indtimidation" getter or something as you copypaste similar code into a few other procs.