Tajara

Resources/Locale/en-US/chat/emotes.ftl

@@ -44,7 +44,7 @@ chat-emote-name-vulpbark = Bark
 chat-emote-name-vulpsnarl = Snarl
 chat-emote-name-vulpwhine = Whine
 chat-emote-name-vulphowl = Howl
-# Felinid
+# ~~Felinid~~ Tajaran
 chat-emote-name-meow = Meow
 chat-emote-name-mew = Mew
 chat-emote-name-purr = Purr

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

@@ -168,3 +168,9 @@ chat-speech-verb-electricity-2 = buzzes
 chat-speech-verb-electricity-3 = screeches
 
 chat-speech-verb-marish = Mars
+
+chat-speech-verb-name-tajaran = Tajaran
+chat-speech-verb-tajaran-1 = mraows
+chat-speech-verb-tajaran-2 = mews
+chat-speech-verb-tajaran-3 = meows
+chat-speech-verb-tajaran-4 = purrs out

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

@@ -0,0 +1,89 @@
+marking-TajaranTorsoBelly = Chest Fur
+marking-TajaranTorsoBelly-belly = Fur
+marking-TajaranTorsoCrest = Chest Fur (Crest)
+marking-TajaranTorsoCrest-crest = Fur
+marking-TajaranTorsoFullBelly = Chest Fur (Full)
+marking-TajaranTorsoFullBelly-fullbelly = Fur
+marking-TajaranHeadMuzzle = Muzzle
+marking-TajaranHeadMuzzle-muzzle = Muzzle
+marking-TajaranHeadMuzzleLarge = Muzzle (Large)
+marking-TajaranHeadMuzzleLarge-muzzle_large = Muzzle
+marking-TajaranHeadNose = Nose
+marking-TajaranHeadNose-nose = Nose
+marking-TajaranHeadPatches = Patches
+marking-TajaranHeadPatches-patch = Patches
+marking-TajaranHeadPoints = Points
+marking-TajaranHeadPoints-points = Points
+marking-TajaranHeadTiger = Tiger
+marking-TajaranHeadTiger-tiger_face = Stripes
+marking-TajaranHeadTigerAlt = Tiger (Alternative)
+marking-TajaranHeadTigerAlt-tiger_head = Stripes
+marking-TajaranEarsRetro = Classic Ears
+marking-TajaranEarsRetro-ears = Ears
+marking-TajaranEarsRetroNear = Classic Ears (Alternative)
+marking-TajaranEarsRetroNear-ears_near = Ears
+marking-TajaranEarsSeparate = Classic Ears (Separated)
+marking-TajaranEarsSeparate-outears = Outer
+marking-TajaranEarsSeparate-inears = Inner
+marking-TajaranEarsSeparateNear = Classic Ears (Alternative, Separated)
+marking-TajaranEarsSeparateNear-outears_near = Outer
+marking-TajaranEarsSeparateNear-inears_near = Inner
+marking-TajaranTailAnim = Classic Tail (Animated)
+marking-TajaranTailAnim-tail_anim = Tail
+marking-TajaranTailAnimRings = Classic Tail (Animated, Rings)
+marking-TajaranTailAnimRings-tail_anim = Tail
+marking-TajaranTailAnimRings-tail_anim_rings = Rings
+marking-TajaranTailRetro = Classic Tail
+marking-TajaranTailRetro-tail = Tail
+marking-TajaranTailRetroRings = Classic Tail (Rings)
+marking-TajaranTailRetroRings-tail = Tail
+marking-TajaranTailRetroRings-tail_rings = Rings
+marking-TajaranOverlayPatch = Patches
+marking-TajaranOverlayPatch-patch = Patches
+marking-TajaranOverlayPoints = Points
+marking-TajaranOverlayPoints-points = Points
+marking-TajaranEarsBasic = Basic Ears
+marking-TajaranEarsBasic-basic_outer = Outer ear
+marking-TajaranEarsBasic-basic_inner = Inner ear
+marking-TajaranEarsCurled = Curled Ears
+marking-TajaranEarsCurled-curled_outer = Outer ear
+marking-TajaranEarsCurled-curled_inner = Inner ear
+marking-TajaranEarsDroopy = Droopy Ears
+marking-TajaranEarsDroopy-droopy_outer = Outer ear
+marking-TajaranEarsDroopy-droopy_inner = Inner ear
+marking-TajaranEarsFuzzy = Fuzzy Ears
+marking-TajaranEarsFuzzy-basic_outer = Outer ear
+marking-TajaranEarsFuzzy-fuzzy_inner = Ear fuzz
+marking-TajaranEarsStubby = Stubby Ears
+marking-TajaranEarsStubby-stubby_outer = Outer ear
+marking-TajaranEarsStubby-stubby_inner = Inner ear
+marking-TajaranEarsTall = Tall Ears
+marking-TajaranEarsTall-tall_outer = Outer ear
+marking-TajaranEarsTall-tall_inner = Inner ear
+marking-TajaranEarsTall-tall_fuzz = Ear fuzz
+marking-TajaranEarsTorn = Torn Ears
+marking-TajaranEarsTorn-torn_outer = Outer ear
+marking-TajaranEarsTorn-torn_inner = Inner ear
+marking-TajaranEarsWide = Wide Ears
+marking-TajaranEarsWide-wide_outer = Outer ear
+marking-TajaranEarsWide-wide_inner = Inner ear
+marking-TajaranTailBasic = Basic Cat Tail
+marking-TajaranTailBasic-basic_tail_tip = Tail tip
+marking-TajaranTailBasic-basic_tail_stripes_even = Tail stripes, even
+marking-TajaranTailBasic-basic_tail_stripes_odd = Tail stripes, odd
+marking-TajaranTailBasicWithBow = Basic Cat Tail with Bow
+marking-TajaranTailBasicWithBow-basic_tail_tip = Tail tip
+marking-TajaranTailBasicWithBow-basic_tail_stripes_even = Tail stripes, even
+marking-TajaranTailBasicWithBow-basic_tail_stripes_odd = Tail stripes, odd
+marking-TajaranTailBasicWithBow-basic_bow = Bow
+marking-TajaranTailBasicWithBell = Basic Cat Tail with Bell
+marking-TajaranTailBasicWithBell-basic_tail_tip = Tail tip
+marking-TajaranTailBasicWithBell-basic_tail_stripes_even = Tail stripes, even
+marking-TajaranTailBasicWithBell-basic_tail_stripes_odd = Tail stripes, odd
+marking-TajaranTailBasicWithBell-basic_bell = Bell
+marking-TajaranTailBasicWithBowAndBell = Basic Cat Tail with Bow & Bell
+marking-TajaranTailBasicWithBowAndBell-basic_tail_tip = Tail tip
+marking-TajaranTailBasicWithBowAndBell-basic_tail_stripes_even = Tail stripes, even
+marking-TajaranTailBasicWithBowAndBell-basic_tail_stripes_odd = Tail stripes, odd
+marking-TajaranTailBasicWithBowAndBell-basic_bow = Bow
+marking-TajaranTailBasicWithBowAndBell-basic_bell = Bell

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

@@ -1,4 +1,4 @@
-## Species Names
+## Species Names
 
 species-name-human = Human
 species-name-dwarf = Dwarf
@@ -12,7 +12,8 @@ species-name-skeleton = Skeleton
 species-name-vox = Vox
 species-name-ipc = IPC
 species-name-shadowkin = Shadowkin
+species-name-tajaran = Tajaran
 
 ## Misc species things
 
-snail-hurt-by-salt-popup = The salty solution burns like acid!
+snail-hurt-by-salt-popup = The salty solution burns like acid!

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

@@ -328,7 +328,7 @@ trait-description-Clumsy =
 trait-name-Small = Small
 trait-description-Small =
     You are much smaller than a typical person, and can climb into spaces others would not normally be able to fit into, such as duffel bags.
-    This trait does not in any way modify your character's size, it merely requires that your character be at most the size of a standard Felinid.
+    This trait does not in any way modify your character's size, it merely requires that your character be at most the size of a standard Tajaran.
 
 trait-name-TemperatureTolerance = Temperature Tolerance
 trait-description-TemperatureTolerance =

Resources/Prototypes/Body/Prototypes/tajaran.yml

@@ -0,0 +1,50 @@
+- type: body
+  id: Tajaran
+  name: tajaran
+  root: torso
+  slots:
+    head:
+      part: HeadHuman
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoHuman
+      connections:
+      - right arm
+      - left arm
+      - right leg
+      - left leg
+      - head # Shitmed Change
+      organs:
+        heart: OrganAnimalHeart
+        lungs: OrganHumanLungs
+        stomach: OrganVulpkaninStomach
+        liver:  OrganAnimalLiver
+        kidneys: OrganHumanKidneys
+    right arm:
+      part: RightArmHuman
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmHuman
+      connections:
+      - left hand
+    right hand:
+      part: RightHandHuman
+    left hand:
+      part: LeftHandHuman
+    right leg:
+      part: RightLegHuman
+      connections:
+      - right foot
+    left leg:
+      part: LeftLegHuman
+      connections:
+      - left foot
+    right foot:
+      part: RightFootHuman
+    left foot:
+      part: LeftFootHuman

Resources/Prototypes/Damage/modifier_sets.yml

@@ -384,3 +384,10 @@
   id: PotassiumIodide
   coefficients:
     Radiation: 0.1
+
+- type: damageModifierSet 
+  id: Tajaran
+  coefficients: # Literally the same as felinids, but seperate cuz there's no parenting?
+    Blunt: 1.15
+    Slash: 1.15
+    Piercing: 1.15

Resources/Prototypes/Datasets/Names/tajaran_first.yml

@@ -0,0 +1,103 @@
+- type: dataset
+  id: names_tajaran_first
+  values: # Randomly generated based on https://github.com/ParadiseSS13/Paradise/blob/5b516c3166a07cd10d035be1616248ba126e31a1/code/modules/mob/language.dm
+  - Ahkazuzir
+  - Ahknal
+  - Ahkrhejurlzar
+  - Ahkwaketdar
+  - Arazirrrhazhal
+  - Azukhaztul
+  - Azutulsanurik
+  - Baqka
+  - Baqmirrfar
+  - Churdra
+  - Darkir
+  - Darrkiraasitajr
+  - Darrvahahkkii
+  - Dradra
+  - Draii'rrikrik
+  - Drarrzir
+  - Dratulara
+  - Dynhhalaasiraj
+  - Dynhmak
+  - Eechthaa
+  - Farcreshjurl
+  - Fardradra
+  - Farkraraghjurl
+  - Farrheii'rdar
+  - Haljun
+  - Halmahthaa
+  - Halrheeech
+  - Halrikdynh
+  - Halthaa
+  - Ii'rdarrajmi
+  - Ii'rdynhrr
+  - Ii'rkhanmi
+  - Ii'rvahmiran
+  - Jijunmahaasi
+  - Jjrika
+  - Jrikaahksanu
+  - Junaasi
+  - Jundradarrjri
+  - Junkradareech
+  - Junrrwajurl
+  - Jurlfar
+  - Jurlhalrr
+  - Jurlmahnja
+  - Jurlrhetul
+  - Jurlrik
+  - Jurlzirkalmanq
+  - Kahaasi
+  - Kahara
+  - Kahdar
+  - Kahketdrarhe
+  - Kahmakbaq
+  - Kahrajrr
+  - Kalnalketkal
+  - Kalrhe
+  - Kalwamak
+  - Ketjri
+  - Khankal
+  - Khantulmi
+  - Khazaasikhaz
+  - Khazkirdynheech
+  - Khazrr
+  - Kiiara
+  - Kiihrarjurl
+  - Kiirajthaakii
+  - Kirjri
+  - Kirjriraghtul
+  - Kirkhankhan
+  - Kirmidradarr
+  - Krahaljurlqara
+  - Krakra
+  - Mahhrar
+  - Mahkalkalket
+  - Mahzirzarjurl
+  - Manqjri
+  - Mikra
+  - Mirthaa
+  - Nalchurvah
+  - Njaazukal
+  - Raghdarr
+  - Raghrrhazrhe
+  - Rhejurlcresh
+  - Rhetajrcreshmir
+  - Rikvah
+  - Rirrirbaq
+  - Rirrr
+  - Rirsam
+  - Rirvahrrzar
+  - Rrarahalsanu
+  - Rrhazbaq
+  - Rrhazdarr
+  - Rrjunjurlazu
+  - Rrkhaz
+  - Rrmiarachur
+  - Samrrhazhrarrhe
+  - Tajrara
+  - Tajrjri
+  - Tajrqaramahkhaz
+  - Tajrrirrirjri
+  - Tulmahii'rtajr
+  - Tulrhejri

Resources/Prototypes/Datasets/Names/tajaran_last.yml

@@ -0,0 +1,38 @@
+- type: dataset
+  id: names_tajaran_last
+  values: # Randomly generated based on https://github.com/ParadiseSS13/Paradise/blob/5b516c3166a07cd10d035be1616248ba126e31a1/code/modules/mob/language.dm
+  - Aasirirrhe
+  - Aravah
+  - Azufarjri
+  - Baqhaljurl
+  - Churmir
+  - Darnal
+  - Dradarrjri
+  - Drahrardra
+  - Farsam
+  - Jridrajriara
+  - Jrirhe
+  - Junsanu
+  - Ketwami
+  - Khandradar
+  - Kiimah
+  - Krajunmirr
+  - Krajurlcresh
+  - Krakhazeech
+  - Kravah
+  - Mirrirkii
+  - Ranmirjri
+  - Rirrikvahrir
+  - Rraasi
+  - Rrhazka
+  - Tulchurnjarrhaz
+  - Tulkahhrar
+  - Vahjunkra
+  - Wami
+  - Zarranmakjri
+  - Zirtajrzar
+  - Hadii # These 5 surnames technically should appear way more, but eh
+  - Kaytam
+  - Zhan-Khazan
+  - Hharar
+  - Njarir'Akhan

Resources/Prototypes/Datasets/tips.yml

@@ -157,7 +157,7 @@
   - "Your character's size affects many things in the game, some of which you might not have been aware of. Larger characters experience less gun recoil. Smaller characters can slip handcuffs faster."
   - "'Space Wind' is the term for how flowing air can throw objects or people. A hull breach is typically the most common cause of Space Wind, but it can also be caused by high pressure cannons!"
   - "Ignore firelock warnings at your own peril. You may find yourself being violently thrown into deep space as soon as you crowbar the firelock open."
-  - "Your character's Mass determines how resistant they are to being thrown by space wind. A small Felinid or Harpy is easily ejected into space, while an Oni or Diona is usually unaffected."
+  - "Your character's Mass determines how resistant they are to being thrown by space wind. A small Tajaran or Harpy is easily ejected into space, while an Oni or Diona is usually unaffected."
   - "Supermatter engines can be activated and powered by throwing objects into the crystal. Consider using the Clown to activate your station's Supermatter engine."
   - "There is no friction in space. Unless you use Newton's 1st Law to save yourself, your corpse will float away from the station forever."
   - "Cloning patients come out of the pod with extremely heavy Cellular damage. Consider using Doxarubixadone in a Cryo tube as an affordable means of 'Finishing' clones."

Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml

@@ -2,7 +2,7 @@
   id: FelinidFluffyTailRings
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid, Human]
+  speciesRestriction: [Felinid, Human, Tajaran] # Tajaran update
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
     state: Felinid_fluffy_tail_full
@@ -13,7 +13,7 @@
   id: FelinidFluffyTail
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid, Human]
+  speciesRestriction: [Felinid, Human, Tajaran] # Tajaran update
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
     state: Felinid_fluffy_tail_full
@@ -22,7 +22,7 @@
   id: FelinidAlternativeTail
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid, Human]
+  speciesRestriction: [Felinid, Human, Tajaran] # Tajaran update
   sprites:
     - sprite: DeltaV/Mobs/Customization/Felinid/alternative_tail.rsi
       state: m_waggingtail_cat_FRONT