Cleanups

Simple-Station · Sep 25, 2024 · 85e7639 · 85e7639
1 parent 964f4d3
commit 85e7639
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 63 deletions.
diff --git a/Resources/Locale/en-US/markings/shadowkin.ftl b/Resources/Locale/en-US/markings/shadowkin.ftl
@@ -1,7 +1,7 @@
-marking-EyesShadowkin=Shadowkin
+marking-EyesShadowkin = Shadowkin
 
-marking-TailShadowkin=Shadowkin
-marking-TailShadowkinBig=Shadowkin (Big)
-marking-TailShadowkinShorter=Shadowkin (Short)
-marking-TailShadowkinMedium=Shadowkin (Medium)
-marking-TailShadowkinBigFluff=Shadowkin (Big and Fluffy)
+marking-TailShadowkin = Shadowkin
+marking-TailShadowkinBig = Shadowkin (Big)
+marking-TailShadowkinShorter = Shadowkin (Short)
+marking-TailShadowkinMedium = Shadowkin (Medium)
+marking-TailShadowkinBigFluff = Shadowkin (Big and Fluffy)
diff --git a/Resources/Locale/en-US/traits/disabilities.ftl b/Resources/Locale/en-US/traits/disabilities.ftl
@@ -1,2 +1,5 @@
 trait-name-Nearsighted = Nearsighted
 trait-description-Nearsighted = You require glasses to see properly.
+
+trait-name-ShadowkinBlackeye = Blackeye
+trait-description-ShadowkinBlackeye = You lose your special Shadowkin powers, in return for some points.
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
@@ -2,7 +2,7 @@
   id: SlimeGradientLeftArm
   bodyPart: LArm
   markingCategory: LeftArm
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_arm
@@ -11,7 +11,7 @@
   id: SlimeGradientRightArm
   bodyPart: RArm
   markingCategory: RightArm
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_arm
@@ -20,7 +20,7 @@
   id: SlimeGradientLeftLeg
   bodyPart: LLeg
   markingCategory: LeftLeg
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_leg
@@ -29,7 +29,7 @@
   id: SlimeGradientRightLeg
   bodyPart: RLeg
   markingCategory: RightLeg
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_leg
@@ -38,7 +38,7 @@
   id: SlimeGradientLeftFoot
   bodyPart: LFoot
   markingCategory: LeftFoot
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_foot
@@ -47,7 +47,7 @@
   id: SlimeGradientRightFoot
   bodyPart: RFoot
   markingCategory: RightFoot
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_foot
@@ -56,7 +56,7 @@
   id: SlimeGradientLeftHand
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_hand
@@ -65,7 +65,7 @@
   id: SlimeGradientRightHand
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [SlimePerson]
+  speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_hand
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -2,7 +2,7 @@
   id: TattooHiveChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -16,7 +16,7 @@
   id: TattooNightlingChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -30,7 +30,7 @@
   id: TattooSilverburghLeftLeg
   bodyPart: LLeg
   markingCategory: LeftLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -44,7 +44,7 @@
   id: TattooSilverburghRightLeg
   bodyPart: RLeg
   markingCategory: RightLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -58,7 +58,7 @@
   id: TattooCampbellLeftArm
   bodyPart: LArm
   markingCategory: LeftArm
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -72,7 +72,7 @@
   id: TattooCampbellRightArm
   bodyPart: RArm
   markingCategory: RightArm
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -86,7 +86,7 @@
   id: TattooCampbellLeftLeg
   bodyPart: LLeg
   markingCategory: LeftLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -100,7 +100,7 @@
   id: TattooCampbellRightLeg
   bodyPart: RLeg
   markingCategory: RightLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
   coloring:
     default:
       type:

diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
@@ -7,19 +7,15 @@
   components:
   - type: HumanoidAppearance
     species: Shadowkin
-  - type: Hunger
-  - type: Thirst
   - type: Icon
     sprite: Mobs/Species/shadowkin.rsi
     state: full
   - type: Body
     prototype: Shadowkin
-    requiredLegs: 2
   - type: Flammable
     damage:
       types:
         Heat: 1.5 # burn more
-  - type: MobState
   - type: MobThresholds
     thresholds: # Weak
       0: Alive
@@ -45,11 +41,6 @@
       types:
         Bloodloss:
           -0.25
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
   - type: Temperature
     heatDamageThreshold: 330
     coldDamageThreshold: 195
@@ -74,47 +65,34 @@
         layer:
           - MobLayer
   - type: Sprite
-    scale: 0.85, 0.85 # Small
-  - type: Eye
-    zoom: "0.85, 0.85"
+    scale: 0.85, 0.85
   - type: MeleeWeapon
     soundHit:
-      collection: Punch
+      collection: AlienClaw
+    angle: 30
     animation: WeaponArcClaw
     damage:
       types:
-        Blunt: 2
-        Slash: 3
-        Piercing: 1
-  # - type: EmpathyChat
-  # - type: Shadowkin
-  # - type: ShadowkinDarkSwapPower
-  # - type: ShadowkinRestPower
-  # - type: ShadowkinTeleportPower
+        Slash: 5
   - type: Vocal
     sounds:
       Male: MaleSlime
       Female: FemaleSlime
       Unsexed: MaleSlime
-  - type: CombatMode
-    canDisarm: true
-  - type: MindContainer
-    showExamineInfo: true
-  - type: Input
-    context: "human"
-  - type: MobMover
-  - type: InputMover
-  - type: Alerts
-  - type: Actions
-  - type: CameraRecoil
-  - type: Examiner
-  - type: CanHostGuardian
-  - type: NpcFactionMember
-    factions:
-    - NanoTrasen
   - type: MovementSpeedModifier
     baseWalkSpeed : 2.7
     baseSprintSpeed : 4.5
+  - type: Flashable
+    eyeDamageChance: 0.3
+    eyeDamage: 1
+    durationMultiplier: 1.5
+  - type: LanguageKnowledge
+    speaks:
+    - TauCetiBasic
+    - Marish
+    understands:
+    - TauCetiBasic
+    - Marish
 
 
 - type: entity

diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
@@ -11,6 +11,7 @@
     - Reptilian
     - SlimePerson
     - IPCs
+    - Shadowkin
 
 - type: guideEntry
   id: Arachnid
@@ -51,3 +52,8 @@
   id: IPCs
   name: species-name-ipc
   text: "/ServerInfo/Guidebook/Mobs/IPCs.xml"
+
+- type: guideEntry
+  id: Shadowkin
+  name: species-name-shadowkin
+  text: "/ServerInfo/Guidebook/Mobs/Shadowkin.xml"
diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml
@@ -59,6 +59,30 @@
     Chest:
       points: 1
       required: false
+    RightLeg:
+      points: 2
+      required: false
+    RightFoot:
+      points: 2
+      required: false
+    LeftLeg:
+      points: 2
+      required: false
+    LeftFoot:
+      points: 2
+      required: false
+    RightArm:
+      points: 2
+      required: false
+    RightHand:
+      points: 2
+      required: false
+    LeftArm:
+      points: 2
+      required: false
+    LeftHand:
+      points: 2
+      required: false
 
 - type: humanoidBaseSprite
   id: MobShadowkinAnyMarkingFollowSkin

diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
@@ -203,6 +203,7 @@
       inverted: true
       species:
         - Vulpkanin # This trait functions exactly as-is for the Vulpkanin trait.
+        - Shadowkin
   components:
     - type: Flashable
       eyeDamageChance: 0.3

diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
@@ -305,6 +305,7 @@
       species:
         - Felinid # Felinids already have cat claws.
         - Reptilian # Reptilians also have cat claws.
+        - Shadowkin # Shadowkins also have claws.
         # - Vulpkanin # Vulpkanin have "Blunt" claws. One could argue this trait "Sharpens" their claws.
     - !type:CharacterTraitRequirement
       inverted: true

diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
@@ -183,6 +183,7 @@
           inverted: true
           species:
             - IPC
+            - Shadowkin
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
@@ -214,6 +215,7 @@
           inverted: true
           species:
             - IPC
+            - Shadowkin
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
@@ -249,6 +251,7 @@
           inverted: true
           species:
             - IPC
+            - Shadowkin
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
@@ -282,3 +285,4 @@
     - !type:CharacterSpeciesRequirement
       species:
         - IPC
+        - Shadowkin
diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml
@@ -67,8 +67,7 @@
   cost: 5
   requirements:
     - !type:CharacterSpeciesRequirement
-      inverted: true
       species:
         - Shadowkin
-  components:
-    - type: ShadowkinBlackeyeTrait
+  # components:
+  #   - type: ShadowkinBlackeyeTrait
diff --git a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
@@ -2,7 +2,7 @@
   # Slime People
 
   <Box>
-    <GuideEntityEmbed Entity="MobSlimePerson" Caption=""/>
+    <GuideEntityEmbed Entity="MobShadowkin" Caption=""/>
   </Box>
 
   They breathe nitrogen instead of oxygen, which is abundant in the station air, but harder to find compressed into gas tanks. They take significant damage if they are sprayed or splashed with water, but can

diff --git a/...Info/Guidebook/Species/shadowkin.Lore.txt → ...verInfo/Guidebook/Mobs/shadowkin.Lore.txt b/...Info/Guidebook/Species/shadowkin.Lore.txt → ...verInfo/Guidebook/Mobs/shadowkin.Lore.txt
diff --git a/...erverInfo/Guidebook/Species/shadowkin.xml → ...s/ServerInfo/Guidebook/Mobs/shadowkin.xml b/...erverInfo/Guidebook/Species/shadowkin.xml → ...s/ServerInfo/Guidebook/Mobs/shadowkin.xml
@@ -1,6 +1,10 @@
 <Document>
 # Shadowkin
 
+  <Box>
+    <GuideEntityEmbed Entity="MobSlimePerson" Caption=""/>
+  </Box>
+
 [color=#008000]Shadowkin are enabled for character creation.[/color]
 
 Fluffy lil' guys.