Shark tails are DONE also some ftl, fuck you localization! I hate mak…

…ing things legible!!

Resources/Locale/en-US/deltav/markings/feroxi.ftl

@@ -0,0 +1,58 @@
+marking-FeroxiEars = Ears
+marking-FeroxiEars-feroxi-ears = Base Ears
+marking-FeroxiEars-feroxi-ears-inner = Inner Ear
+
+marking-FeroxiEarsTips = Tipped Ears
+marking-FeroxiEarsTips-feroxi-ears = Base Ears
+marking-FeroxiEarsTips-feroxi-ears-inner = Inner Ear
+marking-FeroxiEarsTips-feroxi-ears-tips = Ear Tips
+
+marking-FeroxiSnout = Snout (Unfinished)
+marking-FeroxiSnout-feroxi-snout = Base Snout
+
+marking-FeroxiBlitz = Striped Tail with Fin Tips and Dorsal
+marking-FeroxiBlitz-feroxi-tail = Base Tail
+marking-FeroxiBlitz-feroxi-tail-stripes = Tail Stripes
+marking-FeroxiBlitz-feroxi-tail-top-tip = Upper Tail Fin Tip
+marking-FeroxiBlitz-feroxi-tail-bottom-tip = Lower Tail Fin Tip
+marking-FeroxiBlitz-feroxi-dorsal = Base Dorsal
+marking-FeroxiBlitz-feroxi-dorsal-stripes = Dorsal Stripes
+
+marking-FeroxiBlitzNoDorsal = Striped Tail with Fin Tips
+marking-FeroxiBlitzNoDorsal-feroxi-tail = Base Tail
+marking-FeroxiBlitzNoDorsal-feroxi-tail-stripes = Tail Stripes
+marking-FeroxiBlitzNoDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip
+marking-FeroxiBlitzNoDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip
+
+marking-FeroxiStripedTail = Striped Tail
+marking-FeroxiStripedTail-feroxi-tail = Base Tail
+marking-FeroxiStripedTail-feroxi-tail-stripes = Tail Stripes
+
+marking-FeroxiStripedTailAndDorsal = Striped Tail with Dorsal
+marking-FeroxiStripedTailAndDorsal-feroxi-tail = Base Tail
+marking-FeroxiStripedTailAndDorsal-feroxi-tail-stripes = Tail Stripes
+marking-FeroxiStripedTailAndDorsal-feroxi-dorsal = Base Dorsal
+marking-FeroxiStripedTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes
+
+marking-FeroxiTail = Tail
+marking-FeroxiTail-feroxi-tail = Base Tail
+
+marking-FeroxiTailAndDorsal = Tail & Dorsal
+marking-FeroxiTailAndDorsal-feroxi-tail = Base Tail
+marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal
+
+marking-FeroxiTipTail = Tail with Tips
+marking-FeroxiTipTail-feroxi-tail = Base Tail
+marking-FeroxiTipTail-feroxi-tail-top-tip = Upper Tail Fin Tip
+marking-FeroxiTipTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip
+marking-FeroxiTipTail-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip
+marking-FeroxiTipTail-feroxi-dorsal = Base Dorsal
+
+marking-FeroxiTipTailAndDorsal = Tail with Tips and Dorsal
+marking-FeroxiTipTailAndDorsal-feroxi-tail = Base Tail
+marking-FeroxiTipTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip
+marking-FeroxiTipTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip
+marking-FeroxiTipTailAndDorsal-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip
+marking-FeroxiTipTailAndDorsal-feroxi-dorsal = Base Dorsal
+marking-FeroxiTipTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip
+

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

@@ -1,17 +1,17 @@
 # Default
 - type: marking
-  id: FeroxiPlainEars
+  id: FeroxiEars
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Feroxi]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi
-      state: feroxi-plain-ears
+      state: feroxi-ears
     - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi
-      state: feroxi-inner-ears
+      state: feroxi-ears-inner
 
 - type: marking
-  id: FeroxiPlainTailAndDorsal
+  id: FeroxiTailAndDorsal
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Feroxi]
@@ -22,31 +22,31 @@
     state: feroxi-dorsal
 
 - type: marking
-  id: FeroxiPlainSnout
+  id: FeroxiSnout
   bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Feroxi]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi
-    state: feroxi-plain-snout
+    state: feroxi-snout
 
 # Ears Markings
 - type: marking
-  id: FeroxiTipEars
+  id: FeroxiEarsTips
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Feroxi]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi
-      state: feroxi-plain-ears
+      state: feroxi-ears
     - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi
-      state: feroxi-inner-ears
+      state: feroxi-ears-inner
     - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi
-      state: feroxi-tips-ears
+      state: feroxi-ears-tips
 
 # Tail markings
 - type: marking
-  id: FeroxiPlainTail
+  id: FeroxiTail
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Feroxi]
@@ -81,7 +81,7 @@
     state: feroxi-dorsal-stripes
 
 - type: marking
-  id: FeroxiTwoTipTail
+  id: FeroxiTipTail
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Feroxi]
@@ -92,22 +92,11 @@
     state: feroxi-tail-top-tip
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
     state: feroxi-tail-bottom-tip
-
-- type: marking
-  id: FeroxiTwoTipTailWithDorsal
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Feroxi]
-  sprites:
-  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
-    state: feroxi-tail
-  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
-    state: feroxi-tail-top-tip
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
-    state: feroxi-tail-bottom-tip
+    state: feroxi-tail-second-dorsal-tip
 
 - type: marking
-  id: FeroxiThreeTipTail
+  id: FeroxiTipTailAndDorsal
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Feroxi]
@@ -120,28 +109,32 @@
     state: feroxi-tail-bottom-tip
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
     state: feroxi-tail-second-dorsal-tip
+  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
+    state: feroxi-dorsal
+  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
+    state: feroxi-dorsal-tip
 
 - type: marking
-  id: FeroxiThreeTipTailWithDorsal
+  id: FeroxiBlitz
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Feroxi]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
     state: feroxi-tail
+  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
+    state: feroxi-tail-stripes
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
     state: feroxi-tail-top-tip
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
     state: feroxi-tail-bottom-tip
-  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
-    state: feroxi-tail-second-dorsal-tip
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
     state: feroxi-dorsal
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
-    state: feroxi-dorsal-tip
+    state: feroxi-dorsal-stripes
 
 - type: marking
-  id: FeroxiBlitz
+  id: FeroxiBlitzNoDorsal
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Feroxi]
@@ -156,7 +149,3 @@
     state: feroxi-tail-bottom-tip
   - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
     state: feroxi-tail-stripes
-  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
-    state: feroxi-dorsal
-  - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi
-    state: feroxi-dorsal-stripes

Resources/Prototypes/DeltaV/Species/feroxi.yml

@@ -48,11 +48,11 @@
     HeadTop:
       points: 1
       required: true
-      defaultMarkings: [ FeroxiPlainEars ]
+      defaultMarkings: [ FeroxiEars ]
     Snout:
       points: 1
       required: true
-      defaultMarkings: [ FeroxiPlainSnout ]
+      defaultMarkings: [ FeroxiSnout ]
     Chest:
       points: 3
       required: false
@@ -65,7 +65,7 @@
     Tail:
       points: 1
       required: true
-      defaultMarkings: [ FeroxiPlainTailAndDorsal ]
+      defaultMarkings: [ FeroxiTailAndDorsal ]
 
 - type: humanoidBaseSprite
   id: MobFeroxiHead

Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json

@@ -5,20 +5,16 @@
   "size": {"x": 32, "y": 32},
   "states": [
     {
-      "name": "feroxi-plain-ears",
+      "name": "feroxi-ears",
       "directions": 4
     },
         {
-      "name": "feroxi-tips-ears",
+      "name": "feroxi-ears-inner",
       "directions": 4
     },
     {
-      "name": "feroxi-inner-ears",
+      "name": "feroxi-ears-tips",
       "directions": 4
-    },
-    {
-        "name": "feroxi-plain-fin",
-        "directions": 4
     }
   ]
 }

Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json

@@ -6,7 +6,7 @@
     "states":
     [
         {
-            "name": "feroxi-plain-snout",
+            "name": "feroxi-snout",
             "directions": 4
         }
     ]