Skip to content

Commit

Permalink
Glass Cannon Shadowkin (#1531)
Browse files Browse the repository at this point in the history
# Description

Honestly... much needed until they can get a proper rework from the
original creators. This PR nerfs them a shit ton (no more teleporting
away when you're in danger, smh) to make them more in line with the
other species so they aren't powergamer central. Additionally, brings
them more in-line with the traditional SS13 shadowkin. Shadowkins should
no longer get darkswap and such, in fact I've commented out the entire
ability until it too can get a rework.

---

# TODO

- [x] Removed DarkSwap from Shadowkin
- [x] Made shadowkins take more damage from heat, slash, and piercing
- [x]  Brought shadowkin much more in line with their SS13 counterparts
- [x] Fixed shadowkin lore, making the guidebook entry more interesting
- [x] Fixed shadowkin lore file, adding in their species lore instead of
relying on a google doc
- [x] Shadowkin can be chosen as a player species roundstart
- [x] Rework Marish to have a more fleshed out language protoype
- [ ] Make DarkSwap unable to interact with the world as a whole
- [ ] Give DarkSwap a longer cooldown
- [ ] Make DarkSwap unable to be used if stunned
- [ ] Adjust DarkSwap glimmer production
- [x] Shadowkin do not have black eyes by default
- [x] Shadowkin have the black eyes trait listed (Waveform Misalignment
equivalent)
- [x] Shadowkin can now be mystagogue, mantis, chaplain, cataloguer, and
prisoner.
- [x] Shadowkin cannot have blackeye trait for mystagogue, mantis,
chaplain, or cataloguer.
- [x] Shadowkin must have blackeye trait for prisoner.

---

# Changelog

:cl: ShirouAjisai
- add: Shadowkins can now be roundstart species again
- add: Shadowkins now have a lungs, yippee! 
- add: Shadowkins now have organs with funny little descriptions
- add: Shadowkins now have a brand new and expanded list of names
- add: Shadowkins now have roundstart innate telepathy ability rather
than a whole new language for it.
- tweak: Shadowkins take more damage from heat, slash, and piercing
- tweak: Shadowkins are much more like their SS13 counterparters
- tweak: Shadowkins now have much better lore in their guidebook entry
- tweak: Shadowkins now have a more fleshed out language (to outside
observers)
- tweak: Shadowkins now can be mystagogue, mantis, chaplain, and
cataloguer
- tweak: Shadowkins must now have blackeye trait to play prisoner
- tweak: Shadowkins no longer have blackeye trait by default
- tweak: Shadowkins now take asphyxiation damage, albeit at half the
rate of others.
- tweak: Shadowkins now have a more pronounced snout.
- remove: Removed DarkSwap from Shadowkin roundstart

---------

Signed-off-by: SixplyDev <einlichen@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: ShirouAjisai <zaneromeave319@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
  • Loading branch information
4 people authored Jan 26, 2025
1 parent eec674c commit 031a102
Show file tree
Hide file tree
Showing 25 changed files with 320 additions and 293 deletions.
2 changes: 0 additions & 2 deletions Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ private void OnPowerUsed(DarkSwapActionEvent args)
}
}
}


1 change: 0 additions & 1 deletion Content.Server/Shadowkin/ShadowkinSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeCo
return;

component.OldEyeColor = humanoid.EyeColor;
humanoid.EyeColor = component.BlackEyeColor;
Dirty(uid, humanoid);
}

Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/language/languages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ language-Sign-name = Tau-Ceti Basic Sign Language
language-Sign-description = TCB-SL for short, this sign language is prevalent among mute and deaf people.
language-Marish-name = Marish
language-Marish-description = An inherently empathetic language, conveying emotions with a single word; spoken effortlessly by Shadowkins, though nearly impossible to learn or replicate.
language-Marish-description = A language spoken only by Shadowkin, one that is unable to be replicated by normal tongues.
language-ValyrianStandard-name = Valyrian Standard
language-ValyrianStandard-description =
Expand Down
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/traits/traits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -523,3 +523,7 @@ trait-name-ThermographicVision = CyberEyes Module: Thermographic Scanner
trait-description-ThermographicVision =
Your CyberEyes have been enhanced with a Thermographic Scanner. When enabled, it captures a snapshot of the user's surroundings, while highlighting all
biological life forms. It can even detect individuals through the walls of a station.
trait-name-ShadowkinBlackeye = Blackeye
trait-description-ShadowkinBlackeye =
You lose your special Shadowkin powers & respect amongst your peers, in return for some points. Effectively, you are only a Shadowkin in name, not in practice.
23 changes: 19 additions & 4 deletions Resources/Prototypes/Body/Organs/shadowkin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- type: entity
id: OrganShadowkinBrain
parent: OrganHumanBrain
description: "Oops, I should put this back where I found it."
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
Expand All @@ -9,7 +10,7 @@
- type: entity
id: OrganShadowkinEyes
parent: OrganHumanEyes
description: I see beyond anything you ever will!
description: "I see beyond anything you ever will!"
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
Expand All @@ -19,15 +20,27 @@
- type: entity
id: OrganShadowkinEars
parent: OrganHumanEars
description: Hey, listen!
description: "Hey, listen!"
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
state: ears

- type: entity
id: OrganShadowkinCore
parent: OrganHumanLungs
description: "What is this thing?"
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
layers:
- state: core


- type: entity
id: OrganShadowkinTongue
parent: OrganHumanTongue
description: "What does this do again?"
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
Expand All @@ -37,6 +50,7 @@
- type: entity
id: OrganShadowkinAppendix
parent: OrganHumanAppendix
description: "I think it does nothing..."
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
Expand All @@ -47,6 +61,7 @@
- type: entity
id: OrganShadowkinHeart
parent: OrganHumanHeart
description: "Oops, I think this belongs to someone!"
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
Expand Down Expand Up @@ -101,7 +116,7 @@
- type: entity
id: OrganShadowkinKidneys
parent: OrganHumanKidneys
description: Give the kid their knees back, please, this is the third time this week.
description: "Give the kid their knees back, please, this is the third time this week."
components:
- type: Sprite
sprite: Mobs/Species/Shadowkin/organs.rsi
Expand All @@ -110,4 +125,4 @@
- type: Metabolizer
maxReagents: 5
metabolizerTypes: [Shadowkin]
removeEmpty: true
removeEmpty: true
1 change: 1 addition & 0 deletions Resources/Prototypes/Body/Prototypes/shadowkin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
stomach: OrganShadowkinStomach
liver: OrganShadowkinLiver
kidneys: OrganShadowkinKidneys
lungs: OrganShadowkinCore
right arm:
part: RightArmShadowkin
connections:
Expand Down
9 changes: 2 additions & 7 deletions Resources/Prototypes/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -361,16 +361,11 @@
- type: damageModifierSet
id: Shadowkin
coefficients:
Blunt: 0.95
Slash: 1.2
Piercing: 1.1
Asphyxiation: 0
Cold: 0.75
Asphyxiation: 0.5
Cold: 0.8
Heat: 1.2
Cellular: 0.25
Bloodloss: 1.35
Shock: 1.25
Radiation: 1.3

- type: damageModifierSet
id: Plasmaman
Expand Down
149 changes: 90 additions & 59 deletions Resources/Prototypes/Datasets/Names/shadowkin.yml
Original file line number Diff line number Diff line change
@@ -1,70 +1,101 @@
# Names for the shadowkin,
# Shadowkin names are descriptive of
# Their Primary Emotion,
# A State of Being,
# Or past Memories.
# The two schools of thought,
# A job designated for them,
# Or something symbolic.

- type: dataset
id: names_shadowkin
values:
# Mar
# - Mar
# Marish
- Maaar
- Lwmar
- Lmwarmrrraw
- WlurrlmrrrAw
- UurlmmrwlAmur
- Mwrrrmlar
- Mwaarlwurm
- Aralwurm
- Arrmaurm
- Mwalwamar
- Mwalwarr
- Malamur
- Marur
- Wurmar
- Mmarr
- Mwalwarr
- Maarl
- Mmaraar
- Maamwaarr
- Maalmwar
- Mlarrul
- Maalamur
- Aarmwaarr
- Aalmwar
- Aarwalwar
- Amwalwar
- Aarmur
- Arlmur
- Mmarwaarr
- Mmalmwar
- Mmarwalwar
- Lmwamwar
- Mwalwarwar
- Mlalmwar
- Lmwaramur
- Maarlwurlmar

# Sad
- Fragile
- Heartbreak
- Inferior
- Lone
- Lonesome
- Loss
- Solitary
- Solitude
- Sorrow
- Shade
# Civil Service
- Peacekeeper
- Fireman
- Courier
- Teacher
- Accountant
- Hairdresser
- Barkeep
- Janitor
- Librarian

# Angry
- Fear
- Fearful
- Fury
- Pain
- Rage
- Rush
- Wrath
# Trades
- Welder
- Technician
- Carpenter
- Mason
- Blacksmith
- Plumber
- Locksmith
- Mechanic
- Framer

# Happy
- Calm
- Content
- Contented
- Happy
- Hope
- Joyous
- Lovely
- Peace
- Peaceful
- Quiet
- Serene
- Serenity
- Tranquil
- Tranquility
# Medical
- Doctor
- Nurse
- Shaman
- Paramedic
- Apothecary
- Alchemist
- Druid
- Herbalist
- Medicus

# Memory
- Dillusioned
- Forgotten
- Focusless
- Lost
- Memory
- Recollection
- Remembrance
- Reminisce
- Reminiscence
# Military
- Fighter
- Fixer
- Healer
- Supplier
- Scouter
- Veteran
- Sailor
- Rider
- Archer

# Other
- Apathy
- Collected
- Curiosity
- Free
- Interest
- Jax # White eye (jack of all trades) :)
- Still
- Unbound
- Shadows
# Special
- Ash
- Ember
- Dreamer
- Leaf
- River
- Dirt
- Bark
- Stone
- Flame
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
save: false
name: Urist McShadow
parent: MobShadowkinBase
id: MobShadowkin
id: MobShadowkin
description: "Their barrel chest doesn't seem to rise and fall as quickly as a human's, how unnerving."
12 changes: 5 additions & 7 deletions Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
- type: entity
save: false
parent:
- MobBloodstream
- MobAtmosStandard
- MobFlammable
- BaseMobSpecies
- MobRespirator
- BaseMobSpeciesOrganic
id: MobShadowkinBase
name: Urist McShadow
abstract: true
Expand All @@ -15,7 +11,7 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
damage: 400
damage: 300
behaviors:
- !type:GibBehavior {}
- !type:SpawnEntitiesBehavior
Expand Down Expand Up @@ -229,14 +225,16 @@
mindbreakingFeedback: shadowkin-blackeye
- type: InnatePsionicPowers
powersToAdd:
- DarkSwapPower
- TelepathyPower
- type: LanguageKnowledge
speaks:
- TauCetiBasic
- Marish
understands:
- TauCetiBasic
- Marish
- type: PotentiaModifier
potentiaMultiplier: 1.25
- type: Tag
tags:
- CanPilot
Expand Down
23 changes: 20 additions & 3 deletions Resources/Prototypes/Language/Species-Specific/marish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,34 @@
speech:
color: "#be3cc5"
fontId: Lymphatic
empathySpeech: true
empathySpeech: false
speechVerbOverrides:
- chat-speech-verb-marish
obfuscation:
!type:SyllableObfuscation
minSyllables: 1 # Replacements are really short
maxSyllables: 2
minSyllables: 2
maxSyllables: 5
replacement:
- mar
- mwrrr
- maaAr
- aarrr
- wrurrl
- mmar
- mwar
- mlar
- mlwar
- mwaarr
- mAaAr
- lmwar
- wlurrl
- wlmwar
- arrmaw
- mwAlwar
- wrlurll
- wlarrul
- wlAmur
- AlwuRm
- mrrrAw
- wurlMur
- uuRlmmr
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
- !type:CharacterLogicOrRequirement
requirements:
- !type:CharacterSpeciesRequirement
species:
- Shadowkin
- !type:CharacterTraitRequirement
inverted: true
traits:
- ShadowkinBlackeye
startingGear: ForensicMantisGear
icon: "JobIconForensicMantis"
supervisors: job-supervisors-rd
Expand Down
Loading

0 comments on commit 031a102

Please sign in to comment.