From 7925e93cd8a5e1cb5a5882b00cde98748e6a3245 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 13 Jan 2025 15:31:11 -0600 Subject: [PATCH 01/69] Glass Cannon Shadowkin Shadowkins now have the following damage modifiers: 20% more blunt damage 30% more slash damage 20% more piercing damage Immune to asphyxiation 20% less cold damage 20% more heat damage 50% less cellular damage 35% more bloodloss damage 35% more shock damage 45% more radiation damage Signed-off-by: SixplyDev --- Resources/Prototypes/Damage/modifier_sets.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 3cc2bb4fd7d..cc2177c01d9 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -361,16 +361,16 @@ - type: damageModifierSet id: Shadowkin coefficients: - Blunt: 0.95 - Slash: 1.2 - Piercing: 1.1 + Blunt: 1.2 + Slash: 1.3 + Piercing: 1.2 Asphyxiation: 0 - Cold: 0.75 + Cold: 0.8 Heat: 1.2 - Cellular: 0.25 + Cellular: 0.50 Bloodloss: 1.35 - Shock: 1.25 - Radiation: 1.3 + Shock: 1.35 + Radiation: 1.45 - type: damageModifierSet id: DermalArmor From 4324266660dc2089038f2523ebd124507b461dfc Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 13 Jan 2025 15:34:41 -0600 Subject: [PATCH 02/69] No more darkswap No more darkswap. Boo wamp, needs some revamping before it's re-enabled. Signed-off-by: SixplyDev --- .../Psionics/Abilities/DarkSwapSystem.cs | 118 +++++++++--------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs index a3ea3f5c824..700a8a70770 100644 --- a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs +++ b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs @@ -1,60 +1,58 @@ -using Content.Shared.Abilities.Psionics; -using Content.Shared.Actions.Events; -using Content.Shared.Shadowkin; -using Content.Shared.Physics; -using Content.Shared.Popups; -using Content.Shared.Maps; -using Robust.Server.GameObjects; - -namespace Content.Server.Abilities.Psionics -{ - public sealed class DarkSwapSystem : EntitySystem - { - [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnPowerUsed); - } - - private void OnPowerUsed(DarkSwapActionEvent args) - { - if (TryComp(args.Performer, out var ethereal)) - { - var tileref = Transform(args.Performer).Coordinates.GetTileRef(); - if (tileref != null - && _physics.GetEntitiesIntersectingBody(args.Performer, (int) CollisionGroup.Impassable).Count > 0) - { - _popup.PopupEntity(Loc.GetString("revenant-in-solid"), args.Performer, args.Performer); - return; - } - - if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap")) - { - SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); - SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates); - RemComp(args.Performer, ethereal); - args.Handled = true; - } - } - else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost)) - { - var newethereal = EnsureComp(args.Performer); - newethereal.Darken = true; - - SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); - SpawnAtPosition("EffectFlashShadowkinDarkSwapOn", Transform(args.Performer).Coordinates); - - args.Handled = true; - } - - if (args.Handled) - _psionics.LogPowerUsed(args.Performer, "DarkSwap"); - } - } -} - - +# using Content.Shared.Abilities.Psionics; +# using Content.Shared.Actions.Events; +# using Content.Shared.Shadowkin; +# using Content.Shared.Physics; +# using Content.Shared.Popups; +# using Content.Shared.Maps; +# using Robust.Server.GameObjects; + +# namespace Content.Server.Abilities.Psionics +# { +# public sealed class DarkSwapSystem : EntitySystem +# { +# [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; +# [Dependency] private readonly SharedPopupSystem _popup = default!; +# [Dependency] private readonly PhysicsSystem _physics = default!; + +# public override void Initialize() +# { +# base.Initialize(); +# SubscribeLocalEvent(OnPowerUsed); +# } +# +# private void OnPowerUsed(DarkSwapActionEvent args) +# { +# if (TryComp(args.Performer, out var ethereal)) +# { +# var tileref = Transform(args.Performer).Coordinates.GetTileRef(); +# if (tileref != null +# && _physics.GetEntitiesIntersectingBody(args.Performer, (int) CollisionGroup.Impassable).Count > 0) +# { +# _popup.PopupEntity(Loc.GetString("revenant-in-solid"), args.Performer, args.Performer); +# return; +# } + +# if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap")) +# { +# SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); +# SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates); +# RemComp(args.Performer, ethereal); +# args.Handled = true; +# } +# } +# else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost)) +# { +# var newethereal = EnsureComp(args.Performer); +# newethereal.Darken = true; + +# SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); +# SpawnAtPosition("EffectFlashShadowkinDarkSwapOn", Transform(args.Performer).Coordinates); + +# args.Handled = true; +# } + +# if (args.Handled) +# _psionics.LogPowerUsed(args.Performer, "DarkSwap"); +# } +# } +# } From a5779005a1af0404a6be0d54d16d07c5b696def9 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 13 Jan 2025 15:35:18 -0600 Subject: [PATCH 03/69] Roundstart Shadowkin Shadowkins can now be enabled roundstart and chosen as a player species. Signed-off-by: SixplyDev --- Resources/Prototypes/Species/shadowkin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml index f7674e80d61..7cbd752092f 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" From ef4abfed6d6b01afac31a38b960de44fba88b487 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 13 Jan 2025 22:03:51 -0600 Subject: [PATCH 04/69] Wipes Guidebook Info Pending rewrite, saving it now in case I forget. Signed-off-by: SixplyDev --- .../ServerInfo/Guidebook/Mobs/Shadowkin.xml | 53 +++++++++---------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index f2f73ee6663..7a5347bbad2 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -1,36 +1,31 @@ # Shadowkin + All information in this document is written by SixplyDev)Github), also known as adriendaqt(Discord). -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 + + +## Biology + + + +## Unique Language + + + +## Misc. Notes + + + +## Species Traits +### Positive Traits + + + +### Negative Traits + + + From 59dbff90cd052342caae1ba1975c11351b483624 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 13 Jan 2025 23:33:21 -0600 Subject: [PATCH 05/69] Shadowkin Guidebook Lore Primer Wrote a lore primer for the shadowkin in the guidebook. Signed-off-by: SixplyDev --- Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index 7a5347bbad2..f495fdb648f 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -1,12 +1,22 @@ # Shadowkin - All information in this document is written by SixplyDev)Github), also known as adriendaqt(Discord). - +The origins of shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, + only that they started appearing one day. What is widely accepted is that they're not from this universe, + this dimension, or this plane of existence. We know that they originate from a dimension they simply refer to + as "the Dark" with not much explanation other than that. They have several evolutions that have allowed them to + continue in the way they are currently. The chief theory is that shadowkin are beings created by the nöösphere and + that the Dark where they live is in fact the nöösphere itself but this theory remains hotly contested due to the implications. + +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 From 01d2ef8a25fdddcc2f56d116f06ca801a886ca8d Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 18:26:34 -0600 Subject: [PATCH 06/69] Shadowkin Guidebook Biology Section Added the biology section of the shadowkin guidebook. Signed-off-by: SixplyDev --- .../ServerInfo/Guidebook/Mobs/Shadowkin.xml | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index f495fdb648f..788f6af2b96 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -5,22 +5,30 @@ -The origins of shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, - only that they started appearing one day. What is widely accepted is that they're not from this universe, - this dimension, or this plane of existence. We know that they originate from a dimension they simply refer to - as "the Dark" with not much explanation other than that. They have several evolutions that have allowed them to - continue in the way they are currently. The chief theory is that shadowkin are beings created by the nöösphere and - that the Dark where they live is in fact the nöösphere itself but this theory remains hotly contested due to the implications. +The origins of shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. +What is widely accepted is that they're not from this universe, this dimension, or this plane of existence. +We know that they originate from a dimension they simply refer to as "the Dark" with not much explanation other than that. +They have several evolutions that have allowed them to continue in the way they are currently. +The chief theory is that shadowkin are beings created by the nöösphere and that the Dark where they live is in fact the nöösphere itself, but this theory remains hotly contested due to the implications. 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. +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. +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 From ca43850cd94cf30abb4d28019cfcb5108dc1004f Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 18:50:29 -0600 Subject: [PATCH 07/69] Shadowkin Guidebook Language Section Added the unique language section of the shadowkin guidebook, updated formatting, and added another tidbit in biology. Signed-off-by: SixplyDev --- .../ServerInfo/Guidebook/Mobs/Shadowkin.xml | 69 ++++++++++--------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index 788f6af2b96..a305dd9b862 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -1,49 +1,56 @@ -# Shadowkin + # Shadowkin - - - + + + -The origins of shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. -What is widely accepted is that they're not from this universe, this dimension, or this plane of existence. -We know that they originate from a dimension they simply refer to as "the Dark" with not much explanation other than that. -They have several evolutions that have allowed them to continue in the way they are currently. -The chief theory is that shadowkin are beings created by the nöösphere and that the Dark where they live is in fact the nöösphere itself, but this theory remains hotly contested due to the implications. + The origins of shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. + What is widely accepted is that they're not from this universe, this dimension, or this plane of existence. + We know that they originate from a dimension they simply refer to as "the Dark" with not much explanation other than that. + They have several evolutions that have allowed them to continue in the way they are currently. + The chief theory is that shadowkin are beings created by the nöösphere and that the Dark where they live is in fact the nöösphere itself, but this theory remains hotly contested due to the implications. -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. + 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 + ## Biology -Shadowkin biology is rather unknown and obscure as there aren't currently many in the sector. -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. + 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 + ## 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. + Marish can be combined with Empathy to be spoken and transmitted at the same time, this is most common in small areas like stations where shadowkin know each other. + When Marish is combined with Empathy, it is known as Marish but in this form it's quite frequently exclusively used to communicate across far distances like Empathy rather than close spoken communication like Marish. + ## Misc. Notes -## Misc. Notes + ## Species Traits + ### Positive Traits -## Species Traits -### Positive Traits - -### Negative Traits + ### Negative Traits From 118630b0932e29127f0df22d4f08921043c3d4c8 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 18:52:29 -0600 Subject: [PATCH 08/69] Shadowkin Sexes There is now only male and female shadowkin as is in their lore. Signed-off-by: SixplyDev --- Resources/Prototypes/Species/shadowkin.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml index 7cbd752092f..7ef945ce402 100644 --- a/Resources/Prototypes/Species/shadowkin.yml +++ b/Resources/Prototypes/Species/shadowkin.yml @@ -18,7 +18,6 @@ sexes: - Male - Female - - Unsexed minHeight: 0.65 defaultHeight: 0.85 maxHeight: 1.15 From 654088a1afe90a643f87566d254aaae998a636cc Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 18:58:28 -0600 Subject: [PATCH 09/69] Species Guidebook - Shadowkin Shadowkin have been added to the species guidebook list. Signed-off-by: SixplyDev --- Resources/ServerInfo/Guidebook/Mobs/Species.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index cb74fd50c94..b70af719a86 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -13,6 +13,7 @@ + # Parkstation specific species From c9436708bdfb7a730d46ec5e996b1c8c9aa21e3a Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 18:59:32 -0600 Subject: [PATCH 10/69] Species Guidebook - Shadowkin (fixed) Removed the dummy part from the entity tag, added it back just so I don't throw any errors or flags. Signed-off-by: SixplyDev --- Resources/ServerInfo/Guidebook/Mobs/Species.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index b70af719a86..d7a9aef286c 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -13,7 +13,7 @@ - + # Parkstation specific species From b75365e8115f91276870ba7c48d88ef7d6e7d2d0 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 21:33:02 -0600 Subject: [PATCH 11/69] Shadowkin Guidebook Misc. Notes + Species Traits Shadowkin misc. notes and species traits sections have been filled in. Signed-off-by: SixplyDev --- .../ServerInfo/Guidebook/Mobs/Shadowkin.xml | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index a305dd9b862..1f0fd7208eb 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -43,14 +43,33 @@ ## 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]Lack of Lungs[/color]: + Shadowkin, as a result of living in a dimension where there is no air, do not have lungs. Their lack of lungs means they do not have the need to breathe. + + -[color=#303056]Empathy[/color]: + Shadowkin have their own language called Marish. In this case, it is a combination of Empathy and Marish that allows them to have a species hivemind. + -[color=#303056]Latent Psionic[/color]: + Shadowkin as a species are latent psionics, thus they can hear telepathy at all times. Telepathy is separate from their own hivemind. - + -[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 a vast majority of sources, rendering them glass cannons. - + -[color=#303056]Easy Target[/color]: + Due to the fact they're inherently psionic, they make for easy targets by over-eager epistemics staff. + + -[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. From 6350f2afe70f30689384ad8bba1ebc65c874a96f Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 21:37:06 -0600 Subject: [PATCH 12/69] Re-Enable DarkSwap DarkSwap revamp will be its own PR, not for this PR. Signed-off-by: SixplyDev --- .../Psionics/Abilities/DarkSwapSystem.cs | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs index 700a8a70770..493a8a8771a 100644 --- a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs +++ b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs @@ -1,58 +1,58 @@ -# using Content.Shared.Abilities.Psionics; -# using Content.Shared.Actions.Events; -# using Content.Shared.Shadowkin; -# using Content.Shared.Physics; -# using Content.Shared.Popups; -# using Content.Shared.Maps; -# using Robust.Server.GameObjects; +using Content.Shared.Abilities.Psionics; +using Content.Shared.Actions.Events; +using Content.Shared.Shadowkin; +using Content.Shared.Physics; +using Content.Shared.Popups; +using Content.Shared.Maps; +using Robust.Server.GameObjects; -# namespace Content.Server.Abilities.Psionics -# { -# public sealed class DarkSwapSystem : EntitySystem -# { -# [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; -# [Dependency] private readonly SharedPopupSystem _popup = default!; -# [Dependency] private readonly PhysicsSystem _physics = default!; +namespace Content.Server.Abilities.Psionics +{ + public sealed class DarkSwapSystem : EntitySystem + { + [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly PhysicsSystem _physics = default!; -# public override void Initialize() -# { -# base.Initialize(); -# SubscribeLocalEvent(OnPowerUsed); -# } -# -# private void OnPowerUsed(DarkSwapActionEvent args) -# { -# if (TryComp(args.Performer, out var ethereal)) -# { -# var tileref = Transform(args.Performer).Coordinates.GetTileRef(); -# if (tileref != null -# && _physics.GetEntitiesIntersectingBody(args.Performer, (int) CollisionGroup.Impassable).Count > 0) -# { -# _popup.PopupEntity(Loc.GetString("revenant-in-solid"), args.Performer, args.Performer); -# return; -# } + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnPowerUsed); + } -# if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap")) -# { -# SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); -# SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates); -# RemComp(args.Performer, ethereal); -# args.Handled = true; -# } -# } -# else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost)) -# { -# var newethereal = EnsureComp(args.Performer); -# newethereal.Darken = true; + private void OnPowerUsed(DarkSwapActionEvent args) + { + if (TryComp(args.Performer, out var ethereal)) + { + var tileref = Transform(args.Performer).Coordinates.GetTileRef(); + if (tileref != null + && _physics.GetEntitiesIntersectingBody(args.Performer, (int) CollisionGroup.Impassable).Count > 0) + { + _popup.PopupEntity(Loc.GetString("revenant-in-solid"), args.Performer, args.Performer); + return; + } -# SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); -# SpawnAtPosition("EffectFlashShadowkinDarkSwapOn", Transform(args.Performer).Coordinates); + if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap")) + { + SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); + SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates); + RemComp(args.Performer, ethereal); + args.Handled = true; + } + } + else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost)) + { + var newethereal = EnsureComp(args.Performer); + newethereal.Darken = true; -# args.Handled = true; -# } + SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); + SpawnAtPosition("EffectFlashShadowkinDarkSwapOn", Transform(args.Performer).Coordinates); -# if (args.Handled) -# _psionics.LogPowerUsed(args.Performer, "DarkSwap"); -# } -# } -# } + args.Handled = true; + } + + if (args.Handled) + _psionics.LogPowerUsed(args.Performer, "DarkSwap"); + } + } +} From bf616afcd042086c8d3e3c107f5b6c5f64f9d09a Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 21:41:48 -0600 Subject: [PATCH 13/69] Shadowkin DarkSwap Removal Shadowkin no longer get darkswap as an innate psionic ability. Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index b76e29d8e35..e970591fe69 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -15,7 +15,7 @@ - trigger: !type:DamageTypeTrigger damageType: Blunt - damage: 400 + damage: 300 behaviors: - !type:GibBehavior {} - !type:SpawnEntitiesBehavior @@ -231,9 +231,6 @@ mana: 100 maxMana: 200 noMana: shadowkin-tired - - type: InnatePsionicPowers - powersToAdd: - - DarkSwapPower - type: LanguageKnowledge speaks: - TauCetiBasic From 7cc2a8eb936c53dfa46c57f8a0123a0f5489adfd Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 14 Jan 2025 21:50:25 -0600 Subject: [PATCH 14/69] Shadowkin Parent Update Shadowkin have been given the BaseMobSpeciesOrganic parent to fix previous issues. Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index e970591fe69..4a3f22091f2 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -1,6 +1,7 @@ - type: entity save: false parent: + - BaseMobSpeciesOrganic - MobBloodstream - MobAtmosStandard - MobFlammable From 77a9bdf8b82a86b1da2ce428a535759b2ef83042 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Thu, 16 Jan 2025 16:08:57 -0600 Subject: [PATCH 15/69] Shadowkin Lore Wipe Wiped all the previous shadowkin lore, will be adding new lore as I have time. Signed-off-by: SixplyDev --- .../Guidebook/Mobs/shadowkin.Lore.txt | 126 +++--------------- 1 file changed, 15 insertions(+), 111 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt b/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt index e3cda6d77e2..bd5dcad0468 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt +++ b/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt @@ -4,101 +4,41 @@ [color=#a88b5e]Physicality[/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. -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. - -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. [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. -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. ## 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. -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. ## 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. + [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. +[color=#a88b5e]Rumors and Speculation[/color] -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 @@ -106,73 +46,37 @@ Extra information, should be read if playing Shadowkin, if not you should try to [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. +[color=#a88b5e]Shadowkin energy[/color] -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 + From 01b4f83aa29059e07d06a8a5d4200b74aa20f501 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:14:45 -0600 Subject: [PATCH 16/69] Shadowkin Lore Update Shadowkin have all new lore! YIPPEE!!!!! Signed-off-by: SixplyDev --- .../Guidebook/Mobs/shadowkin.Lore.txt | 107 ++++++++---------- 1 file changed, 47 insertions(+), 60 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt b/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt index bd5dcad0468..dc0d1e918fb 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt +++ b/Resources/ServerInfo/Guidebook/Mobs/shadowkin.Lore.txt @@ -2,81 +2,68 @@ ## Biology -[color=#a88b5e]Physicality[/color] +[color=#a88b5e]Physical Appearance[/color] +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 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. + +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] +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. +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 +[color=#a88b5e]Home Dimension[/color] - -[color=#a88b5e]Homeworld[/color] - - - -[color=#a88b5e]Racial/Government Status[/color] - - +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] - - - [color=#a88b5e]Language[/color] - +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] - - -[color=#a88b5e]Rumors and Speculation[/color] - - - -## OOC Notes - -Extra information, should be read if playing Shadowkin, if not you should try to learn this in gameplay. - -[color=#a88b5e]History[/color] - - - -[color=#a88b5e]Biology[/color] - - - -[color=#a88b5e]Shadowkin energy[/color] - - - -[color=#a88b5e]Shadowkin Abilities[/color] - - - -[color=#a88b5e]The Ritual[/color] - - - -[color=#a88b5e]Important Terminology[/color] - -[color=#a88b5e]Shadowkin:[/color] - - - -[color=#a88b5e]The Dark:[/color] - - - -[color=#a88b5e]Blackeyes:[/color] - - - -[color=#a88b5e]Mar:[/color] - +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. From 38e4b11a203e3260b8ec213b53ef022770c21db4 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:35:52 -0600 Subject: [PATCH 17/69] Marish Language Prototype Marish now has a much more fleshed out language prototype. Signed-off-by: SixplyDev --- .../Language/Species-Specific/marish.yml | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Language/Species-Specific/marish.yml b/Resources/Prototypes/Language/Species-Specific/marish.yml index 20b42a80d16..3b53d7dff1b 100644 --- a/Resources/Prototypes/Language/Species-Specific/marish.yml +++ b/Resources/Prototypes/Language/Species-Specific/marish.yml @@ -10,8 +10,8 @@ - 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 From b3d92c07af02fb0edf21f59689c796cdb5a46654 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:43:39 -0600 Subject: [PATCH 18/69] Shadowkin Species Traits The black eye trait is now enabled, gives back four points. Signed-off-by: SixplyDev --- Resources/Prototypes/Traits/species.yml | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index 771a796eefa..06fe6ae4a40 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -67,16 +67,16 @@ - 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 + requirements: + - !type:CharacterSpeciesRequirement + species: + - Shadowkin From 7e4be487f5b198ba5f5d6426231f54f08c77ac84 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:46:42 -0600 Subject: [PATCH 19/69] Shadowkin Traits Update Added the black eye trait to the traits description stuff. Signed-off-by: SixplyDev --- Resources/Locale/en-US/traits/traits.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 43dd9f66a93..3102f374937 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -519,3 +519,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 shadowkin in name and not in practice. From 667ffa7a608c7bac504da450fe6635d3bcb48a18 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:48:40 -0600 Subject: [PATCH 20/69] Shadowkin Prisoner Job Shadowkin must have the blackeye trait in order to be prisoners. Signed-off-by: SixplyDev --- .../Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index e892a480413..a97fd3c58ac 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: From 9a13690f2f28dd72ef080ff644274d7f45dda2a0 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:53:22 -0600 Subject: [PATCH 21/69] Shadowkin Mantis Shadowkin cannot be mantis if they have the blackeye trait. Signed-off-by: SixplyDev --- .../Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 6a143a78b11..d34385150ce 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 From 277d70f52777acebfec5bde04afff6ae579c3038 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:54:24 -0600 Subject: [PATCH 22/69] Shadowkin Mystagogue Shadowkin can no longer be mystagogue if they have the blackeyes trait. Signed-off-by: SixplyDev --- .../Prototypes/Roles/Jobs/Science/research_director.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index edc92bc8097..1a33dada050 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -19,6 +19,15 @@ - !type:CharacterTraitRequirement traits: - AnomalousPositronics + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" From 48a35e094a08fd4548c194e799b200218644957b Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:56:44 -0600 Subject: [PATCH 23/69] Shadowkin Chaplain Shadowkin cannot be chaplain if they have the blackeye trait. Signed-off-by: SixplyDev --- Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index b2c88fe212a..7f2d5bf1c93 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 From a609537a25233c60a0b9fafc217d00da07ca54f7 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 22:57:09 -0600 Subject: [PATCH 24/69] Shadowkin Cataloguer Shadowkin cannot be the cataloguer if they have the blackeye trait. Signed-off-by: SixplyDev --- Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index f2928c6b917..63dadf73f95 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 From 531b7e434f9139cc853378102503dbdd31a7d799 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 18 Jan 2025 23:11:15 -0600 Subject: [PATCH 25/69] Fixed Species YML Prototype Fixed a typo, oopsies. Signed-off-by: SixplyDev --- Resources/Prototypes/Traits/species.yml | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index 06fe6ae4a40..a3e29b37285 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -67,16 +67,16 @@ - 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 + requirements: + - !type:CharacterSpeciesRequirement + species: + - Shadowkin From 231155c1c0ce6d60089a67e39290c5b5a7a21b3c Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 10:30:32 -0600 Subject: [PATCH 26/69] Shadowkin Blackeye Bug I... hate.... blackeye shadowkin!!!!!!!!!!! Real talk though, shadowkin should no longer be bugged to have blackeye by default. Signed-off-by: SixplyDev --- Content.Server/Shadowkin/ShadowkinSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Shadowkin/ShadowkinSystem.cs b/Content.Server/Shadowkin/ShadowkinSystem.cs index b2b80191898..d9008413e23 100644 --- a/Content.Server/Shadowkin/ShadowkinSystem.cs +++ b/Content.Server/Shadowkin/ShadowkinSystem.cs @@ -47,7 +47,7 @@ private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeCo return; component.OldEyeColor = humanoid.EyeColor; - humanoid.EyeColor = component.BlackEyeColor; + humanoid.EyeColor = component.EyeColor; Dirty(uid, humanoid); } From a5585a5e0a3e2f29d5d3ca0f500b01ab1f3fd9bd Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 13:28:09 -0600 Subject: [PATCH 27/69] Shadowkin Organs Shadowkin now have a core, yippee!!!! Their core is equivalent to their "lungs" in this circumstance. Signed-off-by: SixplyDev --- .../Prototypes/Body/Organs/shadowkin.yml | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/shadowkin.yml b/Resources/Prototypes/Body/Organs/shadowkin.yml index 695ddec1ab2..b67a9baa909 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,26 @@ - 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 + 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 +49,7 @@ - type: entity id: OrganShadowkinAppendix parent: OrganHumanAppendix + Description: "I think it does nothing..." components: - type: Sprite sprite: Mobs/Species/Shadowkin/organs.rsi @@ -47,6 +60,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 +115,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 +124,4 @@ - type: Metabolizer maxReagents: 5 metabolizerTypes: [Shadowkin] - removeEmpty: true \ No newline at end of file + removeEmpty: true From 3dabc2910ad8fee0c77af7195bc30cf0fb73af7e Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 16:26:28 -0600 Subject: [PATCH 28/69] Shadowkin Naming Conventions Shadowkin now have updated naming conventions Signed-off-by: SixplyDev --- .../Prototypes/Datasets/Names/shadowkin.yml | 149 +++++++++++------- 1 file changed, 90 insertions(+), 59 deletions(-) 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 From eac7f5fa42f4522d072422cd9a7f17d6a9380861 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 19:51:53 -0600 Subject: [PATCH 29/69] Shadowkin Empathy Shadowkin now have their special language back, Empathy. This is their telepathic language and is not a visible language. Signed-off-by: SixplyDev --- .../Prototypes/Language/Species-Specific/empathy.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Resources/Prototypes/Language/Species-Specific/empathy.yml diff --git a/Resources/Prototypes/Language/Species-Specific/empathy.yml b/Resources/Prototypes/Language/Species-Specific/empathy.yml new file mode 100644 index 00000000000..6670c62ef3d --- /dev/null +++ b/Resources/Prototypes/Language/Species-Specific/empathy.yml @@ -0,0 +1,9 @@ +- type: language + id: Empathy + isVisibleLanguage: false + speech: + color: "#be3cc5" + fontId: Lymphatic + empathySpeech: true + speechVerbOverrides: + - chat-speech-verb-marish From 7bcbfaaf04c0808aae80335f3a3c79c863d24bae Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 19:53:01 -0600 Subject: [PATCH 30/69] Shadowkin Empathy Fix Added a comment to explain what Empathy is. Signed-off-by: SixplyDev --- Resources/Prototypes/Language/Species-Specific/empathy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Language/Species-Specific/empathy.yml b/Resources/Prototypes/Language/Species-Specific/empathy.yml index 6670c62ef3d..e117d6a6f53 100644 --- a/Resources/Prototypes/Language/Species-Specific/empathy.yml +++ b/Resources/Prototypes/Language/Species-Specific/empathy.yml @@ -1,3 +1,5 @@ +# Shadowkin telepathic hivemind language. + - type: language id: Empathy isVisibleLanguage: false From b9e9fc6ca096c4cad7ef50082ba27456bed6b859 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 19:53:48 -0600 Subject: [PATCH 31/69] Marish Language Fix Marish is no longer a hivemind language, it's now spoken-word only. Signed-off-by: SixplyDev --- Resources/Prototypes/Language/Species-Specific/marish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Language/Species-Specific/marish.yml b/Resources/Prototypes/Language/Species-Specific/marish.yml index 3b53d7dff1b..55b59b68e69 100644 --- a/Resources/Prototypes/Language/Species-Specific/marish.yml +++ b/Resources/Prototypes/Language/Species-Specific/marish.yml @@ -5,7 +5,7 @@ speech: color: "#be3cc5" fontId: Lymphatic - empathySpeech: true + empathySpeech: false speechVerbOverrides: - chat-speech-verb-marish obfuscation: From 8abe4c81821ff012a4ba2c280293146349e910a3 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 20:04:19 -0600 Subject: [PATCH 32/69] Empathy Languages FTL Adds the Empathy language to the menu & a description for it. Signed-off-by: SixplyDev --- Resources/Locale/en-US/language/languages.ftl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl index fb3b1a1d046..c70e6bb5436 100644 --- a/Resources/Locale/en-US/language/languages.ftl +++ b/Resources/Locale/en-US/language/languages.ftl @@ -62,7 +62,10 @@ 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-Empathy-name = Empathy +language-Empathy-description = An inherently empathic language, it could be described as a way for shadowkin to communicate with one another telepathically. language-ValyrianStandard-name = Valyrian Standard language-ValyrianStandard-description = From a84886b5af907cae58b2eeeb56c48fce99550b1e Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sun, 19 Jan 2025 21:46:38 -0600 Subject: [PATCH 33/69] Shadowkin Empathy Speaking Shadowkin now speak & understand Empathy as a race language. Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 4a3f22091f2..0e17ef0bd88 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -236,9 +236,11 @@ speaks: - TauCetiBasic - Marish + - Empathy understands: - TauCetiBasic - Marish + - Empathy - type: Tag tags: - CanPilot From 3cd3924d9860a8bf400574f3d81c5bd9c2758388 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 20 Jan 2025 14:01:19 -0600 Subject: [PATCH 34/69] Shadowkin Languages Grammar Fix Fixed the grammar for the shadowkin language menu/descriptions. Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: SixplyDev --- Resources/Locale/en-US/language/languages.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl index c70e6bb5436..f5e018a168d 100644 --- a/Resources/Locale/en-US/language/languages.ftl +++ b/Resources/Locale/en-US/language/languages.ftl @@ -62,10 +62,10 @@ 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 = A language spoken only by shadowkin, one that is unable to be replicated by normal tongues. +language-Marish-description = A language spoken only by Shadowkin, one that is unable to be replicated by normal tongues. language-Empathy-name = Empathy -language-Empathy-description = An inherently empathic language, it could be described as a way for shadowkin to communicate with one another telepathically. +language-Empathy-description = An inherently empathic language, it could be described as a way for Shadowkin to communicate with one another telepathically. language-ValyrianStandard-name = Valyrian Standard language-ValyrianStandard-description = From 1406cf65ef45efc2968c73b7eb564978a9b72e1f Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 20 Jan 2025 14:01:58 -0600 Subject: [PATCH 35/69] Shadowkin Guidebook Grammar Fix Fixed grammar in the guidebook Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: SixplyDev --- .../ServerInfo/Guidebook/Mobs/Shadowkin.xml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index 1f0fd7208eb..8f4ce842907 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -5,16 +5,16 @@ - The origins of shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. + The origins of Shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. What is widely accepted is that they're not from this universe, this dimension, or this plane of existence. We know that they originate from a dimension they simply refer to as "the Dark" with not much explanation other than that. They have several evolutions that have allowed them to continue in the way they are currently. - The chief theory is that shadowkin are beings created by the nöösphere and that the Dark where they live is in fact the nöösphere itself, but this theory remains hotly contested due to the implications. + The chief theory is that Shadowkin are beings created by the nöösphere and that the Dark where they live is in fact the nöösphere itself, but this theory remains hotly contested due to the implications. 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. + 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 @@ -23,9 +23,9 @@ 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. + 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. + 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. @@ -35,10 +35,10 @@ ## 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 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. - Marish can be combined with Empathy to be spoken and transmitted at the same time, this is most common in small areas like stations where shadowkin know each other. + Marish can be combined with Empathy to be spoken and transmitted at the same time, this is most common in small areas like stations where Shadowkin know each other. When Marish is combined with Empathy, it is known as Marish but in this form it's quite frequently exclusively used to communicate across far distances like Empathy rather than close spoken communication like Marish. ## Misc. Notes @@ -53,7 +53,7 @@ ### Positive Traits -[color=#303056]Lack of Lungs[/color]: Shadowkin, as a result of living in a dimension where there is no air, do not have lungs. Their lack of lungs means they do not have the need to breathe. - + -[color=#303056]Empathy[/color]: Shadowkin have their own language called Marish. In this case, it is a combination of Empathy and Marish that allows them to have a species hivemind. @@ -62,7 +62,7 @@ -[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 a vast majority of sources, rendering them glass cannons. @@ -71,5 +71,5 @@ Due to the fact they're inherently psionic, they make for easy targets by over-eager epistemics staff. -[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. + 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. From 66aadfeee72fbf7861dc6338ab0426129cda8ace Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 20 Jan 2025 14:02:35 -0600 Subject: [PATCH 36/69] Shadowkin Traits Grammar Fix Fixing some of the grammar in the shadowkin traits Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: SixplyDev --- Resources/Locale/en-US/traits/traits.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 3102f374937..5e457393783 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -522,4 +522,4 @@ trait-description-ThermographicVision = 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 shadowkin in name and not in practice. + 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. From 426af891f44bcd42311efaf66b2e522818f2a5a3 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 20 Jan 2025 21:31:49 -0600 Subject: [PATCH 37/69] trying to fix conflicts Will remove after, trying to fix conflicts. Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 0e17ef0bd88..630b63679aa 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -232,6 +232,9 @@ mana: 100 maxMana: 200 noMana: shadowkin-tired + - type: InnatePsionicPowers + powersToAdd: + - DarkSwapPower - type: LanguageKnowledge speaks: - TauCetiBasic From 9c23c71714d2f7cd4cf19f1b897d6dc44286adf9 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Mon, 20 Jan 2025 21:32:50 -0600 Subject: [PATCH 38/69] conflicts fixed Fixed the conflicts Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 50cecda4cf9..b21a84290ae 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -228,9 +228,6 @@ - type: Shadowkin - type: Psionic mindbreakingFeedback: shadowkin-blackeye - - type: InnatePsionicPowers - powersToAdd: - - DarkSwapPower - type: LanguageKnowledge speaks: - TauCetiBasic From 7b89e4edb45de2c05ff9a5c2138107d04dc37dc0 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 21 Jan 2025 08:52:01 -0600 Subject: [PATCH 39/69] Shadowkin Eye Color Shadowkin should no longer have blackeyes on default/spawning in. Signed-off-by: SixplyDev --- Content.Server/Shadowkin/ShadowkinSystem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/Shadowkin/ShadowkinSystem.cs b/Content.Server/Shadowkin/ShadowkinSystem.cs index 970b6875704..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.EyeColor; Dirty(uid, humanoid); } From 7dcac4ace43a710797e816a894cc7b95341d63b9 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 21 Jan 2025 09:37:39 -0600 Subject: [PATCH 40/69] Shadowkin Organs Fix Trying to fix a YAML error here, replacing their core with their lungs organ Signed-off-by: SixplyDev --- Resources/Prototypes/Body/Organs/shadowkin.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/shadowkin.yml b/Resources/Prototypes/Body/Organs/shadowkin.yml index b67a9baa909..7af35d6a6a4 100644 --- a/Resources/Prototypes/Body/Organs/shadowkin.yml +++ b/Resources/Prototypes/Body/Organs/shadowkin.yml @@ -27,13 +27,13 @@ state: ears - type: entity - id: OrganShadowkinCore + id: OrganShadowkinLungs parent: OrganHumanLungs - description: "What is this thing?" + description: "Huh I guess they do have lungs after all" components: - type: Sprite sprite: Mobs/Species/Shadowkin/organs.rsi - state: core + state: lungs - type: entity From c32d8264a0a0a7f1a09d07faa34dd2164e27bab7 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 21 Jan 2025 09:40:53 -0600 Subject: [PATCH 41/69] Shadowkin Damage Modifiers Update 2 Shadowkin now have the following modifiers: Slash: 20% more Piercing: 10% more Asphyxiation: 50% less Cold: 20% less Heat: 10% more Signed-off-by: SixplyDev --- Resources/Prototypes/Damage/modifier_sets.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index cc2177c01d9..3447e8e2c8d 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: 1.2 - Slash: 1.3 - Piercing: 1.2 - Asphyxiation: 0 + Slash: 1.2 + Piercing: 1.1 + Asphyxiation: 0.5 Cold: 0.8 - Heat: 1.2 - Cellular: 0.50 - Bloodloss: 1.35 - Shock: 1.35 - Radiation: 1.45 + Heat: 1.1 - type: damageModifierSet id: DermalArmor From 1f94a9451ed30f4e661406f6b8c9edd748d5d99f Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 21 Jan 2025 09:48:48 -0600 Subject: [PATCH 42/69] Shadowkin Damage Modifiers Update 3 Heat now does 20% instead of 10% Signed-off-by: SixplyDev --- Resources/Prototypes/Damage/modifier_sets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 3447e8e2c8d..1660564ac2d 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -365,7 +365,7 @@ Piercing: 1.1 Asphyxiation: 0.5 Cold: 0.8 - Heat: 1.1 + Heat: 1.2 - type: damageModifierSet id: DermalArmor From 6ce852d79925547954cc89ca8d9b6c0f4c90af34 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 21 Jan 2025 12:45:43 -0600 Subject: [PATCH 43/69] Shadowkin Examine Text Like the Lamia's a sad pile of scales, implies that shadowkin have a greater lung capacity & don't use as much oxygen as a normal individual. Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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." From b347e7838fe43fd485d936942cdda401bce5a9d4 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Tue, 21 Jan 2025 12:50:08 -0600 Subject: [PATCH 44/69] Shadowkin Traits Fixing Changed blackeye to modify the component rather than outright replace it. Should fix any potential issues with other traits. Signed-off-by: SixplyDev --- Resources/Prototypes/Traits/species.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index a3e29b37285..aaedc4606b5 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -72,7 +72,7 @@ category: Mental points: 4 functions: - - !type:TraitReplaceComponent + - !type:TraitModifyComponent components: - type: Shadowkin blackeyeSpawn: true From a961d0ec9f7325186ccc3444ebe3e6d5e2cd3a77 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Wed, 22 Jan 2025 13:00:40 -0600 Subject: [PATCH 45/69] Shadowkin Potentia Multiplyer Shadowkin now receive 25% more sources than others, letting them learn powers at 25% the rate. Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index b21a84290ae..150e8136bc7 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -237,6 +237,8 @@ - TauCetiBasic - Marish - Empathy + - type: PotentiaModifier + potentiaMultiplier: 1.25 - type: Tag tags: - CanPilot From d82568c57706a59b5e95499dfca9dab713a2366e Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Wed, 22 Jan 2025 13:05:32 -0600 Subject: [PATCH 46/69] Shadowkin Traits Update 2 Due to Shadowkin potentia modifier, they can no longer take high or low potential traits. Signed-off-by: SixplyDev --- Resources/Prototypes/Traits/mental.yml | 8 ++++++++ 1 file changed, 8 insertions(+) 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: From a7a8bf100d2faeb329240b5768d8e9370eac0d20 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Wed, 22 Jan 2025 23:11:38 -0600 Subject: [PATCH 47/69] Shadowkin Organs Reversion I've GOT to kill this YAML linter. I'll fix whatever the flip its problem is Signed-off-by: SixplyDev --- Resources/Prototypes/Body/Organs/shadowkin.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/shadowkin.yml b/Resources/Prototypes/Body/Organs/shadowkin.yml index 7af35d6a6a4..b67a9baa909 100644 --- a/Resources/Prototypes/Body/Organs/shadowkin.yml +++ b/Resources/Prototypes/Body/Organs/shadowkin.yml @@ -27,13 +27,13 @@ state: ears - type: entity - id: OrganShadowkinLungs + id: OrganShadowkinCore parent: OrganHumanLungs - description: "Huh I guess they do have lungs after all" + description: "What is this thing?" components: - type: Sprite sprite: Mobs/Species/Shadowkin/organs.rsi - state: lungs + state: core - type: entity From 146179a1f6a82445bb9ccb11ac3e37a397eecfee Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Thu, 23 Jan 2025 08:29:31 -0600 Subject: [PATCH 48/69] Shadowkin Organs Fix 2 I think I fixed le organs Signed-off-by: SixplyDev --- Resources/Prototypes/Body/Organs/shadowkin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Body/Organs/shadowkin.yml b/Resources/Prototypes/Body/Organs/shadowkin.yml index b67a9baa909..f4fb23face6 100644 --- a/Resources/Prototypes/Body/Organs/shadowkin.yml +++ b/Resources/Prototypes/Body/Organs/shadowkin.yml @@ -33,7 +33,8 @@ components: - type: Sprite sprite: Mobs/Species/Shadowkin/organs.rsi - state: core + layers: + - state: core - type: entity From 75bd5077b46f679eaf0e1d4e8474aefe91f922c1 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Thu, 23 Jan 2025 08:37:48 -0600 Subject: [PATCH 49/69] Shadowkin Blackeye Trait Fix Reverted the TraitModifyComponent to actually work with TraitReplaceComponent Signed-off-by: SixplyDev --- Resources/Prototypes/Traits/species.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index aaedc4606b5..a3e29b37285 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -72,7 +72,7 @@ category: Mental points: 4 functions: - - !type:TraitModifyComponent + - !type:TraitReplaceComponent components: - type: Shadowkin blackeyeSpawn: true From e3b16cd2f3d4631f55d122a0d6b0d930ed057e91 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Thu, 23 Jan 2025 08:44:44 -0600 Subject: [PATCH 50/69] Shadowkin Organs Fix 3 I fixed an issue that the YAML linter was crying about. I HATE THE YAML LINTER. Signed-off-by: SixplyDev --- Resources/Prototypes/Body/Organs/shadowkin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/shadowkin.yml b/Resources/Prototypes/Body/Organs/shadowkin.yml index f4fb23face6..8ee3fe1ef24 100644 --- a/Resources/Prototypes/Body/Organs/shadowkin.yml +++ b/Resources/Prototypes/Body/Organs/shadowkin.yml @@ -50,7 +50,7 @@ - type: entity id: OrganShadowkinAppendix parent: OrganHumanAppendix - Description: "I think it does nothing..." + description: "I think it does nothing..." components: - type: Sprite sprite: Mobs/Species/Shadowkin/organs.rsi @@ -61,7 +61,7 @@ - type: entity id: OrganShadowkinHeart parent: OrganHumanHeart - Description: "Oops, I think this belongs to someone!" + description: "Oops, I think this belongs to someone!" components: - type: Sprite sprite: Mobs/Species/Shadowkin/organs.rsi From 7dbf5367ea901342159a1fecd19d614d52f1124a Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Thu, 23 Jan 2025 09:22:34 -0600 Subject: [PATCH 51/69] Shadowkin Unarmed Damage Shadowkin now do 8 slash instead of just 5, makes them more viable in combat. Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 150e8136bc7..bfe199ed56b 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -208,7 +208,7 @@ animation: WeaponArcClaw damage: types: - Slash: 5 + Slash: 8 - type: Vocal sounds: Male: MaleShadowkin From b93be802fa19cfe64620b26076e4e0048708f3ab Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Thu, 23 Jan 2025 09:25:15 -0600 Subject: [PATCH 52/69] Shadowkin Empathy Manager Fix Added Empathy to the chat-language.ftl manager Signed-off-by: SixplyDev --- Resources/Locale/en-US/chat/managers/chat-language.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/en-US/chat/managers/chat-language.ftl b/Resources/Locale/en-US/chat/managers/chat-language.ftl index 00c41130eaa..ea1128c2101 100644 --- a/Resources/Locale/en-US/chat/managers/chat-language.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-language.ftl @@ -15,6 +15,7 @@ chat-language-RobotTalk-name = Binary chat-language-ValyrianStandard-name = Valyrian chat-language-Sign-name = Sign chat-language-Marish-name = Marish +chat-language-Empathy-name = Empathy # Animal Languages From 227e52f9a1475202575a36665c93bb07c568435e Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Thu, 23 Jan 2025 16:05:05 -0600 Subject: [PATCH 53/69] Uhhh robust toolbox fix --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index ee906af16e1..e4190f4f290 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit ee906af16e136c7e09930d88872ab9bba3137c8e +Subproject commit e4190f4f2900634e332208a77cd6df9cef75c29a From fd275edafade7d0dc23fa5fcfc709a6317b20dc1 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Thu, 23 Jan 2025 16:07:38 -0600 Subject: [PATCH 54/69] Uhhh added their lungs to their core and stuff --- Resources/Prototypes/Body/Prototypes/shadowkin.yml | 1 + 1 file changed, 1 insertion(+) 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: From af24956f423d07e0e8befa29e392548bb14765ae Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Fri, 24 Jan 2025 17:49:15 -0600 Subject: [PATCH 55/69] Shadowkin Minor Retexturing --- .../Mobs/Species/Shadowkin/parts.rsi/full.png | Bin 4851 -> 3785 bytes .../Species/Shadowkin/parts.rsi/head_f.png | Bin 849 -> 934 bytes .../Species/Shadowkin/parts.rsi/head_m.png | Bin 849 -> 934 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/full.png index 253eb0c3c9b22d063b9f7d3294bd0f3c1441a037..abe4a767c743f9f8e171b696ff41b8cf295fc6ec 100644 GIT binary patch literal 3785 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 literal 4851 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 Date: Fri, 24 Jan 2025 18:33:47 -0600 Subject: [PATCH 56/69] Shadowkin Guidebook Fix --- .../ServerInfo/Guidebook/Mobs/Shadowkin.xml | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index 8f4ce842907..266ab0b2f57 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -5,41 +5,44 @@ - The origins of Shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. - What is widely accepted is that they're not from this universe, this dimension, or this plane of existence. - We know that they originate from a dimension they simply refer to as "the Dark" with not much explanation other than that. - They have several evolutions that have allowed them to continue in the way they are currently. + The origins of Shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. + What is widely accepted is that they're not from this universe, this dimension, or this plane of existence. + We know that they originate from a dimension they simply refer to as "the Dark" with not much explanation other than that. + They have several evolutions that have allowed them to continue in the way they are currently. The chief theory is that Shadowkin are beings created by the nöösphere and that the Dark where they live is in fact the nöösphere itself, but this theory remains hotly contested due to the implications. 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. + 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. + 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. + 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. + 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 + ## Unique Languages - [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. - Marish can be combined with Empathy to be spoken and transmitted at the same time, this is most common in small areas like stations where Shadowkin know each other. - When Marish is combined with Empathy, it is known as Marish but in this form it's quite frequently exclusively used to communicate across far distances like Empathy rather than close spoken communication like Marish. + +- [color=#2c2d33]Empathy[/color]: + Empathy is the telepathic language that's used by Shadowkin in order to communicate over long distances or just to everyone else in the nearby area. + It was developed when they were in the Dark, little air being in the dimension meant that they had to find ways to communicate while effectively conserving the air that they had. + As a result, Empathy was created to accomplish this purpose as it is a language that does not use one's tongue or lungs. ## Misc. Notes @@ -51,8 +54,8 @@ ## Species Traits ### Positive Traits - -[color=#303056]Lack of Lungs[/color]: - Shadowkin, as a result of living in a dimension where there is no air, do not have lungs. Their lack of lungs means they do not have the need to breathe. + -[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]Empathy[/color]: Shadowkin have their own language called Marish. In this case, it is a combination of Empathy and Marish that allows them to have a species hivemind. From 755e18100bd65667635bd1560c84d959ff643cf5 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 11:53:18 -0600 Subject: [PATCH 57/69] Pretty sure I fixed my Robust Toolbox error --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index e4190f4f290..ee906af16e1 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit e4190f4f2900634e332208a77cd6df9cef75c29a +Subproject commit ee906af16e136c7e09930d88872ab9bba3137c8e From 810c6b862af35ee66c8a53b751c9c1a56c3f09fc Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 25 Jan 2025 12:15:00 -0600 Subject: [PATCH 58/69] Shadowkin Blackeye Trait Fix Fixing the blackeye trait to work properly. Co-authored-by: VMSolidus Signed-off-by: SixplyDev --- Resources/Prototypes/Traits/species.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index a3e29b37285..20874d6d6df 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -76,6 +76,9 @@ components: - type: Shadowkin blackeyeSpawn: true + - !type:TraitRemoveComponent + components: + - type: Psionic requirements: - !type:CharacterSpeciesRequirement species: From 2b689d163471d58d48e4b3beab3c99bf85fd6e02 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 25 Jan 2025 12:19:27 -0600 Subject: [PATCH 59/69] Shadowkin Guidebook Lore Update New lore rewritten in the guidebook to fit their different adaptations. Co-authored-by: VMSolidus Signed-off-by: SixplyDev --- Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index 266ab0b2f57..849bd5a2621 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -5,11 +5,7 @@ - The origins of Shadowkin are largely disputed among scholars as nobody really knows exactly where they're from, only that they started appearing one day. - What is widely accepted is that they're not from this universe, this dimension, or this plane of existence. - We know that they originate from a dimension they simply refer to as "the Dark" with not much explanation other than that. - They have several evolutions that have allowed them to continue in the way they are currently. - The chief theory is that Shadowkin are beings created by the nöösphere and that the Dark where they live is in fact the nöösphere itself, but this theory remains hotly contested due to the implications. + 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. From 1c6e425be1eba16dcba2aad6542844b3f1553dc6 Mon Sep 17 00:00:00 2001 From: SixplyDev Date: Sat, 25 Jan 2025 12:28:58 -0600 Subject: [PATCH 60/69] Shadowkin Claws Damage 8 damage was too good for their claws, damage is reduced back to 5 Co-authored-by: VMSolidus Signed-off-by: SixplyDev --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index bfe199ed56b..150e8136bc7 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -208,7 +208,7 @@ animation: WeaponArcClaw damage: types: - Slash: 8 + Slash: 5 - type: Vocal sounds: Male: MaleShadowkin From 831d63de283b34198c94da3a5d3ace469d62a76a Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 12:48:16 -0600 Subject: [PATCH 61/69] Shadowkin Review Fixes --- Resources/Locale/en-US/chat/managers/chat-language.ftl | 1 - Resources/Locale/en-US/language/languages.ftl | 3 --- .../Prototypes/Entities/Mobs/Species/shadowkin.yml | 10 +++------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Resources/Locale/en-US/chat/managers/chat-language.ftl b/Resources/Locale/en-US/chat/managers/chat-language.ftl index ea1128c2101..00c41130eaa 100644 --- a/Resources/Locale/en-US/chat/managers/chat-language.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-language.ftl @@ -15,7 +15,6 @@ chat-language-RobotTalk-name = Binary chat-language-ValyrianStandard-name = Valyrian chat-language-Sign-name = Sign chat-language-Marish-name = Marish -chat-language-Empathy-name = Empathy # Animal Languages diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl index f5e018a168d..3418d368347 100644 --- a/Resources/Locale/en-US/language/languages.ftl +++ b/Resources/Locale/en-US/language/languages.ftl @@ -64,9 +64,6 @@ language-Sign-description = TCB-SL for short, this sign language is prevalent am language-Marish-name = Marish language-Marish-description = A language spoken only by Shadowkin, one that is unable to be replicated by normal tongues. -language-Empathy-name = Empathy -language-Empathy-description = An inherently empathic language, it could be described as a way for Shadowkin to communicate with one another telepathically. - language-ValyrianStandard-name = Valyrian Standard language-ValyrianStandard-description = A language descended from eastern european languages of old earth - Valyrian Standard is the commonly spoken tongue of Harpies brought up on their homeworld of Valyrian 4b diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index bfe199ed56b..4d62e494d7c 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -2,11 +2,6 @@ save: false parent: - BaseMobSpeciesOrganic - - MobBloodstream - - MobAtmosStandard - - MobFlammable - - BaseMobSpecies - - MobRespirator id: MobShadowkinBase name: Urist McShadow abstract: true @@ -228,15 +223,16 @@ - type: Shadowkin - type: Psionic mindbreakingFeedback: shadowkin-blackeye + - type: InnatePsionicPowers + powersToAdd: + - TelepathyPower - type: LanguageKnowledge speaks: - TauCetiBasic - Marish - - Empathy understands: - TauCetiBasic - Marish - - Empathy - type: PotentiaModifier potentiaMultiplier: 1.25 - type: Tag From 440b9a151ff332a50e00b99b99713c255d347568 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 13:06:32 -0600 Subject: [PATCH 62/69] Shadowkin Guidebook Traits Update --- .../ServerInfo/Guidebook/Mobs/Shadowkin.xml | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml index 849bd5a2621..36b7afe5af6 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Shadowkin.xml @@ -5,7 +5,7 @@ - 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. + 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. @@ -28,18 +28,13 @@ 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 Languages + ## 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. -- [color=#2c2d33]Empathy[/color]: - Empathy is the telepathic language that's used by Shadowkin in order to communicate over long distances or just to everyone else in the nearby area. - It was developed when they were in the Dark, little air being in the dimension meant that they had to find ways to communicate while effectively conserving the air that they had. - As a result, Empathy was created to accomplish this purpose as it is a language that does not use one's tongue or lungs. - ## Misc. Notes - Shadowkin, unlike harpies, do in fact hatch from eggs. @@ -53,21 +48,21 @@ -[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]Empathy[/color]: - Shadowkin have their own language called Marish. In this case, it is a combination of Empathy and Marish that allows them to have a species hivemind. + -[color=#303056]Innate Telepathy[/color]: + Shadowkin are innately telepathic, allowing them to communicate with other psionic individuals at will. - -[color=#303056]Latent Psionic[/color]: - Shadowkin as a species are latent psionics, thus they can hear telepathy at all times. Telepathy is separate from their own hivemind. + -[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 a vast majority of sources, rendering them glass cannons. + 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. + 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. From 4fd04465d20f04026f0c83a740a059a99fffbfc6 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 13:45:04 -0600 Subject: [PATCH 63/69] Shadowkin Hair Update --- Resources/Prototypes/Species/shadowkin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml index 7ef945ce402..1a58c03d7ef 100644 --- a/Resources/Prototypes/Species/shadowkin.yml +++ b/Resources/Prototypes/Species/shadowkin.yml @@ -30,6 +30,7 @@ sprites: Head: MobShadowkinHead Snout: MobShadowkinAnyMarkingFollowSkin + Hair: MobHumanoidAnyMarking HeadTop: MobShadowkinAnyMarkingFollowSkin HeadSide: MobShadowkinAnyMarkingFollowSkin Tail: MobShadowkinAnyMarkingFollowSkin @@ -55,6 +56,8 @@ points: 1 required: true defaultMarkings: [EarsShadowkin] + Hair: + points: 1 Chest: points: 1 required: false From 0df83ada84e922344682bb61502a37e764e27732 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 14:02:49 -0600 Subject: [PATCH 64/69] YAML Linter Fix --- Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index ab1abdf2dae..bdb9ff3b785 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -223,7 +223,7 @@ - type: Shadowkin - type: Psionic mindbreakingFeedback: shadowkin-blackeye - - type: InnatePsionicPowers + - type: InnatePsionicPowers powersToAdd: - TelepathyPower - type: LanguageKnowledge From 328c3e09184fc4baac2ba2125076d2453ef593b4 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 14:21:16 -0600 Subject: [PATCH 65/69] Fixed merge conflicts, removed Shadowkin hair --- Resources/Prototypes/Species/shadowkin.yml | 3 --- Resources/ServerInfo/Guidebook/Mobs/Species.xml | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml index 1a58c03d7ef..7ef945ce402 100644 --- a/Resources/Prototypes/Species/shadowkin.yml +++ b/Resources/Prototypes/Species/shadowkin.yml @@ -30,7 +30,6 @@ sprites: Head: MobShadowkinHead Snout: MobShadowkinAnyMarkingFollowSkin - Hair: MobHumanoidAnyMarking HeadTop: MobShadowkinAnyMarkingFollowSkin HeadSide: MobShadowkinAnyMarkingFollowSkin Tail: MobShadowkinAnyMarkingFollowSkin @@ -56,8 +55,6 @@ points: 1 required: true defaultMarkings: [EarsShadowkin] - Hair: - points: 1 Chest: points: 1 required: false diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index d7a9aef286c..6e8cf606880 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -14,8 +14,9 @@ + - + # Parkstation specific species From cb2ee99acae40d2c6dda826a16443e7c0f40803f Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 14:22:27 -0600 Subject: [PATCH 66/69] Fixing merge conflicts (again) --- Resources/ServerInfo/Guidebook/Mobs/Species.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index 6e8cf606880..3e555907fa6 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -13,8 +13,8 @@ - + # Parkstation specific species From 1912bd58631260391f228c2ea846dbcc70467f72 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 14:23:17 -0600 Subject: [PATCH 67/69] Fix merge conflicts (hopefully for the last time) --- Resources/ServerInfo/Guidebook/Mobs/Species.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index 3e555907fa6..b683b93db1d 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -14,7 +14,6 @@ - # Parkstation specific species From f863cb1b7ac0b21697be5f9e3e5a582110e86462 Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 14:24:18 -0600 Subject: [PATCH 68/69] Readded Shadowkin to the guidebook (removed due to merge conflict) --- Resources/ServerInfo/Guidebook/Mobs/Species.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index b683b93db1d..6e8cf606880 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -13,6 +13,7 @@ + From b20887bf5f4528608775d8451d9e696752bc730d Mon Sep 17 00:00:00 2001 From: ShirouAjisai Date: Sat, 25 Jan 2025 14:57:54 -0600 Subject: [PATCH 69/69] Removed Empathy File --- .../Prototypes/Language/Species-Specific/empathy.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Resources/Prototypes/Language/Species-Specific/empathy.yml diff --git a/Resources/Prototypes/Language/Species-Specific/empathy.yml b/Resources/Prototypes/Language/Species-Specific/empathy.yml deleted file mode 100644 index e117d6a6f53..00000000000 --- a/Resources/Prototypes/Language/Species-Specific/empathy.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Shadowkin telepathic hivemind language. - -- type: language - id: Empathy - isVisibleLanguage: false - speech: - color: "#be3cc5" - fontId: Lymphatic - empathySpeech: true - speechVerbOverrides: - - chat-speech-verb-marish