diff --git a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs
index 3c51cd2262d..b4f35e0933d 100644
--- a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs
@@ -56,5 +56,3 @@ private void OnPowerUsed(DarkSwapActionEvent args)
}
}
}
-
-
diff --git a/Content.Server/Shadowkin/ShadowkinSystem.cs b/Content.Server/Shadowkin/ShadowkinSystem.cs
index db617696f8f..fabae303a8d 100644
--- a/Content.Server/Shadowkin/ShadowkinSystem.cs
+++ b/Content.Server/Shadowkin/ShadowkinSystem.cs
@@ -45,7 +45,6 @@ private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeCo
return;
component.OldEyeColor = humanoid.EyeColor;
- humanoid.EyeColor = component.BlackEyeColor;
Dirty(uid, humanoid);
}
diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl
index 33a3f9b52b6..e4033155c7e 100644
--- a/Resources/Locale/en-US/language/languages.ftl
+++ b/Resources/Locale/en-US/language/languages.ftl
@@ -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 =
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index fb6e9f9bd5b..06f15737423 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -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.
diff --git a/Resources/Prototypes/Body/Organs/shadowkin.yml b/Resources/Prototypes/Body/Organs/shadowkin.yml
index 695ddec1ab2..8ee3fe1ef24 100644
--- a/Resources/Prototypes/Body/Organs/shadowkin.yml
+++ b/Resources/Prototypes/Body/Organs/shadowkin.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -110,4 +125,4 @@
- type: Metabolizer
maxReagents: 5
metabolizerTypes: [Shadowkin]
- removeEmpty: true
\ No newline at end of file
+ removeEmpty: true
diff --git a/Resources/Prototypes/Body/Prototypes/shadowkin.yml b/Resources/Prototypes/Body/Prototypes/shadowkin.yml
index 742e079f23a..3164c70bd03 100644
--- a/Resources/Prototypes/Body/Prototypes/shadowkin.yml
+++ b/Resources/Prototypes/Body/Prototypes/shadowkin.yml
@@ -23,6 +23,7 @@
stomach: OrganShadowkinStomach
liver: OrganShadowkinLiver
kidneys: OrganShadowkinKidneys
+ lungs: OrganShadowkinCore
right arm:
part: RightArmShadowkin
connections:
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 86a6fab9c55..cea34d04eaf 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -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
diff --git a/Resources/Prototypes/Datasets/Names/shadowkin.yml b/Resources/Prototypes/Datasets/Names/shadowkin.yml
index 4dbf4c5dc54..b6cf96db431 100644
--- a/Resources/Prototypes/Datasets/Names/shadowkin.yml
+++ b/Resources/Prototypes/Datasets/Names/shadowkin.yml
@@ -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
\ No newline at end of file
+ # Special
+ - Ash
+ - Ember
+ - Dreamer
+ - Leaf
+ - River
+ - Dirt
+ - Bark
+ - Stone
+ - Flame
diff --git a/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml
index 2a58fe5c1fe..ee042213354 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml
@@ -2,4 +2,5 @@
save: false
name: Urist McShadow
parent: MobShadowkinBase
- id: MobShadowkin
\ No newline at end of file
+ id: MobShadowkin
+ description: "Their barrel chest doesn't seem to rise and fall as quickly as a human's, how unnerving."
diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
index 5797de78bbf..bdb9ff3b785 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
@@ -1,11 +1,7 @@
- type: entity
save: false
parent:
- - MobBloodstream
- - MobAtmosStandard
- - MobFlammable
- - BaseMobSpecies
- - MobRespirator
+ - BaseMobSpeciesOrganic
id: MobShadowkinBase
name: Urist McShadow
abstract: true
@@ -15,7 +11,7 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
- damage: 400
+ damage: 300
behaviors:
- !type:GibBehavior {}
- !type:SpawnEntitiesBehavior
@@ -229,7 +225,7 @@
mindbreakingFeedback: shadowkin-blackeye
- type: InnatePsionicPowers
powersToAdd:
- - DarkSwapPower
+ - TelepathyPower
- type: LanguageKnowledge
speaks:
- TauCetiBasic
@@ -237,6 +233,8 @@
understands:
- TauCetiBasic
- Marish
+ - type: PotentiaModifier
+ potentiaMultiplier: 1.25
- type: Tag
tags:
- CanPilot
diff --git a/Resources/Prototypes/Language/Species-Specific/marish.yml b/Resources/Prototypes/Language/Species-Specific/marish.yml
index 20b42a80d16..55b59b68e69 100644
--- a/Resources/Prototypes/Language/Species-Specific/marish.yml
+++ b/Resources/Prototypes/Language/Species-Specific/marish.yml
@@ -5,13 +5,13 @@
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
@@ -19,3 +19,20 @@
- aarrr
- wrurrl
- mmar
+ - mwar
+ - mlar
+ - mlwar
+ - mwaarr
+ - mAaAr
+ - lmwar
+ - wlurrl
+ - wlmwar
+ - arrmaw
+ - mwAlwar
+ - wrlurll
+ - wlarrul
+ - wlAmur
+ - AlwuRm
+ - mrrrAw
+ - wurlMur
+ - uuRlmmr
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 03958bab529..4d0538d31c6 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -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
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
index de1e8fc39ac..f6cf47ac046 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -13,6 +13,15 @@
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 21600
+ - !type:CharacterLogicOrRequirement
+ requirements:
+ - !type:CharacterSpeciesRequirement
+ inverted: true
+ species:
+ - Shadowkin
+ - !type:CharacterTraitRequirement
+ traits:
+ - ShadowkinBlackeye
special:
- !type:AddComponentSpecial
components:
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index c3261bea60f..a1216d01a12 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -19,9 +19,12 @@
- !type:CharacterLogicOrRequirement
requirements:
- !type:CharacterSpeciesRequirement
- inverted: true
species:
- Shadowkin
+ - !type:CharacterTraitRequirement
+ inverted: true
+ traits:
+ - ShadowkinBlackeye
startingGear: ChaplainGear
icon: "JobIconChaplain"
supervisors: job-supervisors-rd
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
index b8e65f2d980..7214c31cb5e 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -19,9 +19,12 @@
- !type:CharacterLogicOrRequirement
requirements:
- !type:CharacterSpeciesRequirement
- inverted: true
species:
- Shadowkin
+ - !type:CharacterTraitRequirement
+ inverted: true
+ traits:
+ - ShadowkinBlackeye
startingGear: LibrarianGear
icon: "JobIconLibrarian"
supervisors: job-supervisors-rd
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index a6f0dd7a639..473dd0c4ee1 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -25,6 +25,15 @@
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
+ - !type:CharacterLogicOrRequirement
+ requirements:
+ - !type:CharacterSpeciesRequirement
+ species:
+ - Shadowkin
+ - !type:CharacterTraitRequirement
+ inverted: true
+ traits:
+ - ShadowkinBlackeye
weight: 10
startingGear: ResearchDirectorGear
icon: "JobIconResearchDirector"
diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml
index f7674e80d61..7ef945ce402 100644
--- a/Resources/Prototypes/Species/shadowkin.yml
+++ b/Resources/Prototypes/Species/shadowkin.yml
@@ -1,7 +1,7 @@
- type: species
id: Shadowkin
name: species-name-shadowkin
- roundStart: false
+ roundStart: true
prototype: MobShadowkin
sprites: MobShadowkinSprites
defaultSkinTone: "#FFFFFF"
@@ -18,7 +18,6 @@
sexes:
- Male
- Female
- - Unsexed
minHeight: 0.65
defaultHeight: 0.85
maxHeight: 1.15
diff --git a/Resources/Prototypes/Traits/mental.yml b/Resources/Prototypes/Traits/mental.yml
index 172872a6cdc..b6a803d2485 100644
--- a/Resources/Prototypes/Traits/mental.yml
+++ b/Resources/Prototypes/Traits/mental.yml
@@ -27,6 +27,10 @@
inverted: true
species:
- Oni
+ - !type:CharacterSpeciesRequirement
+ inverted: true
+ species:
+ - Shadowkin
- !type:CharacterTraitRequirement
inverted: true
traits:
@@ -66,6 +70,10 @@
inverted: true
species:
- Oni
+ - !type:CharacterSpeciesRequirement
+ inverted: true
+ species:
+ - Shadowkin
- !type:CharacterTraitRequirement
inverted: true
traits:
diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml
index 771a796eefa..20874d6d6df 100644
--- a/Resources/Prototypes/Traits/species.yml
+++ b/Resources/Prototypes/Traits/species.yml
@@ -67,16 +67,19 @@
- Swashbuckler
- Spearmaster
-# - type: trait
-# id: ShadowkinBlackeye
-# category: Mental
-# points: 4
-# functions:
-# - !type:TraitReplaceComponent
-# components:
-# - type: Shadowkin
-# blackeyeSpawn: true
-# requirements:
-# - !type:CharacterSpeciesRequirement
-# species:
-# - Shadowkin
+- type: trait
+ id: ShadowkinBlackeye
+ category: Mental
+ points: 4
+ functions:
+ - !type:TraitReplaceComponent
+ components:
+ - type: Shadowkin
+ blackeyeSpawn: true
+ - !type:TraitRemoveComponent
+ components:
+ - type: Psionic
+ requirements:
+ - !type:CharacterSpeciesRequirement
+ species:
+ - Shadowkin
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml
index f2f73ee6663..36b7afe5af6 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml
@@ -1,36 +1,69 @@
-# Shadowkin
-
-
-
-
-
-Fluffy lil' guys.
-
-## Ability Differences
-
-- Need no air to survive
-- Can Shadeskip
-- Can travel to and from The Dark at will
-- Dims nearby lights when in the The Dark
-- When too low on energy, they may fall into a powerful sleep
-- Can "speak" in the Empathy, which only other Shadowkin can understand
-- Slightly less blunt damage
-- A bit more slash damage
-- Slightly more piercing damage
-- Less cold damage
-- Slightly more heat damage
-- Near no cellular damage
-- More bloodloss damage
-- Slightly more shock damage
-- More radiation damage
-
-## Physical Differences
-
-- Very large and brightly colored eyes with no pupils
-- Sees the world through their eyes' tint
-- Very large ears
-- Very fluffy
-- Can be Male, Female, or Unisex
-- Can be 18-300 years old
-
\ No newline at end of file
+ # Shadowkin
+
+
+
+
+
+ Public information on the origins of Shadowkin is incredibly sparse, in part owing to the secretive nature of these creatures. They are known by the Epistemics Cult to have originated from a dimension that is formally known as "The World At The End Of All Time", but any attempts to glean information about this dimension are universally met with silence or hostile stares. Between only their own kind, Shadowkin have many names for this dreadful place, with the most common simply being "The Dark". They have several evolutionary adaptations for living in such an incredibly hostile world. The World At The End Of All Time can thus be assumed from these adaptations to be extraordinarily cold, utterly without visible light, and bearing a thin atmosphere.
+
+ Shadowkin in their current state are valued employees of Nanotrasen and often drift in and out of employment in other companies or sectors of space.
+ They are generally known as reliable and trustable employees, not having anything that's exceptionally negative or positive regarding their work ethic.
+ They have been known to be hired by security contracting companies and mercenary freelance organizations for their ability to go into the umbra at will.
+ Anti-Shadowkin sentiment is not very common among Nanotrasen employees, but certain Shadowkin that continue to interact with the nöösphere and cause problems around themselves have the tendency to draw the ire of local authorities.
+
+ ## Biology
+
+ Shadowkin biology is rather unknown and obscure as there aren't currently many in the sector.
+ We do know a few things, one of them being that both male and females look identical on the outside, no apparently gender at first look.
+ Shadowkin are very androgynous externally, fur flat against their bodies with no external differences regardless of sex.
+ Typically, they come in the two color extremes with the vast majority being dark colors while a rare few are white or grey.
+ Shadowkin that have been seen with fur such as orange and teal have consistently and always said their fur was dyed when asked, leading us to believe the darker tones and white are the only natural fur colors.
+ Recent autopsies have also revealed that Shadowkin do not seem to have pupils, their eyes simply being large, glowing orbs.
+ It is unsure how they see out of these without a visible pupil but it seems that not even they know.
+ Unlike other species, Shadowkin have four ears instead of two.
+ Their upper two ears are tasked with transmitting thoughts via Empathy, while the lower two ears are tasked with receiving thoughts that were transmitted via Empathy.
+ Shadowkin tails are typically fleshy and movable, covered in fur.
+ Shadowkin tails come in many shapes and sizes from large and fluffy to short and coarse, the tails do not seem to aid with balance and it's unclear if they do anything in the Dark.
+ Shadowkin tongues are also quite versatile, being the only ones capable of communicating effectively with Marish.
+ So far, researchers have struggled and been unable to find a manner to put Marish into a translator in a way that is accurate or understandable.
+
+ ## Unique Language
+
+- [color=#2c2d33]Marish[/color]:
+ Marish is the unique and special language of the Shadowkin that was developed when they started moving out of the Dark and into normal dimensions.
+ Marish is a language that can only be properly spoken by someone with a Shadowkin tongue, other organic tongues and even computers struggling to get a proper grasp on it.
+ Marish is separate from Empathy in the fact that it is spoken while Empathy is typically communicated by vibrating one's four ears.
+
+ ## Misc. Notes
+
+ - Shadowkin, unlike harpies, do in fact hatch from eggs.
+ - Shadowkin on average tend to be slightly smaller than the average human, a few getting maybe a couple inches taller but not by much.
+ - Shadowkin do not have a concept of gender, rather only that of biological sex; this is primarily due to the fact that both males and females look identical on the outside.
+ - Shadowkin primarily used to live as nomadic tribals, as more of them populate different dimensions, this has begun to change.
+ - Shadowkin personalities are primarily dictated by their eye color, find out all the personalities!
+
+ ## Species Traits
+ ### Positive Traits
+ -[color=#303056]Barrel Chested[/color]:
+ Shadowkin, as a result of living in a dimension where there is little air, do not have lungs but instead a core. Their core allows them to more efficiently process oxygen and not use as much as a result.
+
+ -[color=#303056]Innate Telepathy[/color]:
+ Shadowkin are innately telepathic, allowing them to communicate with other psionic individuals at will.
+
+ -[color=#303056]Psionic Species[/color]:
+ Shadowkin as a species inhabit a unique ability to more easily learn new psionic abilities, in part owing to their home dimension being incredibly hostile to those who would be considered "normal".
+
+ -[color=#303056]Resting[/color]:
+ Shadowkin are able to fall into a deep and powerful sleep to quickly recover mana to use their psionic abilities sooner than others.
+
+ ### Negative Traits
+ -[color=#303056]Glass Cannon[/color]:
+ Shadowkin are very vulnerable to damage from an array of sources, preferring speed and agility over direct combat.
+
+ -[color=#303056]Easy Target[/color]:
+ Due to the fact they're inherently psionic, they make for easy targets by over-eager epistemics staff... and any other beasts that lurk in the dark.
+
+ -[color=#303056]Unfortunate Evolution[/color]:
+ Most Shadowkin are not very tall, rendering them easy to pick up and throw around. As a result, space wind hits them 20% harder and their bones are not very durable either.
+
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
index 261fc666f19..6e8cf606880 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
@@ -13,9 +13,10 @@
+
-
+
# Parkstation specific species
diff --git a/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt b/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt
index e3cda6d77e2..dc0d1e918fb 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt
+++ b/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt
@@ -2,177 +2,68 @@
## Biology
-[color=#a88b5e]Physicality[/color]
+[color=#a88b5e]Physical Appearance[/color]
-Shadowkin seem very similar to canine species when looked at.
-While mammalian in nature, it is nearly impossible to find any sexual dimorphism between genders, if they even have any.
-They seem to all share the same body shape and often voices.
+Shadowkin typically have dark fur covering their entire body with rare exceptions applying.
+Their fur typically comes in black, dark grey, and deep purples but some shadowkin have been seen to have fur as white as the fresh snow.
+Shadowkin also have long talons on their hands and feet, capable of rendering flesh from the bone with ease.
+Along with all of this, they have fleshy tails covered in fur that can range from long and fluffy to short and coarse and everything in-between.
-The head consists of a snout with a nose, sharp teeth in the mouth, and two big ears on top of the head.
-In addition to the two big ears, Shadowkin have two smaller ears lower down, giving them an exceptionally good ability to detect where exactly sounds come from.
+The two most notable features that shadowkin have are their large eyes and the four ears on the top of their head which typically make them stand out in even the largest crowds.
+Their large ears help them with understanding and speaking their telepathic language of Empathy, a sort of hivemind that they all use.
+The upper two ears, from what we can gauge, are responsible for transmitting the thoughts of shadowkin to other shadowkin.
+This is in contrast to their lower two ears which are used to receive these messages and translate them for each individual shadowkin.
+It is unclear how they work together but experiments have revealed that without all four ears intact, the entire system falls apart.
-Shadowkin eyes are usually very large and fully mono-colored; they have no discernible pupils, irises, or similar.
-The eye of a Shadowkin is a solid orb of color and, perhaps, their most defining trait.
-
-All observations show Shadowkin do not seem to age after a certain point.
-Some may look older or younger than others, but the aging process seems to stop when the Shadowkin is chronologically in their 20s.
-
-Unusually, compiled medical data on Shadowkin shows that they have no lungs, thus not needing to breathe.
-The compiled medical data also shows that they have a large, more circular shape where their lungs would be.
+The large eyes of shadowkin have been seen to glow in the dark, the eye seemingly entirely made up of the iris without a noticeable pupil.
+It is currently unknown how they see through these large eyes as they do not seem to change, but it is known that they seem to have improved night vision that's superior to that of other species'.
+It's also to be noted that their large eyes seem to be more akin to two glowing orbs rather than proper eyes that a normal species would have, being a rarity and a desirable items for collectors, taxidermists, as well as other individuals who engage in black market and backroom deals.
[color=#a88b5e]Mentality[/color]
-Shadowkin core personalities are mirrored by their eye color.
-Some common colors and their meanings are:
-
-- Red: Determined to reach a goal, even if it means sacrificing others.
-- Green: Eager to learn and fit in with others.
-- Blue: Very calm and collected, or shy.
-
-Other colors also exist in addition to these but are not as common.
-The other colors are just mixes of the three main colors.
-For example, here are a couple of mixes:
-
-- Purple: Determined, yet probably won't harm, in some cases shy.
-- Yellow: Quite eager to be number one, especially if related to knowledge.
-- Orange: Shy and calm, yet will fight if provoked.
-- White: Very robust, exceeds expectations in most things they do, but is quite boring to interact with generally.
+The mentality of shadowkin is typically mirrored by their eyes, different colors of their eyes meaning different things.
+There are rare exceptions for this with shadowkin having different personalities than their eyes reflect but this is typically seen as more of a shameful birth defect than something that would be celebrated.
+The eye colors that we know of that are possible are blue, red, yellow, green, purple, orange and black eyes.
+These eyes may be solid colors, lighter or darker hues, and in rare cases they may have heterochromia which typically results in shaming from their society, friends, and other people in their lives.
+Blue eyes denote shadowkin that are curious and eager for knowledge, typically they are those that are most likely to engage with outsiders and non-shadowkin.
+Red eyes are those who are determined to reach a goal, not shying away from confrontation to reach it, often seen by others as violent and loose cannons.
+Yellow eyed shadowkin are very cautious, unlikely to engage with non-shadowkin, preferring to stick to the dark and shadowy places sooner than go out into the light and expose themselves.
+Green eyes mean they’re eager for knowledge but more reserved and cautious, sometimes seen acting through proxies rather than actively interacting with non-shadowkin themselves.
+Purple suggests they’re eager learners who are willed to seek out knowledge more directly than others, being the complete opposite of green as they're often determined to go straight to the source rather than being satisfied with second-hand accounts or knowledge.
+Orange-eyed shadowkin are traditionally reserved people who pursue their goals from hiding but will fight when cornered, they're often seen with a small and tight clique of trusted acquaintances who they act through rather than show their face in public.
-There are rumors other colors exist as well.
-Shadowkin that lose their ability to travel between dimensions have [color=#000000]black eyes[/color] no matter their core personality.
-These black-eyed Shadowkin make up the largest number of them living in Realspace.
+Black eyes are shadowkin that have been disconnected from the Dark for whatever reason, they are shunned by all but the most forward-thinking shadowkin as a result.
+The closest equivalent for black-eyed shadowkin is organics who have been mindbroken, their souls having been torn out of their bodies and the Dark long since having left them.
## History
-Shadowkin are creatures native to their so-called Pocket Dimension, a part of space that is unable to be accurately pinpointed and/or visited by most people.
-From there, Shadowkin visit our worlds, and sometimes a large number of them are forced into our world in mass migrations and then live among us.
-What exactly causes these mass migrations is unknown, but may be related to them losing their ability to travel between dimensions.
-
-[color=#a88b5e]Homeworld[/color]
-
-While no home system or world has been found, some Shadowkin talk about dreaming of their homeworld, describing a lush and green land with abundant resources.
-
-[color=#a88b5e]Racial/Government Status[/color]
-
-There currently exists no Shadowkin government, and with Shadowkin being as rare as they are, they tend to fit into currently established societies and civilizations, with varying degrees of success in the past.
-In recent years, however, many cultures have taken to accepting Shadowkin as another galactic constant, going as far as allowing them lives similar to those that any of the other species would lead.
+[color=#a88b5e]Home Dimension[/color]
-Some systems early on took and experimented on Shadowkin, in an attempt to utilize their powers in various technology, and even recreating them with very experimental technology.
-The tests failed and this was met with a lot of resistance from Shadowkin, many of them being killed or becoming Blackeyes in the process.
-After this, those systems realized that Shadowkin were a sentient species, and deeply apologized for their actions.
+It is known that shadowkin are native to a dimension called "the Dark" with not much else known about their native dimension because of their hesitancy to speak about anything regarding it.
+We do know that the Dark is something of a shadowkin hub where they can go to other dimensions, albeit after having to recover their energy for decades as dimension travel takes a long toll on them.
+What we do know about the Dark is that it's a place devoid of all light and air, seeming to have no pressure either.
+We also know that all shadowkin are born in the Dark and that it's where they go in order to give birth how animals on earth do.
+It is also suspected that the Dark is the physical manifestation of the nöösphere but that is currently unconfirmed as we don't know enough about either to make an educated decision.
## Culture
-[color=#a88b5e]The Typical Experience[/color]
-
-Most times, life is pretty normal. A Shadowkin can have a job, go to the job to work, then spend time off with friends.
-The fact is most times of the day, the small abilities one might have are nice, but not overly useful. Sure, a Shadowkin could dim the nearby lights, but at the same time, the Shadowkin could also just flick the light switch.
-However, it can sometimes happen that when a Shadowkin slept in and needs to get to work quickly, they might just teleport to work.
-Some people might be overly wary of Shadowkin, some might be drawn towards Shadowkin.
-Many Shadowkin are used to not wearing clothes, which can lead to some awkward situations, but those are generally the same situations any other furred species would have.
-
[color=#a88b5e]Language[/color]
-The only recorded spoken language of the Shadowkin is an unusual language named "Mar", named after the fact that every single word in this language is the word "mar".
-Spoken in different tones, with more or less emphasis on the various parts, or by drawing out parts of this word, a multitude of different "mar"s can be created, but they follow no apparent conventions.
-Shadowkin can perfectly understand each other though and discuss complex topics using only this one word.
-The Shadowkin can hear the Mar language from anywhere and understand it via Empathy, yet do not know who it is from unless they are close enough to see the sender.
-Other humanoid species are incapable of understanding or learning Mar, as they are unable to accentuate their speech in the same way or hear some of the silent, Empathic tones they use.
-Shadowkin tend to learn one or more languages of the Realspace beings.
-The capability in such learned languages depends fully on each single Shadowkin, where some have only very broken capabilities, while others are fluent in several languages.
+We are only aware of the spoken language of the shadowkin which is Marish, typically consisting of the "mar" sound along with slight variations in order to produce different words.
+Some common sounds alongside "mar" that have been observed are also "war" and "lmar" or "lwar" amongst other sounds that are used to combine to make words and a functioning language for shadowkin.
+Attempts have been made to record and play back Marish for research purposes but attempts have so far been unssuccessful for unknown reasons.
+When attempting to play back Marish, the recording seems to come out odd and disjointed without the intricacies of the original MArish that it was recorded from.
[color=#a88b5e]Naming Conventions[/color]
-Shadowkin tend to name themselves with a singular word, ranging from states of being, such as Lone and Collected, to words that describe their memories connected to their supposed homeworld, like Dreamer.
-Name schemes of the humans are usually frowned upon, as they do not reflect upon the Shadowkin, resulting in reactions ranging anywhere from an actual frown to being entirely ignored.
-Shadowkin following another species naming scheme are often Blackeyes, not fitting in with other Shadowkin as well.
-Names hold a great deal for Shadowkin because of how closely they are often tied to describing who they are.
-Following life-changing events, Shadowkin often change their names to reflect the new person they have become.
-
-[color=#a88b5e]Rumors and Speculation[/color]
-
-Shadowkin are beings from another dimension, capable of performing feats that others could only describe as "magic", with no scientific explanation.
-It is speculated that Shadowkin actually have a whole nation in their dimension, and those that come to Realspace just simply refuse to talk about it.
-Sometimes Shadowkin mention a "Hub", acting as evidence for this theory.
-
-Some believe Shadowkin are the result of experimentation, though them being taken and experimented on is a large piece of evidence denying this theory.
-
-Some believe Shadowkin are the result of an expedition crew that disappeared hundreds of years ago, even though the first Shadowkin sightings were long before that.
-Obviously, this expedition ship performed time travel.
-
-## OOC Notes
-
-Extra information, should be read if playing Shadowkin, if not you should try to learn this in gameplay.
-
-[color=#a88b5e]History[/color]
-
-Shadowkin used to live on a very lush forest planet, using primitive technology to work with metal, create tools, and build stone structures.
-According to the dreams, Shadowkin back then had forged tools and blades, but had no electricity, presumably putting them at a medieval technology level.
-In a sudden event, everyone and everything organic suddenly found themselves in an alternate dimension, sucked straight out of their previous home.
-The Shadowkin being ripped from their homes happened in three total "dimensional ripples".
-
-Now stuck in this alternate dimension, Shadowkin changed a lot.
-They stopped aging and with time developed the ability to use the energy of this dimension to power their unusual "magic".
-And even later, they learned how to leave the dimension and travel to Realspace and back again.
-However, as the eons passes, memories became shady of their home.
-Many Shadowkin forgot more and more about the thousands of years they had lived, reducing memory to focus on the more important closer time.
-However in dreams, Shadowkin, even those born in Realspace, often have visions of their home planet.
-Some events can trigger certain memories to return like meeting someone they knew from the past makes them remember in great detail who they are.
-As such, it can happen that two Shadowkin can randomly meet and remember that they met hundreds of years ago, often confusing nearby unknowing humanoids.
-
-[color=#a88b5e]Biology[/color]
-
-If a Shadowkin personality changes drastically, their eye color will change as an effect, reflecting upon their new personality.
-Shadowkin, being ageless entities, can look older or younger, but that is merely a visual representation of how they feel about their age.
-22 years after birth a Shadowkin stops aging, and in all of their history no instance of them dying of old age has been recorded.
-
-[color=#a88b5e]Shadowkin energy[/color]
-
-Shadowkin have an odd organ in them, their "Core".
-This organ is the source and storage place for their power.
-Without it, they would be unable to use their abilities.
-The Core is very sensitive to physical trauma, yet is very resilient to electrical or magical damage.
-The Core can get irreversibly destroyed from overloading it, using too much power too quickly, which is what happens to the Blackeyes.
-The Core can not be replaced, using a new one would require a new body, and trying to use another Shadowkin Core will result in death.
-
-The Shadowkin's ability to fall into a deep sleep is a method to recharge their energy at a significantly higher rate than idling.
-Though while in this deep sleep, it is difficult to wake up, and cannot be woken up by anything other than themself.
-
-Shadowkin can know exactly how much energy they have, and feel differently based on how much they have.
-They can also Empathically sense the energy of others nearby and can estimate how much energy they have based on their feelings.
-
-[color=#a88b5e]Shadowkin Abilities[/color]
-
-Shadowkin have a few abilities.
-They can teleport, requiring a small amount of energy, but they can do it quickly.
-They can teleport to and from The Dark, requiring much more energy than teleportation.
-They can immediately fall into a deep sleep at any time.
-
-[color=#a88b5e]The Ritual[/color]
-
-When a Shadowkin reaches adulthood, they undergo a "Ritual".
-During this Ritual they intentionally overload their energy reserves, forcing their capacity to expand rapidly in order to gain enough energy to travel between dimensions.
-Most Shadowkin pass the Ritual and that's the end of it, but some Shadowkin perish or become Blackeyes during the ritual.
-
-[color=#a88b5e]Important Terminology[/color]
-
-[color=#a88b5e]Shadowkin:[/color]
-The name given for your race.
-While your race doesn't have a name for itself, this is how most of the Galaxy refers to you, so it's how you refer to yourself too.
-
-[color=#a88b5e]The Dark:[/color]
-The other dimension where you are from.
-There are theories that The Dark and Bluespace are connected, but you don't know the details about that.
-The Dark is a dimension where strange rules apply.
-For outsiders who somehow enter it, whatever they imagine being in there, they see there, if not too complex.
-If an outsider comes with a willing Shadowkin they may see what the Shadowkin sees, being anything they imagine, or a reflection of the station.
-
-[color=#a88b5e]Blackeyes:[/color]
-A Shadowkin who has undergone and failed the Ritual, or lost their ability via other methods.
-The Blackeyes have completely black eyes, no matter their actual personality.
-They choose a new name, which follows a favorite species' naming scheme.
-They are often ignored or left alone more by other Shadowkin.
-[color=#a88b5e]Note:[/color] Blackeyes correlation with black eyes is done entirely via roleplay, the game will not handle this for you.
-
-[color=#a88b5e]Mar:[/color]
-A word used to verbally communicate feelings, emotions, wishes, hopes, ideas, and whatever, in addition to your Empathy.
\ No newline at end of file
+Shadowkin largely have two schools of thought when it comes to naming their children, both equally popular and common in our dimension as well as back home from what we were able to glean.
+Above all else, shadowkin typically only have a single name with a second name only being appended by a tribe elder upon the completion of a task that is monumental or otherwise heroic.
+Regardless of what school of thought shadowkin subscribe to, their names are typically given to them by their mother except in cases which the mother dies during childbirth which is when the father will give the shadowkin their name.
+Traditionalists are the first school of thought when it comes to naming shadowkin, they believe that names should be in Marish and have unique meanings like those that are normal amongst humans.
+A name that would fit the traditionalist view would be Maaarlwarmar which means "first beginning" or "genesis" because they were the firstborn of their mother.
+Conversely, there is the worker school of thought who believe that the names for shadowkin should reflect their designated job in a tribe or a society.
+Names can be as simple as those such as "Baker" or "Hunter" which are quite obvious to those which are obscure such as "Ash" or "Ember" for engineers.
+Traditionally, names like these are given at birth because that's what the tribe has already determined them to be as that is what the need will be by the time they grow up.
+There is a more modern subsect of the worker school that is primarily composed of young shadowkin eager for change in their society, they have elected to choose their own jobs and as such ther own names despite being the vast minority & often looked down upon.
+Finally, there is the more liberal school of thought which believes that shadowkin should adopt names that reflect the popular culture of the dimension that they belong to.
+These shadowkin are a vast minority in our dimension and in shadowkin society as a whole so they are extremely few and far between as a result.
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/full.png
index 253eb0c3c9b..abe4a767c74 100644
Binary files a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/full.png and b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/full.png differ
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_f.png
index 9d99bd18903..ce502dbdc68 100644
Binary files a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_f.png and b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_f.png differ
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_m.png
index 9d99bd18903..ce502dbdc68 100644
Binary files a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_m.png and b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_m.png differ