Merge pull request #424 from widgetbeck/master

Various spelf patches.
impstation · Oct 6, 2024 · 103916b · 103916b
2 parents 7fedaa1 + bf0857b
commit 103916b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/Resources/Locale/en-US/accessories/spelf-hair.ftl b/Resources/Locale/en-US/accessories/spelf-hair.ftl
@@ -10,7 +10,7 @@ marking-SpElfHairLongBedhead = Long Bedhead
 marking-SpElfHairLongBedhead2 = Long Bedhead 2
 marking-SpElfHairFloorlengthBedhead = Floorlength Bedhead
 marking-SpElfHairBeehive = Beehive
-marking-SpElfHairBeehivev2 = Beehive 2
+marking-SpElfHairBeehive2 = Beehive 2
 marking-SpElfHairBob = Bob Hair
 marking-SpElfHairBob2 = Bob Hair 2
 marking-SpElfHairBobcut = Bob Hair 3
@@ -42,15 +42,16 @@ marking-SpElfHairCia = CIA
 marking-SpElfHairClassicAfro = Classic Afro
 marking-SpElfHairClassicBigAfro = Classic Big Afro
 marking-SpElfHairClassicBusiness = Classic Business Hair
-marking-SpElfHairClassicCia = Classic CIA
+marking-SpElfHairClassicciaBusiness = Classic CIA
+marking-SpElfHairClassicCornrows = Classic Cornrows
 marking-SpElfHairClassicCornrows2 = Classic Cornrows 2
 marking-SpElfHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
 marking-SpElfHairClassicLong2 = Classic Long Hair 2
 marking-SpElfHairClassicLong3 = Classic Long Hair 3
 marking-SpElfHairClassicModern = Classic Modern
 marking-SpElfHairClassicMulder = Classic Mulder
 marking-SpElfHairClassicWisp = Classic Wisp
-marking-SpElfHairCoffeehouse = Coffee House
+marking-SpElfHairCoffeeHouse = Coffee House
 marking-SpElfHairCombover = Combover
 marking-SpElfHairCornrows = Cornrows
 marking-SpElfHairCornrows2 = Cornrows 2
@@ -66,9 +67,12 @@ marking-SpElfHairDevilock = Devil Lock
 marking-SpElfHairDoublebun = Double Bun
 marking-SpElfHairDoublebunLong = Double Bun Long
 marking-SpElfHairDreads = Dreadlocks
+marking-SpElfHairDrillHair = Drill Hair
 marking-SpElfHairDrillruru = Drillruru
 marking-SpElfHairDrillhairextended = Drill Hair (Extended)
 marking-SpElfHairEmo = Emo
+marking-SpElfHairEmo2 = Emo2
+marking-SpElfHairLongeremo = Longer Emo
 marking-SpElfHairEmofringe = Emo Fringe
 marking-SpElfHairNofade = Fade (None)
 marking-SpElfHairHighfade = Fade (High)
@@ -107,6 +111,7 @@ marking-SpElfHairLbangs = Long Bangs
 marking-SpElfHairLongemo = Long Emo
 marking-SpElfHairLongfringe = Long Fringe
 marking-SpElfHairLongsidepart = Long Side Part
+marking-SpElfHairMediumSidepart = Medium Side Part
 marking-SpElfHairMegaeyebrows = Mega Eyebrows
 marking-SpElfHairMessy = Messy
 marking-SpElfHairModern = Modern
@@ -146,15 +151,19 @@ marking-SpElfHairSidetail3 = Ponytail (Side) 3
 marking-SpElfHairSidetail4 = Ponytail (Side) 4
 marking-SpElfHairSpikyponytail = Ponytail (Spiky)
 marking-SpElfHairPoofy = Poofy
+marking-SpElfHairBald = Bald
+marking-SpElfHairClassicCia = Classic CIA
 marking-SpElfHairQuiff = Quiff
 marking-SpElfHairRonin = Ronin
 marking-SpElfHairShaped = Shaped
 marking-SpElfHairShaved = Shaved
+marking-SpElfHairShavedMohawk = Shaved Mohawk
 marking-SpElfHairShavedpart = Shaved Part
 marking-SpElfHairShortbangs = Short Bangs
 marking-SpElfHairA = Short Hair
 marking-SpElfHairShorthair2 = Short Hair 2
 marking-SpElfHairShorthair3 = Short Hair 3
+marking-SpElfHairShorthair9 = Short Hair 9
 marking-SpElfHairD = Short Hair 4
 marking-SpElfHairE = Short Hair 5
 marking-SpElfHairF = Short Hair 6

diff --git a/Resources/Locale/en-US/impstation/spelfs/shared.ftl b/Resources/Locale/en-US/impstation/spelfs/shared.ftl
@@ -14,7 +14,7 @@ spelf-mood-fashion-reroll-name = Fashion Is Ever-Changing
 spelf-mood-fashion-reroll-desc = Your current hairstyle will go out of fashion every twenty minutes. It is extremely distressing to be unfashionable.
 
 spelf-mood-honor-department-name = Honor Among Departments
-spelf-mood-honor-department-desc = If a Thaven brings dishonor to their department, they must be ritually sacrificed.
+spelf-mood-honor-department-desc = If a Thaven brings dishonor to their department, they must be ritually sacrificed by another Thaven.
 
 spelf-mood-station-is-alive-name = The Station Is A Living Being
 spelf-mood-station-is-alive-desc = Harming or modifying the station is abhorrent. Anything which aims to harm the station is an infection.

diff --git a/Resources/Locale/en-US/impstation/spelfs/yes-and.ftl b/Resources/Locale/en-US/impstation/spelfs/yes-and.ftl
@@ -94,6 +94,9 @@ spelf-mood-greyspeak-desc = You should endeavor to speak like Greys to the best
 spelf-mood-no-department-title-name = Extremely Personable
 spelf-mood-no-department-title-desc = You must not refer directly to the names of departments - You may only refer to a specific person who works in that department.
 
+spelf-mood-title-case-name = Title Case
+spelf-mood-title-case-desc = You Must Speak Exclusively In Title Case
+
 spelf-mood-shoes-bad-name = Barefoot
 spelf-mood-shoes-bad-desc = The ground you walk on is sacred. You must not wear shoes.
 
diff --git a/Resources/Prototypes/Entities/Mobs/Species/spelf.yml b/Resources/Prototypes/Entities/Mobs/Species/spelf.yml
@@ -32,7 +32,7 @@
   - type: Sprite
     noRot: true
     drawdepth: Mobs
-    scale: 1, 1.1
+    scale: 1, 1.05
   - type: Body
     prototype: SpElf
     requiredLegs: 2

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -465,7 +465,8 @@
     DefaultDeathgasp:
       collection: MaleDeathGasp
   params:
-    variation: 0.125
+    variation: 0.05
+    pitch: 1.25
 
 # mobs
 - type: emoteSounds