Simple-Station · VMSolidus · Jan 26, 2025 · Jan 13, 2025 · Jan 13, 2025 · Jan 13, 2025
@@ -56,5 +56,3 @@ private void OnPowerUsed(DarkSwapActionEvent args)
         }
     }
 }
-
-
@@ -45,7 +45,6 @@ private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeCo
             return;
 
         component.OldEyeColor = humanoid.EyeColor;
-        humanoid.EyeColor = component.BlackEyeColor;
         Dirty(uid, humanoid);
     }
 

@@ -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 =

@@ -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.
@@ -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
+    removeEmpty: true
@@ -23,6 +23,7 @@
         stomach: OrganShadowkinStomach
         liver:  OrganShadowkinLiver
         kidneys: OrganShadowkinKidneys
+        lungs: OrganShadowkinCore
     right arm:
       part: RightArmShadowkin
       connections:

@@ -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

@@ -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
@@ -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."
@@ -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,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

@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,5 +56,3 @@ private void OnPowerUsed(DarkSwapActionEvent args)
		}
		}
		}
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             component.OldEyeColor = humanoid.EyeColor;
-            humanoid.EyeColor = component.BlackEyeColor;
             Dirty(uid, humanoid);
         }
@@ Expand Down @@