Vox names, species prototype cleanup, some cosmetic changes (#24994)

* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad

Content.Shared/Humanoid/NamingSystem.cs

@@ -26,6 +26,9 @@ namespace Content.Shared.Humanoid
 
             switch (speciesProto.Naming)
             {
+                case SpeciesNaming.First:
+                    return Loc.GetString("namepreset-first",
+                        ("first", GetFirstName(speciesProto, gender)));
                 case SpeciesNaming.TheFirstofLast:
                     return Loc.GetString("namepreset-thefirstoflast",
                         ("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto)));

Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs

@@ -124,6 +124,7 @@ public sealed partial class SpeciesPrototype : IPrototype
 
 public enum SpeciesNaming : byte
 {
+    First,
     FirstLast,
     FirstDashFirst,
     TheFirstofLast,

Resources/Audio/Voice/Talk/attributions.yml

@@ -31,3 +31,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "Goonstation, Modified by Whisper"
   source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"
+
+- files: ["vox.ogg","vox_ask.ogg","vox_exclaim.ogg" ]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Derived from shriek1.ogg by Errant"
+  source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"

Resources/Locale/en-US/chat/managers/chat-manager.ftl

@@ -92,6 +92,10 @@ chat-speech-verb-skeleton-1 = rattles
 chat-speech-verb-skeleton-2 = clacks
 chat-speech-verb-skeleton-3 = gnashes
 
+chat-speech-verb-vox-1 = screeches
+chat-speech-verb-vox-2 = shrieks
+chat-speech-verb-vox-3 = croaks
+
 chat-speech-verb-canine-1 = barks
 chat-speech-verb-canine-2 = woofs
 chat-speech-verb-canine-3 = howls

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

@@ -10,6 +10,9 @@ reagent-desc-slime = You thought this was gradient blood at first, but you were
 reagent-name-hemocyanin-blood = blue blood
 reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives it a distinct blue color.
 
+reagent-name-ammonia-blood = anaerobic blood
+reagent-desc-ammonia-blood = Nothing else in the entire galaxy smells quite so appalling.
+
 reagent-name-zombie-blood = zombie blood
 reagent-desc-zombie-blood = Would not advise eating. Can be used to create an inoculation against the infection.
 
@@ -20,4 +23,4 @@ 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.

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

@@ -1,3 +1,4 @@
+namepreset-first = {$first}
 namepreset-firstlast = {$first} {$last}
 namepreset-firstdashfirst = {$first1}-{$first2}
-namepreset-thefirstoflast = The {$first} of {$last}
+namepreset-thefirstoflast = The {$first} of {$last}

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

@@ -8,3 +8,4 @@ species-name-diona = Diona
 species-name-arachnid = Arachnid
 species-name-moth = Moth Person
 species-name-skeleton = Skeleton
+species-name-vox = Vox

Resources/Prototypes/Damage/modifier_sets.yml

@@ -66,7 +66,7 @@
     Piercing: 0.7
     Shock: 2
     Heat: 3
-    
+
 # Like metallic, but without flat reduction so it can be damaged with fists.
 - type: damageModifierSet
   id: FlimsyMetallic
@@ -190,6 +190,11 @@
     Cold: 0.7
     Heat: 1.3
 
+- type: damageModifierSet
+  id: Vox
+  coefficients: # To be decided
+    Poison: 1
+
 - type: damageModifierSet
   id: Zombie #Blunt resistant and immune to biological threats, but can be hacked apart and burned
   coefficients:

Resources/Prototypes/Entities/Mobs/Species/vox.yml

@@ -8,105 +8,45 @@
   - type: Icon
     sprite: Mobs/Species/Vox/parts.rsi
     state: vox_m
-  - type: Sprite
-    layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: torso_m
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: head_m
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-        color: "#008800"
-        sprite: Mobs/Customization/eyes.rsi
-        state: vox_eyes_s
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_arm
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_arm
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_leg
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_leg
-      # Vox don't have female clothing masks.
-      #- shader: StencilClear
-      #  sprite: Mobs/Species/Vox/parts.rsi
-      #  state: l_leg
-      #- shader: StencilMask
-      #  map: [ "enum.HumanoidVisualLayers.FemaleStencilMask" ]
-      #  sprite: Mobs/Customization/masking_helpers.rsi
-      #  state: female_full
-      #  visible: false
-      #- map: [ "jumpsuit" ]
-      #  shader: StencilDraw
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_hand
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_hand
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_foot
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_foot
-      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: [ "gloves" ]
-      - map: [ "shoes" ]
-      - map: [ "ears" ]
-      - map: [ "outerClothing" ]
-      - map: [ "eyes" ]
-      - map: [ "belt" ]
-      - map: [ "id" ]
-      - map: [ "neck" ]
-      - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-        state: shaved
-        sprite: Mobs/Customization/human_facial_hair.rsi
-      - map: [ "enum.HumanoidVisualLayers.Hair" ]
-        state: bald
-        sprite: Mobs/Customization/human_hair.rsi
-      - map: [ "mask" ]
-      - map: [ "head" ]
-      - map: [ "pocket1" ]
-      - map: [ "pocket2" ]
   - type: Body
     prototype: Vox
     requiredLegs: 2
-  # Vox nitrogen stuff is handled in their metabolism
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 2
-    damageRecovery:
-      types:
-        Asphyxiation: -1.0
   - type:  HumanoidAppearance
     species: Vox
-    # canColorHair: false
-    # canColorFacialHair: false
-  - type: Inventory
-    speciesId: vox
-  - type: InventorySlots
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-    - id: FoodMeatChicken
-      amount: 5
+    #- type: VoxAccent # Not yet coded
+  - type: Speech
+    speechVerb: Vox
+    speechSounds: Vox
+  - type: TypingIndicator
+    proto: vox
   - type: Vocal
     sounds:
       Male: UnisexVox
       Female: UnisexVox
       Unsexed: UnisexVox
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatChicken
+      amount: 5
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: Vox
+  - type: DamageVisuals
+    damageOverlayGroups:
+      Brute:
+        sprite: Mobs/Effects/brute_damage.rsi
+        color: "#7a8bf2"
+  - type: Bloodstream
+    bloodReagent: AmmoniaBlood
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/pierce.ogg
+    angle: 30
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 5 # Reduce?
 
 - type: entity
   parent: BaseSpeciesDummy

Resources/Prototypes/Reagents/biological.yml

@@ -91,6 +91,18 @@
   physicalDesc: reagent-physical-desc-ferrous
   slippery: false
 
+- type: reagent
+  parent: Blood
+  id: AmmoniaBlood
+  name: reagent-name-ammonia-blood
+  group: Biological
+  desc: reagent-desc-ammonia-blood
+  flavor: bitter
+  color: "#7a8bf2"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-pungent
+  slippery: false
+
 - type: reagent
   id: ZombieBlood
   name: reagent-name-zombie-blood
@@ -183,4 +195,4 @@
   footstepSound:
     collection: FootstepBlood
     params:
-      volume: 6
+      volume: 6

Resources/Prototypes/Species/vox.yml

@@ -1,12 +1,18 @@
 - type: species
   id: Vox
-  name: Vox
+  name: species-name-vox
   roundStart: false # sad...
   prototype: MobVox
   sprites: MobVoxSprites
   markingLimits: MobVoxMarkingLimits
   dollPrototype: MobVoxDummy
   skinColoration: Hues
+  maleFirstNames: names_vox
+  femaleFirstNames: names_vox
+  naming: First
+  sexes:
+    - Unsexed
+
 
 - type: speciesBaseSprites
   id: MobVoxSprites

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -157,10 +157,14 @@
 
 - type: emoteSounds
   id: UnisexVox
-  sound:
-    path: /Audio/Voice/Vox/shriek1.ogg
-    params:
-      variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Vox/shriek1.ogg
+    Laugh:
+      path: /Audio/Voice/Vox/vox_laugh.ogg
+  params:
+    variation: 0.125
+    # We need vox sounds for the other emotes
 
 - type: emoteSounds
   id: UnisexDiona

Resources/Prototypes/Voice/speech_sounds.yml

@@ -88,6 +88,15 @@
   exclaimSound:
     path: /Audio/Voice/Talk/slime_exclaim.ogg
 
+- type: speechSounds
+  id: Vox
+  saySound:
+    path: /Audio/Voice/Talk/vox.ogg
+  askSound:
+    path: /Audio/Voice/Talk/vox_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/vox_exclaim.ogg
+
 - type: speechSounds
   id: Arachnid
   saySound:
@@ -105,7 +114,7 @@
     path: /Audio/Animals/cat_meow.ogg
   exclaimSound:
     path: /Audio/Animals/cat_meow.ogg
-    
+
 - type: speechSounds
   id: Dog
   saySound:
@@ -113,4 +122,4 @@
   askSound:
     path: /Audio/Animals/dog_bark3.ogg
   exclaimSound:
-    path: /Audio/Animals/dog_bark2.ogg
+    path: /Audio/Animals/dog_bark2.ogg

Resources/Prototypes/Voice/speech_verbs.yml

@@ -74,6 +74,13 @@
   - chat-speech-verb-slime-2
   - chat-speech-verb-slime-3
 
+- type: speechVerb
+  id: Vox
+  speechVerbStrings:
+    - chat-speech-verb-vox-1
+    - chat-speech-verb-vox-2
+    - chat-speech-verb-vox-3
+
 - type: speechVerb
   id: Plant
   speechVerbStrings:

Resources/Prototypes/typing_indicator.yml

@@ -34,6 +34,11 @@
   typingState: spider0
   offset: 0, 0.125
 
+- type: typingIndicator
+  id: vox
+  typingState: vox0
+  offset: -0.125, 0.125
+
 - type: typingIndicator
   id: lizard
   typingState: lizard0

Resources/Textures/Effects/speech.rsi/meta.json

@@ -411,6 +411,17 @@
         },
         {
             "name": "spider2"
+        },
+                {
+            "name": "vox0",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.4
+                ]
+            ]
         }
     ]
 }