cherrypick: old vulps from Misfit

Resources/Locale/en-US/_Misfit/markings/vulpkanin.ftl

@@ -0,0 +1,3 @@
+marking-VulpEarWolf-wolf = Wolf ears (Base)
+marking-VulpEarWolf-wolf-inner = Wolf ears (Inner)
+marking-VulpEarWolf = Wolf Ears

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

@@ -41,7 +41,6 @@ marking-VulpEarShock-shock = Shock ears (Base)
 marking-VulpEarShock-shock-inner = Shock ears (Inner)
 marking-VulpEarShock = Vulpkanin Shock
 
-
 # Snout
 
 marking-VulpSnout-snout = Snout
@@ -120,6 +119,17 @@ marking-VulpTailVulpFade-vulp = Vulpkanin tail (Base)
 marking-VulpTailVulpFade-vulp-fade = Vulpkanin tail (Fade)
 marking-VulpTailVulpFade = Vulpkanin (Fade)
 
+# Begin Misfit tail additions
+marking-VulpTailCoyote-coyote = Coyote tail (Base)
+marking-VulpTailCoyote = Coyote
+
+marking-VulpTailFox-fox = Fox tail (Base)
+marking-VulpTailFox-fox-tip = Fox tail (Tip)
+marking-VulpTailFox = Vulpkanin Fox
+
+marking-VulpTailOtie-otie = Otie tail (Base)
+marking-VulpTailOtie = Otie
+# End Misfit tail additions
 
 # Chest
 

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml

@@ -65,4 +65,4 @@
     - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp
     - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
-      state: vulp-fade
+      state: vulp-fade

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

@@ -2,7 +2,7 @@
   id: ScarEyeRight
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, SlimePerson]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -12,7 +12,7 @@
   id: ScarEyeLeft
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, SlimePerson]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -22,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -33,7 +33,7 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona, Vulpkanin] # Misfit - added Vulpkanin
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -44,7 +44,7 @@
   id: ScarChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -54,7 +54,7 @@
   id: ScarNeck
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -64,7 +64,7 @@
   id: ScarChestBullets
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -74,7 +74,7 @@
   id: ScarStomachBullets
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -84,7 +84,7 @@
   id: ScarFace1
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -94,7 +94,7 @@
   id: ScarFace2
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -104,7 +104,7 @@
   id: ScarEyeRightSmall
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
@@ -114,7 +114,7 @@
   id: ScarEyeLeftSmall
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi

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

@@ -114,7 +114,7 @@
   id: TattooEyeRight
   bodyPart: Eyes
   markingCategory: [Head]
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] # Misfit - added vulpkanin
   coloring:
     default:
       type:
@@ -128,7 +128,7 @@
   id: TattooEyeLeft
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] # Misfit - added vulpkanin
   coloring:
     default:
       type:
@@ -166,33 +166,7 @@
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_moth_l
 
-- type: marking
-  id: TattooEyeVulpkaninRight
-  bodyPart: Eyes
-  markingCategory: [Head]
-  speciesRestriction: [Vulpkanin]
-  coloring:
-    default:
-      type:
-        !type:EyeColoring
-          negative: true
-  sprites:
-  - sprite: Mobs/Customization/tattoos.rsi
-    state: tattoo_eye_vulpkanin_r
-
-- type: marking
-  id: TattooEyeVulpkaninLeft
-  bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Vulpkanin]
-  coloring:
-    default:
-      type:
-        !type:EyeColoring
-          negative: true
-  sprites:
-  - sprite: Mobs/Customization/tattoos.rsi
-    state: tattoo_eye_vulpkanin_l
+# Misfit - removed vulpkanin eye tattoo in exchange for the human one
 
 - type: marking
   id: TattooEyeshadowUpper
@@ -217,4 +191,4 @@
   forcedColoring: true
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
-    state: eyeshadow_lower
+    state: eyeshadow_lower

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

@@ -7,10 +7,10 @@
   components:
   - type: Hunger
   - type: Thirst
-  - type: MessyDrinker
-    spillChance: 0.33
+  # - type: MessyDrinker # Misfit - Removed messy drinker. Goofy gimmick.
+    # spillChance: 0.33
   - type: Icon
-    sprite: Mobs/Species/Vulpkanin/parts.rsi
+    sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites
     state: full
   - type: Body
     prototype: Vulpkanin
@@ -48,16 +48,7 @@
   - type: TemperatureProtection
     heatingCoefficient: 1.2
     coolingCoefficient: 0.3
-  - type: JumpAbility
-    action: ActionVulpkaninGravityJump
-    canCollide: true
-    jumpDistance: 3
-    jumpSound:
-      path: /Audio/Weapons/punchmiss.ogg
-      params:
-        pitch: 1.33
-        volume: -5
-        variation: 0.05
+  # The Den - Removed jump ability for being to gamey.
   - type: Sprite # Drawlayers. Top to bottom in order I believe.
     netsync: false
     layers:
@@ -114,60 +105,7 @@
     - HeadTop
     - HeadSide
     - FacialHair
-    markingsDisplacement:
-      Hair:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: hair
-  - type: Inventory
-    speciesId: vulpkanin
-    displacements:
-      jumpsuit:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: jumpsuit
-      back:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: back
-      outerClothing:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: outerwear
-      gloves:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: hand
-      shoes:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: shoes
-      head:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: head
-      neck:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: neck
-      eyes:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: eyes
-      belt:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: belt
+    # Misfit - deleted displacement maps
 
 - type: entity
   parent: [BaseSpeciesDummy]
@@ -180,57 +118,4 @@
     - Snout
     - HeadTop
     - HeadSide
-    markingsDisplacement:
-      Hair:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: hair
-  - type: Inventory
-    speciesId: vulpkanin
-    displacements:
-      jumpsuit:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: jumpsuit
-      back:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: back
-      outerClothing:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: outerwear
-      gloves:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: hand
-      shoes:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: shoes
-      head:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: head
-      neck:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: neck
-      eyes:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: eyes
-      belt:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: belt
+    # Misfit - deleted displacement maps