diff --git a/Resources/Locale/en-US/_Misfit/markings/vulpkanin.ftl b/Resources/Locale/en-US/_Misfit/markings/vulpkanin.ftl new file mode 100644 index 00000000000..0b02c30880f --- /dev/null +++ b/Resources/Locale/en-US/_Misfit/markings/vulpkanin.ftl @@ -0,0 +1,16 @@ +# Ears + +marking-VulpEarWolf-wolf = Wolf ears (Base) +marking-VulpEarWolf-wolf-inner = Wolf ears (Inner) +marking-VulpEarWolf = Wolf Ears + +# Tails +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 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml index 238bf88134f..b27f915d8d2 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml @@ -3,7 +3,7 @@ id: VulpTailFennec bodyPart: Tail markingCategory: Tail - speciesRestriction: [ Vulpkanin ] + speciesRestriction: [Vulpkanin] sprites: - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi state: fennec @@ -14,7 +14,7 @@ id: VulpTailFluffy bodyPart: Tail markingCategory: Tail - speciesRestriction: [ Vulpkanin ] + speciesRestriction: [Vulpkanin] sprites: - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi state: fluffy @@ -25,7 +25,7 @@ id: VulpTailHusky bodyPart: Tail markingCategory: Tail - speciesRestriction: [ Vulpkanin ] + speciesRestriction: [Vulpkanin] sprites: - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi state: husky @@ -38,7 +38,7 @@ id: VulpTailLong bodyPart: Tail markingCategory: Tail - speciesRestriction: [ Vulpkanin ] + speciesRestriction: [Vulpkanin] sprites: - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi state: long @@ -49,7 +49,7 @@ id: VulpTailVulp bodyPart: Tail markingCategory: Tail - speciesRestriction: [ Vulpkanin ] + speciesRestriction: [Vulpkanin] sprites: - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi state: vulp @@ -60,7 +60,7 @@ id: VulpTailVulpFade bodyPart: Tail markingCategory: Tail - speciesRestriction: [ Vulpkanin ] + speciesRestriction: [Vulpkanin] sprites: - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi state: vulp diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 5dd1cd560ea..68b26117dd0 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index b38d954cc8d..ce2e9289709 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/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 \ No newline at end of file + state: eyeshadow_lower diff --git a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml index 535d3ba327d..d23ff4d5749 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml +++ b/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 @@ -49,16 +49,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: @@ -115,61 +106,7 @@ - HeadTop - HeadSide - FacialHair - - Hair - 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] @@ -182,57 +119,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 diff --git a/Resources/Prototypes/Species/vulpkanin.yml b/Resources/Prototypes/Species/vulpkanin.yml index 6f8acfa73ef..2de146ebb91 100644 --- a/Resources/Prototypes/Species/vulpkanin.yml +++ b/Resources/Prototypes/Species/vulpkanin.yml @@ -4,7 +4,7 @@ roundStart: true prototype: MobVulpkanin sprites: MobVulpkaninSprites - defaultSkinTone: "#5a3f2d" + defaultSkinTone: "#ffffff" # Misfit - Changed from 5a3f2d to ffffff markingLimits: MobVulpkaninMarkingLimits dollPrototype: MobVulpkaninDummy skinColoration: VulpkaninColors @@ -80,89 +80,89 @@ - type: humanoidBaseSprite id: MobVulpkaninEyes baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: Mobs/Customization/eyes.rsi # Misfit - Change to use human eyes state: eyes - type: humanoidBaseSprite id: MobVulpkaninHead baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: head_m - type: humanoidBaseSprite id: MobVulpkaninHeadMale baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: head_m - type: humanoidBaseSprite id: MobVulpkaninHeadFemale baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: head_f - type: humanoidBaseSprite id: MobVulpkaninTorso baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: torso_m - type: humanoidBaseSprite id: MobVulpkaninTorsoMale baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: torso_m - type: humanoidBaseSprite id: MobVulpkaninTorsoFemale baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: torso_f - type: humanoidBaseSprite id: MobVulpkaninLLeg baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: l_leg - type: humanoidBaseSprite id: MobVulpkaninLHand baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: l_hand - type: humanoidBaseSprite id: MobVulpkaninLArm baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: l_arm - type: humanoidBaseSprite id: MobVulpkaninLFoot baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: l_foot - type: humanoidBaseSprite id: MobVulpkaninRLeg baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: r_leg - type: humanoidBaseSprite id: MobVulpkaninRHand baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: r_hand - type: humanoidBaseSprite id: MobVulpkaninRArm baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: r_arm - type: humanoidBaseSprite id: MobVulpkaninRFoot baseSprite: - sprite: Mobs/Species/Vulpkanin/parts.rsi + sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites state: r_foot diff --git a/Resources/Prototypes/_Misfit/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml b/Resources/Prototypes/_Misfit/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml new file mode 100644 index 00000000000..c8a2543f0e7 --- /dev/null +++ b/Resources/Prototypes/_Misfit/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml @@ -0,0 +1,10 @@ +- type: marking + id: VulpEarWolf + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: wolf + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: wolf-inner diff --git a/Resources/Prototypes/_Misfit/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml b/Resources/Prototypes/_Misfit/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml new file mode 100644 index 00000000000..f4462b5665c --- /dev/null +++ b/Resources/Prototypes/_Misfit/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml @@ -0,0 +1,28 @@ +- type: marking + id: VulpTailCoyote # This specifically was in the upstream folder but unused for some... reason + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: coyote + +- type: marking + id: VulpTailFox + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fox + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fox-tip + +- type: marking + id: VulpTailOtie + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: otie diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json index d736b672823..5b82cdef285 100644 --- a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/DeltaV-Station/Delta-v/commit/e5426c4e3b160472b7d2913e1f89897bf72d957, some modification by FairlySadPanda (Github/Discord), ScarKy0 (Github/Discord) and TiniestShark (Github)", + "copyright": "https://github.com/DeltaV-Station/Delta-v/commit/e5426c4e3b160472b7d2913e1f89897bf72d957, some modification by FairlySadPanda (Github/Discord), ScarKy0 (Github/Discord) and TiniestShark (Github) | wolf and wolf-inner states taken from https://github.com/DeltaV-Station/Delta-v/tree/061b844c99e7313467494150a3a93802301d4f4e/Resources/Textures/_DV/Mobs/Customization/Vulpkanin/ear_markings.rsi added by Zephyrpak for Misfit Station", "size": { "x": 32, "y": 32 @@ -78,6 +78,14 @@ { "name": "coyote-inner", "directions": 4 + }, + { + "name": "wolf", + "directions": 4 + }, + { + "name": "wolf-inner", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf-inner.png new file mode 100644 index 00000000000..be32a6e9b08 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf.png new file mode 100644 index 00000000000..52379e953ca Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/meta.json index 858db18b26a..e9597c1c189 100644 --- a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86, edited by ScarKy0 (Github/Discord)", + "copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86, edited by ScarKy0 (Github/Discord) | vulpine and vulpine-lines state edited by Ci1trus for Misfit Station", "size": {"x": 32, "y": 32}, "states": [ { @@ -31,6 +31,10 @@ { "name": "vulpine", "directions": 4 + }, + { + "name": "vulpine-lines", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine-lines.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine-lines.png new file mode 100644 index 00000000000..0fc1c12e8f4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine-lines.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine.png index a0d480f1ba5..ad0876e9485 100644 Binary files a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine.png and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-fade.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-fade.png new file mode 100644 index 00000000000..ff4a30f213b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-fade.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-tip.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-tip.png new file mode 100644 index 00000000000..40fa2e2ca47 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-tip.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox.png new file mode 100644 index 00000000000..406ad13bcba Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json index 04503abb6cf..ef67151d79c 100644 --- a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86. Fluffy created by Skarletto (Github). Modified by FairlySadPanda (Github/Discord)", + "copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86. Fluffy created by Skarletto (Github). Modified by FairlySadPanda (Github/Discord) | fox and otie states taken from https://github.com/DeltaV-Station/Delta-v/tree/061b844c99e7313467494150a3a93802301d4f4e/Resources/Textures/_DV/Mobs/Customization/Vulpkanin/tail_markings.rsi added by Zephyrpak for Misfit Station", "size": {"x": 32, "y": 32}, "states": [ { @@ -58,6 +58,22 @@ { "name": "coyote", "directions": 4 + }, + { + "name": "fox", + "directions": 4 + }, + { + "name": "fox-tip", + "directions": 4 + }, + { + "name": "fox-fade", + "directions": 4 + }, + { + "name": "otie", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/otie.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/otie.png new file mode 100644 index 00000000000..2d2d82ad749 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/otie.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/full.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/full.png new file mode 100644 index 00000000000..d78a1ae1134 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/full.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/head_f.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/head_f.png new file mode 100644 index 00000000000..e6c988ac8b0 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/head_f.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/head_m.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/head_m.png new file mode 100644 index 00000000000..d6894413505 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/head_m.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/icon.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/icon.png new file mode 100644 index 00000000000..016d8ba5a76 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/icon.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_arm.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_arm.png new file mode 100644 index 00000000000..a33336d6a6f Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_foot.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_foot.png new file mode 100644 index 00000000000..6b1db8f631b Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_hand.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_hand.png new file mode 100644 index 00000000000..645ec58d5b2 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_leg.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_leg.png new file mode 100644 index 00000000000..6511227d74a Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/meta.json b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/meta.json new file mode 100644 index 00000000000..943048bfa51 --- /dev/null +++ b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/meta.json @@ -0,0 +1,69 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/tree/1462f5bd1fc68a22732eee36c70b183080851480/Resources/Textures/_DV/Mobs/Species/Vulpkanin/parts.rsi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "icon" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + }, + { + "name": "overlay_husk", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/overlay_husk.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/overlay_husk.png new file mode 100644 index 00000000000..ba3fc107bc8 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/overlay_husk.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_arm.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_arm.png new file mode 100644 index 00000000000..7fc626c2711 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_foot.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_foot.png new file mode 100644 index 00000000000..9174095ab38 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_hand.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_hand.png new file mode 100644 index 00000000000..e461d8a7b54 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_leg.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_leg.png new file mode 100644 index 00000000000..d563bd072a3 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png new file mode 100644 index 00000000000..db8a63bbd92 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png new file mode 100644 index 00000000000..dfe4705aa37 Binary files /dev/null and b/Resources/Textures/_Misfit/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png differ