Vox Rework

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "dotnet.preferCSharpExtension": true
 }

Resources/Locale/en-US/accessories/vox-hair.ftl

@@ -1,13 +1,4 @@
+marking-VoxHairLongQuills = Long Vox Quills
+marking-VoxHairMohawk = Quillhawk?
 marking-VoxHairShortQuills = Short Vox Quills
-marking-VoxHairKingly = Vox Kingly
-marking-VoxHairAfro = Vox Afro
-marking-VoxHairMohawk = Vox Mohawk
-marking-VoxHairYasuhiro = Vox Yasuhiro
-marking-VoxHairHorns = Vox Horns
-marking-VoxHairNights = Vox Nights
-marking-VoxHairSurf = Vox Surf
-marking-VoxHairCropped = Vox Cropped
-marking-VoxHairRuffhawk = Vox Ruffhawk
-marking-VoxHairRows = Vox Rows
-marking-VoxHairMange = Vox Mange
-marking-VoxHairPony = Vox Pony
+marking-VoxHairStubble = Vox Stubble

Resources/Locale/en-US/markings/Vox.ftl

@@ -0,0 +1,44 @@
+marking-VoxClawsChest-ClawsChest = Vox Chest Claws
+marking-VoxClawsChest = Vox Claws
+
+marking-VoxClawsLHand-ClawsLArm = Vox Left Claws
+marking-VoxClawsLHand = Vox Left Claws
+
+marking-VoxClawsRHand-ClawsRArm = Vox Right Claws
+marking-VoxClawsRHand = Vox Right Claws
+
+marking-VoxClawsLFoot-ClawsLLeg = Vox Left Claws
+marking-VoxClawsLFoot = Vox Left Claws
+
+marking-VoxClawsRFoot-ClawsRLeg = Vox Right Claws
+marking-VoxClawsRFoot = Vox Right Claws
+
+marking-VoxLArmMarkings-ArmMarkingsL = Left Arm Markings
+marking-VoxLArmMarkings = Left Arm Markings
+
+marking-VoxRArmMarkings-ArmMarkingsR = Right Arm Markings
+marking-VoxRArmMarkings = Right Arm Markings
+
+marking-VoxCrest-Crest = Vox Crest
+marking-VoxCrest = Vox Crest
+
+marking-VoxNeckMarkings-Neck_Markings = Neck Markings
+marking-VoxNeckMarkings = Neck Markings
+
+marking-VoxBeak-Beak = Vox Beak
+marking-VoxBeak = Vox Beak
+
+marking-VoxTail-Tail = Vox Tail
+marking-VoxTail = Vox Tail
+
+marking-VoxScutesLArm-ScutesLArm = Vox Left Scutes
+marking-VoxScutesLArm = Vox Left Scutes
+
+marking-VoxScutesRArm-ScutesRArm = Vox Right Scutes
+marking-VoxScutesRArm = Vox Right Scutes
+
+marking-VoxScutesLLeg-ScutesLLeg = Vox Left Scutes
+marking-VoxScutesLLeg = Vox Left Scutes
+
+marking-VoxScutesRLeg-ScutesRLeg = Vox Right Scutes
+marking-VoxScutesRLeg = Vox Right Scutes

Resources/Locale/en-US/reagents/meta/biological.ftl

@@ -17,4 +17,7 @@ reagent-name-fat = fat
 reagent-desc-fat = No matter how it was obtained, its application is important.
 
 reagent-name-vomit = vomit
-reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
+reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
+
+reagent-name-VoxIchor = Ichor?
+reagent-desc-VoxIchor = A sickly, bruised black, like the last gasp of a dying star.

Resources/Locale/en-US/reagents/meta/physical-desc.ftl

@@ -90,8 +90,9 @@ reagent-physical-desc-exotic-smelling = exotic smelling
 reagent-physical-desc-energizing = energizing
 reagent-physical-desc-exhilarating = exhilarating
 reagent-physical-desc-vibrant = vibrant
+reagent-physical-desc-failed-ichor = bitter irony
 reagent-physical-desc-fluffy = fluffy
 reagent-physical-desc-alkaline = alkaline
 reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
-reagent-physical-desc-slimy = slimy
+reagent-physical-desc-slimy = slimy

Resources/Locale/en-US/species/species.ftl

@@ -7,4 +7,5 @@ species-name-slime = Slime Person
 species-name-diona = Diona
 species-name-arachnid = Arachnid
 species-name-moth = Moth Person
+species-name-vox = Vox
 species-name-skeleton = Skeleton

Resources/Prototypes/Body/Organs/vox.yml

@@ -6,3 +6,10 @@
   - type: Metabolizer
     metabolizerTypes: [ Vox ]
 
+- type: entity
+  id: OrganVoxHeart
+  parent: BaseHumanOrgan
+  suffix: "vox"
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [ Vox ]

Resources/Prototypes/Body/Parts/vox.yml

@@ -7,7 +7,8 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: Biological
+    damageContainer: VoxMade
+    damageModifierSet: Primalis
   - type: BodyPart
   - type: ContainerContainer
     containers:

Resources/Prototypes/Body/Prototypes/vox.yml

@@ -18,7 +18,7 @@
       - right leg
       - left leg
       organs:
-        heart: OrganHumanHeart
+        heart: OrganVoxHeart
         lungs: OrganVoxLungs
         stomach: OrganHumanStomach
         liver: OrganHumanLiver

Resources/Prototypes/Damage/containers.yml

@@ -47,3 +47,14 @@
     - Toxin
   supportedTypes:
     - Shock
+
+- type: damageContainer
+  id: VoxMade # Radiation-Proofing
+  supportedGroups:
+    - Brute
+    - Airloss
+  supportedTypes:
+    - Heat
+    - Shock
+    - Caustic
+    - Poison

Resources/Prototypes/Damage/modifier_sets.yml

@@ -250,6 +250,19 @@
     Radiation: 0.2
     Caustic: 0.0
 
+- type: damageModifierSet
+  id: Primalis
+  coefficients:
+    Blunt: 0.3
+    Slash: 0.5
+    Piercing: 0.7
+    Heat: 1.5
+    Shock: 1.25
+    Caustic: 0.2
+    Asphyxiation: 2.5
+    Bloodloss: 1.8
+    Poison: 1.1
+
 - type: damageModifierSet
   id: HellSpawn
   coefficients:

Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml

@@ -1,27 +1,11 @@
 - type: marking
-  id: VoxHairShortQuills
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_shortquills_s
-- type: marking
-  id: VoxHairKingly
+  id: VoxHairLongQuills
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_kingly_s
-- type: marking
-  id: VoxHairAfro
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_afro_s
+      state: vox_longquills_s
 - type: marking
   id: VoxHairMohawk
   bodyPart: Hair
@@ -31,74 +15,18 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: vox_mohawk_s
 - type: marking
-  id: VoxHairYasuhiro
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_yasu_s
-- type: marking
-  id: VoxHairHorns
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_horns_s
-- type: marking
-  id: VoxHairNights
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_nights_s
-- type: marking
-  id: VoxHairSurf
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_surf_s
-- type: marking
-  id: VoxHairCropped
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_cropped_s
-- type: marking
-  id: VoxHairRuffhawk
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_ruff_hawk_s
-- type: marking
-  id: VoxHairRows
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_rows_s
-- type: marking
-  id: VoxHairMange
+  id: VoxHairShortQuills
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_mange_s
+      state: vox_shortquills_s
 - type: marking
-  id: VoxHairPony
+  id: VoxHairStubble
   bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_pony_s
+      state: vox_stubble_s