diff --git a/Resources/Audio/Voice/Talk/attributions.yml b/Resources/Audio/Voice/Talk/attributions.yml index 19b0b66b9c..e4347315ff 100644 --- a/Resources/Audio/Voice/Talk/attributions.yml +++ b/Resources/Audio/Voice/Talk/attributions.yml @@ -36,3 +36,8 @@ license: "CC-BY-NC-SA-3.0" copyright: "Derived from shriek1.ogg by Errant" source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk" + +- files: ["vulp.ogg, vulp_ask.ogg, vulp_exclaim.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "pug.ogg (Renamed to vulp.ogg), pug_ask.ogg (Renamed to vulp_ask.ogg, pug_exclaim.ogg (Renamed to vulp_exclaim.ogg) all taken from: https://github.com/goonstation/goonstation/commit/da7c8965c4552ca53af367e6c83a83da2affe790" + source: "https://github.com/goonstation/goonstation/commit/da7c8965c4552ca53af367e6c83a83da2affe790" diff --git a/Resources/Audio/Voice/Talk/vulp.ogg b/Resources/Audio/Voice/Talk/vulp.ogg new file mode 100644 index 0000000000..86d50225a5 Binary files /dev/null and b/Resources/Audio/Voice/Talk/vulp.ogg differ diff --git a/Resources/Audio/Voice/Talk/vulp_ask.ogg b/Resources/Audio/Voice/Talk/vulp_ask.ogg new file mode 100644 index 0000000000..4cdf1c8a5e Binary files /dev/null and b/Resources/Audio/Voice/Talk/vulp_ask.ogg differ diff --git a/Resources/Audio/Voice/Talk/vulp_exclaim.ogg b/Resources/Audio/Voice/Talk/vulp_exclaim.ogg new file mode 100644 index 0000000000..ed47bcf1c6 Binary files /dev/null and b/Resources/Audio/Voice/Talk/vulp_exclaim.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/attributions.yml b/Resources/Audio/Voice/Vulpkanin/attributions.yml new file mode 100644 index 0000000000..606c0b27de --- /dev/null +++ b/Resources/Audio/Voice/Vulpkanin/attributions.yml @@ -0,0 +1,55 @@ +- files: ["dog_bark1.ogg"] + license: "CC0-1.0" + copyright: "Original sound by https://freesound.org/people/abhisheky948/sounds/625497/" + source: "https://freesound.org/people/abhisheky948/sounds/625497/" + +- files: ["dog_bark2.ogg"] + license: "CC0-1.0" + copyright: "Original sound by https://freesound.org/people/michael_grinnell/sounds/464400/" + source: "https://freesound.org/people/michael_grinnell/sounds/464400/" + +- files: ["dog_bark3.ogg"] + license: "CC0-1.0" + copyright: "Original sound by https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/" + source: "https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/" + +- files: ["dog_growl1.ogg", "dog_growl2.ogg", "dog_growl3.ogg"] + license: "CC0-1.0" + copyright: "Original sound by https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg" + source: "https://freesound.org/people/Glitchedtones/sounds/372533/" + +- files: ["dog_growl4.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Original sound taken from Paradise Station. Renamed to dog_growl4.ogg" + source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl1.ogg" + +- files: ["dog_growl5.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Original sound taken from Paradise Station. Renamed to dog_growl5.ogg" + source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl2.ogg" + +- files: ["dog_growl6.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Original sound taken from Paradise Station. Renamed to dog_growl6.ogg" + source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl3.ogg" + + +- files: ["dog_snarl1.ogg", "dog_snarl2.ogg", "dog_snarl3.ogg"] + license: "CC0-1.0" + copyright: "Original sound by https://freesound.org/people/strongbot/sounds/341090/ - cut out three clips of dog snarling, cleaned up, converted to ogg" + source: "https://freesound.org/people/strongbot/sounds/341090/" + +- files: ["dog_whine.ogg"] + license: "CC0-1.0" + copyright: "Original sound by https://freesound.org/people/Sruddi1/sounds/34878/ - cleaned up, converted to ogg" + source: "https://freesound.org/people/Sruddi1/sounds/34878/" + +- files: ["howl.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Original sound taken from Goonstation. Renamed to howl.ogg" + source: "https://github.com/goonstation/goonstation/blob/master/sound/voice/animal/werewolf_howl.ogg" + +- files: ["vulp_scream1.ogg", "vulp_scream2.ogg", "vulp_scream3.ogg", "vulp_scream4.ogg"] + license: "CC0-1.0" + copyright: "Original sound by https://freesound.org/people/lordomega/sounds/514959/ - cut out four clips, cleaned up, converted to ogg" + source: "https://freesound.org/people/lordomega/sounds/514959/" diff --git a/Resources/Audio/Voice/Vulpkanin/dog_bark1.ogg b/Resources/Audio/Voice/Vulpkanin/dog_bark1.ogg new file mode 100644 index 0000000000..8f3b8fe5bf Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_bark1.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_bark2.ogg b/Resources/Audio/Voice/Vulpkanin/dog_bark2.ogg new file mode 100644 index 0000000000..ed4d7bc786 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_bark2.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_bark3.ogg b/Resources/Audio/Voice/Vulpkanin/dog_bark3.ogg new file mode 100644 index 0000000000..13aab8edd4 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_bark3.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_growl1.ogg b/Resources/Audio/Voice/Vulpkanin/dog_growl1.ogg new file mode 100644 index 0000000000..d2c99e97e7 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_growl1.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_growl2.ogg b/Resources/Audio/Voice/Vulpkanin/dog_growl2.ogg new file mode 100644 index 0000000000..3eb018413a Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_growl2.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_growl3.ogg b/Resources/Audio/Voice/Vulpkanin/dog_growl3.ogg new file mode 100644 index 0000000000..84b505442d Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_growl3.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_growl4.ogg b/Resources/Audio/Voice/Vulpkanin/dog_growl4.ogg new file mode 100644 index 0000000000..d5152d9c05 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_growl4.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_growl5.ogg b/Resources/Audio/Voice/Vulpkanin/dog_growl5.ogg new file mode 100644 index 0000000000..5c48053ac6 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_growl5.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_growl6.ogg b/Resources/Audio/Voice/Vulpkanin/dog_growl6.ogg new file mode 100644 index 0000000000..bcacf2442f Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_growl6.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_snarl1.ogg b/Resources/Audio/Voice/Vulpkanin/dog_snarl1.ogg new file mode 100644 index 0000000000..4493be060c Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_snarl1.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_snarl2.ogg b/Resources/Audio/Voice/Vulpkanin/dog_snarl2.ogg new file mode 100644 index 0000000000..6529e4e05d Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_snarl2.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_snarl3.ogg b/Resources/Audio/Voice/Vulpkanin/dog_snarl3.ogg new file mode 100644 index 0000000000..fb9e4c7ec7 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_snarl3.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/dog_whine.ogg b/Resources/Audio/Voice/Vulpkanin/dog_whine.ogg new file mode 100644 index 0000000000..47f2e8200d Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/dog_whine.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/howl.ogg b/Resources/Audio/Voice/Vulpkanin/howl.ogg new file mode 100644 index 0000000000..eab111a66c Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/howl.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/vulp_scream1.ogg b/Resources/Audio/Voice/Vulpkanin/vulp_scream1.ogg new file mode 100644 index 0000000000..af52e55c9a Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulp_scream1.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/vulp_scream2.ogg b/Resources/Audio/Voice/Vulpkanin/vulp_scream2.ogg new file mode 100644 index 0000000000..293175ec60 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulp_scream2.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/vulp_scream3.ogg b/Resources/Audio/Voice/Vulpkanin/vulp_scream3.ogg new file mode 100644 index 0000000000..68bb49fa42 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulp_scream3.ogg differ diff --git a/Resources/Audio/Voice/Vulpkanin/vulp_scream4.ogg b/Resources/Audio/Voice/Vulpkanin/vulp_scream4.ogg new file mode 100644 index 0000000000..46f834ac43 Binary files /dev/null and b/Resources/Audio/Voice/Vulpkanin/vulp_scream4.ogg differ diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl index cf6d91b511..19d6aa918f 100644 --- a/Resources/Locale/en-US/chat/emotes.ftl +++ b/Resources/Locale/en-US/chat/emotes.ftl @@ -32,6 +32,11 @@ chat-emote-name-monkeyscreeches = Monkey Screech chat-emote-name-robotbeep = Robot chat-emote-name-yawn = Yawn chat-emote-name-snore = Snore +chat-emote-name-bark = Bark +chat-emote-name-snarl = Snarl +chat-emote-name-whine = Whine +chat-emote-name-howl = Howl +chat-emote-name-growl = Growl # Message chat-emote-msg-scream = screams! diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index e7e55c1ea4..93f149bed9 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -158,6 +158,12 @@ chat-speech-verb-electricity-1 = crackles chat-speech-verb-electricity-2 = buzzes chat-speech-verb-electricity-3 = screeches +chat-speech-verb-vulpkanin-1 = rawrs +chat-speech-verb-vulpkanin-2 = barks +chat-speech-verb-vulpkanin-3 = rurs +chat-speech-verb-vulpkanin-4 = yaps +chat-speech-verb-vulpkanin = Vulpkanin + chat-speech-verb-name-wawa = Wawa chat-speech-verb-wawa-1 = intones chat-speech-verb-wawa-2 = states diff --git a/Resources/Locale/en-US/datasets/names/vulpkanin_female.ftl b/Resources/Locale/en-US/datasets/names/vulpkanin_female.ftl new file mode 100644 index 0000000000..03917f56c4 --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/vulpkanin_female.ftl @@ -0,0 +1,113 @@ +names-vulpkanin-female-dataset-1 = Adrianna +names-vulpkanin-female-dataset-2 = Agatha +names-vulpkanin-female-dataset-3 = Agneza +names-vulpkanin-female-dataset-4 = Aldona +names-vulpkanin-female-dataset-5 = Amira +names-vulpkanin-female-dataset-6 = Angela +names-vulpkanin-female-dataset-7 = Apolena +names-vulpkanin-female-dataset-8 = Asia +names-vulpkanin-female-dataset-9 = Barbara +names-vulpkanin-female-dataset-10 = Basia +names-vulpkanin-female-dataset-11 = Beatrice +names-vulpkanin-female-dataset-12 = Blanka +names-vulpkanin-female-dataset-13 = Bohumila +names-vulpkanin-female-dataset-14 = Bruna +names-vulpkanin-female-dataset-15 = Cecilija +names-vulpkanin-female-dataset-16 = Cirila +names-vulpkanin-female-dataset-17 = Czeslawa +names-vulpkanin-female-dataset-18 = Dagmar +names-vulpkanin-female-dataset-19 = Dajana +names-vulpkanin-female-dataset-20 = Damira +names-vulpkanin-female-dataset-21 = Danka +names-vulpkanin-female-dataset-22 = Daria +names-vulpkanin-female-dataset-23 = Diana +names-vulpkanin-female-dataset-24 = Dimitrina +names-vulpkanin-female-dataset-25 = Dobromila +names-vulpkanin-female-dataset-26 = Domnika +names-vulpkanin-female-dataset-27 = Doroteya +names-vulpkanin-female-dataset-28 = Dragoslava +names-vulpkanin-female-dataset-29 = Edyta +names-vulpkanin-female-dataset-30 = Eliza +names-vulpkanin-female-dataset-31 = Ena +names-vulpkanin-female-dataset-32 = Erika +names-vulpkanin-female-dataset-33 = Ester +names-vulpkanin-female-dataset-34 = Evelina +names-vulpkanin-female-dataset-35 = Fatima +names-vulpkanin-female-dataset-36 = Fikreta +names-vulpkanin-female-dataset-37 = Filipina +names-vulpkanin-female-dataset-38 = Franka +names-vulpkanin-female-dataset-39 = Gabrijela +names-vulpkanin-female-dataset-40 = Galena +names-vulpkanin-female-dataset-41 = Genowefa +names-vulpkanin-female-dataset-42 = Halyna +names-vulpkanin-female-dataset-43 = Hana +names-vulpkanin-female-dataset-44 = Helena +names-vulpkanin-female-dataset-45 = Hristina +names-vulpkanin-female-dataset-46 = Ioana +names-vulpkanin-female-dataset-47 = Irena +names-vulpkanin-female-dataset-48 = Ivayla +names-vulpkanin-female-dataset-49 = Izabela +names-vulpkanin-female-dataset-50 = Jagoda +names-vulpkanin-female-dataset-51 = Jolana +names-vulpkanin-female-dataset-52 = Jovka +names-vulpkanin-female-dataset-53 = Julija +names-vulpkanin-female-dataset-54 = Kaja +names-vulpkanin-female-dataset-55 = Karyna +names-vulpkanin-female-dataset-56 = Kata +names-vulpkanin-female-dataset-57 = Katia +names-vulpkanin-female-dataset-58 = Klaudia +names-vulpkanin-female-dataset-59 = Klementina +names-vulpkanin-female-dataset-60 = Kristina +names-vulpkanin-female-dataset-61 = Laura +names-vulpkanin-female-dataset-62 = Lilyana +names-vulpkanin-female-dataset-63 = Magdalena +names-vulpkanin-female-dataset-64 = Maja +names-vulpkanin-female-dataset-65 = Marika +names-vulpkanin-female-dataset-66 = Matilda +names-vulpkanin-female-dataset-67 = Nadzeya +names-vulpkanin-female-dataset-68 = Natalia +names-vulpkanin-female-dataset-69 = Natasha +names-vulpkanin-female-dataset-70 = Nedelya +names-vulpkanin-female-dataset-71 = Nel +names-vulpkanin-female-dataset-72 = Nevena +names-vulpkanin-female-dataset-73 = Nikol +names-vulpkanin-female-dataset-74 = Olivie +names-vulpkanin-female-dataset-75 = Patricie +names-vulpkanin-female-dataset-76 = Paulina +names-vulpkanin-female-dataset-77 = Petra +names-vulpkanin-female-dataset-78 = Petya +names-vulpkanin-female-dataset-79 = Radomira +names-vulpkanin-female-dataset-80 = Rahela +names-vulpkanin-female-dataset-81 = Raina +names-vulpkanin-female-dataset-82 = Ranka +names-vulpkanin-female-dataset-83 = Raya +names-vulpkanin-female-dataset-84 = Renata +names-vulpkanin-female-dataset-85 = Roza +names-vulpkanin-female-dataset-86 = Silvia +names-vulpkanin-female-dataset-87 = Simona +names-vulpkanin-female-dataset-88 = Stanislava +names-vulpkanin-female-dataset-89 = Stefania +names-vulpkanin-female-dataset-90 = Svatava +names-vulpkanin-female-dataset-91 = Sylva +names-vulpkanin-female-dataset-92 = Tamara +names-vulpkanin-female-dataset-93 = Tina +names-vulpkanin-female-dataset-94 = Tonya +names-vulpkanin-female-dataset-95 = Trajanka +names-vulpkanin-female-dataset-96 = Ula +names-vulpkanin-female-dataset-97 = Ursa +names-vulpkanin-female-dataset-98 = Valentina +names-vulpkanin-female-dataset-99 = Valeria +names-vulpkanin-female-dataset-100 = Vanessa +names-vulpkanin-female-dataset-101 = Vasylyna +names-vulpkanin-female-dataset-102 = Venera +names-vulpkanin-female-dataset-103 = Vera +names-vulpkanin-female-dataset-104 = Viktoria +names-vulpkanin-female-dataset-105 = Violetta +names-vulpkanin-female-dataset-106 = Vita +names-vulpkanin-female-dataset-107 = Yoana +names-vulpkanin-female-dataset-108 = Yulia +names-vulpkanin-female-dataset-109 = Yvetta +names-vulpkanin-female-dataset-110 = Yvona +names-vulpkanin-female-dataset-111 = Zofia +names-vulpkanin-female-dataset-112 = Zorka +names-vulpkanin-female-dataset-113 = Zuzanna diff --git a/Resources/Locale/en-US/datasets/names/vulpkanin_last.ftl b/Resources/Locale/en-US/datasets/names/vulpkanin_last.ftl new file mode 100644 index 0000000000..215cf07efb --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/vulpkanin_last.ftl @@ -0,0 +1,252 @@ +names-vulpkanin-last-dataset-1 = Abbott +names-vulpkanin-last-dataset-2 = Adoette +names-vulpkanin-last-dataset-3 = Aegaeon +names-vulpkanin-last-dataset-4 = Aegir +names-vulpkanin-last-dataset-5 = Antlia +names-vulpkanin-last-dataset-6 = Argyris +names-vulpkanin-last-dataset-7 = Artino +names-vulpkanin-last-dataset-8 = Auriga +names-vulpkanin-last-dataset-9 = Balch +names-vulpkanin-last-dataset-10 = Barker +names-vulpkanin-last-dataset-11 = Barry +names-vulpkanin-last-dataset-12 = Beck +names-vulpkanin-last-dataset-13 = Belvin +names-vulpkanin-last-dataset-14 = Benson +names-vulpkanin-last-dataset-15 = Bestla +names-vulpkanin-last-dataset-16 = Beynon +names-vulpkanin-last-dataset-17 = Birken +names-vulpkanin-last-dataset-18 = Blum +names-vulpkanin-last-dataset-19 = Bootes +names-vulpkanin-last-dataset-20 = Braune +names-vulpkanin-last-dataset-21 = Briggs +names-vulpkanin-last-dataset-22 = Brys +names-vulpkanin-last-dataset-23 = Bunner +names-vulpkanin-last-dataset-24 = Burns +names-vulpkanin-last-dataset-25 = Cadogan +names-vulpkanin-last-dataset-26 = Caelum +names-vulpkanin-last-dataset-27 = Caine +names-vulpkanin-last-dataset-28 = Cal'enea +names-vulpkanin-last-dataset-29 = Caliban +names-vulpkanin-last-dataset-30 = Card +names-vulpkanin-last-dataset-31 = Carina +names-vulpkanin-last-dataset-32 = Cecil +names-vulpkanin-last-dataset-33 = Cephus +names-vulpkanin-last-dataset-34 = Cetus +names-vulpkanin-last-dataset-35 = Ciqala +names-vulpkanin-last-dataset-36 = Clark +names-vulpkanin-last-dataset-37 = Collins +names-vulpkanin-last-dataset-38 = Corvus +names-vulpkanin-last-dataset-39 = Cross +names-vulpkanin-last-dataset-40 = Crux +names-vulpkanin-last-dataset-41 = Cygnus +names-vulpkanin-last-dataset-42 = Darwin +names-vulpkanin-last-dataset-43 = Day +names-vulpkanin-last-dataset-44 = Delphinus +names-vulpkanin-last-dataset-45 = Dew +names-vulpkanin-last-dataset-46 = Donovan +names-vulpkanin-last-dataset-47 = Dorado +names-vulpkanin-last-dataset-48 = Drexler +names-vulpkanin-last-dataset-49 = Eckart +names-vulpkanin-last-dataset-50 = Eisner +names-vulpkanin-last-dataset-51 = Eridanus +names-vulpkanin-last-dataset-52 = Esau +names-vulpkanin-last-dataset-53 = Etsa +names-vulpkanin-last-dataset-54 = Fahr +names-vulpkanin-last-dataset-55 = Finn +names-vulpkanin-last-dataset-56 = Fletcher +names-vulpkanin-last-dataset-57 = Flint +names-vulpkanin-last-dataset-58 = Fornax +names-vulpkanin-last-dataset-59 = Francis +names-vulpkanin-last-dataset-60 = Frey +names-vulpkanin-last-dataset-61 = Froese +names-vulpkanin-last-dataset-62 = Frost +names-vulpkanin-last-dataset-63 = Galatea +names-vulpkanin-last-dataset-64 = Gerster +names-vulpkanin-last-dataset-65 = Gibbs +names-vulpkanin-last-dataset-66 = Gibby +names-vulpkanin-last-dataset-67 = Gibson +names-vulpkanin-last-dataset-68 = Glasser +names-vulpkanin-last-dataset-69 = Gold +names-vulpkanin-last-dataset-70 = Gray +names-vulpkanin-last-dataset-71 = Greenland +names-vulpkanin-last-dataset-72 = Griffiths +names-vulpkanin-last-dataset-73 = Grus +names-vulpkanin-last-dataset-74 = Hackl +names-vulpkanin-last-dataset-75 = Harrer +names-vulpkanin-last-dataset-76 = Harris +names-vulpkanin-last-dataset-77 = Hartig +names-vulpkanin-last-dataset-78 = Hati +names-vulpkanin-last-dataset-79 = Haumea +names-vulpkanin-last-dataset-80 = Heck +names-vulpkanin-last-dataset-81 = Heckleforth +names-vulpkanin-last-dataset-82 = Hendricks +names-vulpkanin-last-dataset-83 = Hennion +names-vulpkanin-last-dataset-84 = Herder +names-vulpkanin-last-dataset-85 = Herrlein +names-vulpkanin-last-dataset-86 = Hersh +names-vulpkanin-last-dataset-87 = Hi'iaka +names-vulpkanin-last-dataset-88 = Holderman +names-vulpkanin-last-dataset-89 = Holt +names-vulpkanin-last-dataset-90 = Holzer +names-vulpkanin-last-dataset-91 = Howell +names-vulpkanin-last-dataset-92 = Howlitzer +names-vulpkanin-last-dataset-93 = Hunt +names-vulpkanin-last-dataset-94 = Hunter +names-vulpkanin-last-dataset-95 = Huntington +names-vulpkanin-last-dataset-96 = Hydrus +names-vulpkanin-last-dataset-97 = Hyrrokkin +names-vulpkanin-last-dataset-98 = Ida +names-vulpkanin-last-dataset-99 = Indus +names-vulpkanin-last-dataset-100 = Jones +names-vulpkanin-last-dataset-101 = Kachina +names-vulpkanin-last-dataset-102 = Kahler +names-vulpkanin-last-dataset-103 = Kali +names-vulpkanin-last-dataset-104 = Kamphaus +names-vulpkanin-last-dataset-105 = Kekoa +names-vulpkanin-last-dataset-106 = Keme +names-vulpkanin-last-dataset-107 = Kenefick +names-vulpkanin-last-dataset-108 = Kerberos +names-vulpkanin-last-dataset-109 = King +names-vulpkanin-last-dataset-110 = Kitchi +names-vulpkanin-last-dataset-111 = Kiviuq +names-vulpkanin-last-dataset-112 = Kocher +names-vulpkanin-last-dataset-113 = Kohl +names-vulpkanin-last-dataset-114 = Koi +names-vulpkanin-last-dataset-115 = Kokinos +names-vulpkanin-last-dataset-116 = Konala +names-vulpkanin-last-dataset-117 = Kracht +names-vulpkanin-last-dataset-118 = Kruspe +names-vulpkanin-last-dataset-119 = Kuruk +names-vulpkanin-last-dataset-120 = Kusinut +names-vulpkanin-last-dataset-121 = Lachner +names-vulpkanin-last-dataset-122 = Lambert +names-vulpkanin-last-dataset-123 = Lansa +names-vulpkanin-last-dataset-124 = Laomedeia +names-vulpkanin-last-dataset-125 = Lawson +names-vulpkanin-last-dataset-126 = Lee +names-vulpkanin-last-dataset-127 = Lehrer +names-vulpkanin-last-dataset-128 = Lexis +names-vulpkanin-last-dataset-129 = Licht +names-vulpkanin-last-dataset-130 = Lincoln +names-vulpkanin-last-dataset-131 = Llewelyn +names-vulpkanin-last-dataset-132 = Loge +names-vulpkanin-last-dataset-133 = Lorenzen +names-vulpkanin-last-dataset-134 = MacLeod +names-vulpkanin-last-dataset-135 = Maekh +names-vulpkanin-last-dataset-136 = Malone +names-vulpkanin-last-dataset-137 = Marks +names-vulpkanin-last-dataset-138 = Mason +names-vulpkanin-last-dataset-139 = Matoskah +names-vulpkanin-last-dataset-140 = Matthews +names-vulpkanin-last-dataset-141 = Mattick +names-vulpkanin-last-dataset-142 = Mauss +names-vulpkanin-last-dataset-143 = McCarthy +names-vulpkanin-last-dataset-144 = McKee +names-vulpkanin-last-dataset-145 = McKinney +names-vulpkanin-last-dataset-146 = McLeod +names-vulpkanin-last-dataset-147 = Meissner +names-vulpkanin-last-dataset-148 = Merkel +names-vulpkanin-last-dataset-149 = Mertz +names-vulpkanin-last-dataset-150 = Metzinger +names-vulpkanin-last-dataset-151 = Mikasi +names-vulpkanin-last-dataset-152 = Mimiteh +names-vulpkanin-last-dataset-153 = Misae +names-vulpkanin-last-dataset-154 = Moki +names-vulpkanin-last-dataset-155 = Mordecai +names-vulpkanin-last-dataset-156 = Morgan +names-vulpkanin-last-dataset-157 = Morris +names-vulpkanin-last-dataset-158 = Moss +names-vulpkanin-last-dataset-159 = Musca +names-vulpkanin-last-dataset-160 = Naiad +names-vulpkanin-last-dataset-161 = Namaka +names-vulpkanin-last-dataset-162 = Narvi +names-vulpkanin-last-dataset-163 = Nereid +names-vulpkanin-last-dataset-164 = Neso +names-vulpkanin-last-dataset-165 = Nest +names-vulpkanin-last-dataset-166 = Neuer +names-vulpkanin-last-dataset-167 = Nist +names-vulpkanin-last-dataset-168 = Nokomis +names-vulpkanin-last-dataset-169 = Nonovan +names-vulpkanin-last-dataset-170 = Noske +names-vulpkanin-last-dataset-171 = O'Neil +names-vulpkanin-last-dataset-172 = Okalani +names-vulpkanin-last-dataset-173 = Okomi +names-vulpkanin-last-dataset-174 = Oliana +names-vulpkanin-last-dataset-175 = Oliver +names-vulpkanin-last-dataset-176 = Pakuna +names-vulpkanin-last-dataset-177 = Pallene +names-vulpkanin-last-dataset-178 = Pavo +names-vulpkanin-last-dataset-179 = Pembroke +names-vulpkanin-last-dataset-180 = Penrose +names-vulpkanin-last-dataset-181 = Pichler +names-vulpkanin-last-dataset-182 = Parker +names-vulpkanin-last-dataset-183 = Povey +names-vulpkanin-last-dataset-184 = Preiss +names-vulpkanin-last-dataset-185 = Prospero +names-vulpkanin-last-dataset-186 = Protheroe +names-vulpkanin-last-dataset-187 = Pye +names-vulpkanin-last-dataset-188 = Pyxis +names-vulpkanin-last-dataset-189 = Quint +names-vulpkanin-last-dataset-190 = Rabe +names-vulpkanin-last-dataset-191 = Rahmer +names-vulpkanin-last-dataset-192 = Rease +names-vulpkanin-last-dataset-193 = Reger +names-vulpkanin-last-dataset-194 = Reichen +names-vulpkanin-last-dataset-195 = Reimold +names-vulpkanin-last-dataset-196 = Reiter +names-vulpkanin-last-dataset-197 = Rhees +names-vulpkanin-last-dataset-198 = Rhoderick +names-vulpkanin-last-dataset-199 = Robinson +names-vulpkanin-last-dataset-200 = Rosenthal +names-vulpkanin-last-dataset-201 = Rossmann +names-vulpkanin-last-dataset-202 = Rothman +names-vulpkanin-last-dataset-203 = Rue +names-vulpkanin-last-dataset-204 = Sagitta +names-vulpkanin-last-dataset-205 = Sahkyo +names-vulpkanin-last-dataset-206 = Sare +names-vulpkanin-last-dataset-207 = Sawyer +names-vulpkanin-last-dataset-208 = Schmid +names-vulpkanin-last-dataset-209 = Schoeler +names-vulpkanin-last-dataset-210 = Schoenberg +names-vulpkanin-last-dataset-211 = Schultze +names-vulpkanin-last-dataset-212 = Seals +names-vulpkanin-last-dataset-213 = Seidl +names-vulpkanin-last-dataset-214 = Sharpe +names-vulpkanin-last-dataset-215 = Shepard +names-vulpkanin-last-dataset-216 = Shepherd +names-vulpkanin-last-dataset-217 = Sicheii +names-vulpkanin-last-dataset-218 = Skinner +names-vulpkanin-last-dataset-219 = Skoll +names-vulpkanin-last-dataset-220 = Sommer +names-vulpkanin-last-dataset-221 = Spade +names-vulpkanin-last-dataset-222 = Staebler +names-vulpkanin-last-dataset-223 = Steel +names-vulpkanin-last-dataset-224 = Sycorax +names-vulpkanin-last-dataset-225 = Takala +names-vulpkanin-last-dataset-226 = Takoda +names-vulpkanin-last-dataset-227 = Tansy +names-vulpkanin-last-dataset-228 = Tarqeq +names-vulpkanin-last-dataset-229 = Tarvos +names-vulpkanin-last-dataset-230 = Tayanita +names-vulpkanin-last-dataset-231 = Taylor +names-vulpkanin-last-dataset-232 = Telesto +names-vulpkanin-last-dataset-233 = Tethys +names-vulpkanin-last-dataset-234 = Thalassa +names-vulpkanin-last-dataset-235 = Thiel +names-vulpkanin-last-dataset-236 = Toski +names-vulpkanin-last-dataset-237 = Trinculo +names-vulpkanin-last-dataset-238 = Tse +names-vulpkanin-last-dataset-239 = Veiel +names-vulpkanin-last-dataset-240 = Vohkinne +names-vulpkanin-last-dataset-241 = Umber +names-vulpkanin-last-dataset-242 = Ward +names-vulpkanin-last-dataset-243 = Webb +names-vulpkanin-last-dataset-244 = Weber +names-vulpkanin-last-dataset-245 = Weider +names-vulpkanin-last-dataset-246 = Werdin +names-vulpkanin-last-dataset-247 = Wildner +names-vulpkanin-last-dataset-248 = Wintsch +names-vulpkanin-last-dataset-249 = Wolfe +names-vulpkanin-last-dataset-250 = Yarwood +names-vulpkanin-last-dataset-251 = Yazhi +names-vulpkanin-last-dataset-252 = Yoki diff --git a/Resources/Locale/en-US/datasets/names/vulpkanin_male.ftl b/Resources/Locale/en-US/datasets/names/vulpkanin_male.ftl new file mode 100644 index 0000000000..9d3e1c29af --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/vulpkanin_male.ftl @@ -0,0 +1,83 @@ +names-vulpkanin-male-dataset-1 = Abharr +names-vulpkanin-male-dataset-2 = Admir +names-vulpkanin-male-dataset-3 = Aleksi +names-vulpkanin-male-dataset-4 = Alher +names-vulpkanin-male-dataset-5 = Andre +names-vulpkanin-male-dataset-6 = Antoni +names-vulpkanin-male-dataset-7 = Bakir +names-vulpkanin-male-dataset-8 = Barys +names-vulpkanin-male-dataset-9 = Baxter +# Wolf in Welsh +names-vulpkanin-male-dataset-10 = Bleidd +names-vulpkanin-male-dataset-11 = Branimir +names-vulpkanin-male-dataset-12 = Bruno +names-vulpkanin-male-dataset-13 = Brutus +names-vulpkanin-male-dataset-14 = Chavdar +names-vulpkanin-male-dataset-15 = Czcibor +names-vulpkanin-male-dataset-16 = Daris +names-vulpkanin-male-dataset-17 = Davor +names-vulpkanin-male-dataset-18 = Davorin +names-vulpkanin-male-dataset-19 = Demeter +names-vulpkanin-male-dataset-20 = Demir +names-vulpkanin-male-dataset-21 = Diego +names-vulpkanin-male-dataset-22 = Dorian +names-vulpkanin-male-dataset-23 = Edvard +names-vulpkanin-male-dataset-24 = Emir +names-vulpkanin-male-dataset-25 = Enver +names-vulpkanin-male-dataset-26 = Erik +names-vulpkanin-male-dataset-27 = Fedir +names-vulpkanin-male-dataset-28 = Fenrir +names-vulpkanin-male-dataset-29 = Fridrich +names-vulpkanin-male-dataset-30 = Garrett +names-vulpkanin-male-dataset-31 = Gaspar +names-vulpkanin-male-dataset-32 = Gerard +names-vulpkanin-male-dataset-33 = Gregor +names-vulpkanin-male-dataset-34 = Gustav +names-vulpkanin-male-dataset-35 = Hristofor +names-vulpkanin-male-dataset-36 = Hubert +names-vulpkanin-male-dataset-37 = Igor +names-vulpkanin-male-dataset-38 = Irfan +names-vulpkanin-male-dataset-39 = Ivan +names-vulpkanin-male-dataset-40 = Jarvald +names-vulpkanin-male-dataset-41 = Jerrih +names-vulpkanin-male-dataset-42 = Kasper +names-vulpkanin-male-dataset-43 = Krreor +names-vulpkanin-male-dataset-44 = Ksavier +names-vulpkanin-male-dataset-45 = Libor +# Lobomir misspelled on purpose +names-vulpkanin-male-dataset-46 = Lobomir +names-vulpkanin-male-dataset-47 = Lykaon +names-vulpkanin-male-dataset-48 = Mahir +names-vulpkanin-male-dataset-49 = Maksym +names-vulpkanin-male-dataset-50 = Martyn +names-vulpkanin-male-dataset-51 = Nazar +names-vulpkanin-male-dataset-52 = Nero +names-vulpkanin-male-dataset-53 = Nestor +names-vulpkanin-male-dataset-54 = Niko +names-vulpkanin-male-dataset-55 = Oktavian +names-vulpkanin-male-dataset-56 = Oliver +names-vulpkanin-male-dataset-57 = Omar +names-vulpkanin-male-dataset-58 = Oskar +names-vulpkanin-male-dataset-59 = Petr +names-vulpkanin-male-dataset-60 = Ranulf +names-vulpkanin-male-dataset-61 = Riot +names-vulpkanin-male-dataset-62 = Ruer +names-vulpkanin-male-dataset-63 = Ryhor +names-vulpkanin-male-dataset-64 = Slavomir +names-vulpkanin-male-dataset-65 = Sylvester +names-vulpkanin-male-dataset-66 = Teo +names-vulpkanin-male-dataset-67 = Tibor +names-vulpkanin-male-dataset-68 = Travis +names-vulpkanin-male-dataset-69 = Ulrick +names-vulpkanin-male-dataset-70 = Valter +names-vulpkanin-male-dataset-71 = Vasil +names-vulpkanin-male-dataset-72 = Verso +names-vulpkanin-male-dataset-73 = Viktor +names-vulpkanin-male-dataset-74 = Vladimir +# Wolf in Polish +names-vulpkanin-male-dataset-75 = Wilk +names-vulpkanin-male-dataset-76 = Xander +names-vulpkanin-male-dataset-77 = Zahari +names-vulpkanin-male-dataset-78 = Zaker +names-vulpkanin-male-dataset-79 = Zegrath +names-vulpkanin-male-dataset-80 = Zenon diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index bbafdd5ad3..02af3554fa 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -101,6 +101,9 @@ hugging-success-generic = You hug {THE($target)}. hugging-success-generic-others = { CAPITALIZE(THE($user)) } hugs {THE($target)}. hugging-success-generic-target = { CAPITALIZE(THE($user)) } hugs you. +petting-success-soft-floofy-vulp = You pet { THE($target) } on {POSS-ADJ($target)} soft floofy head. +petting-success-soft-floofy-vulp-others = { CAPITALIZE(THE($user)) } pets {THE($target)} on {POSS-ADJ($target)} soft floofy head. + ## Other petting-success-tesla = You pet {THE($target)}, violating the laws of nature and physics. diff --git a/Resources/Locale/en-US/markings/vulpkanin.ftl b/Resources/Locale/en-US/markings/vulpkanin.ftl new file mode 100644 index 0000000000..371856912a --- /dev/null +++ b/Resources/Locale/en-US/markings/vulpkanin.ftl @@ -0,0 +1,249 @@ +# Ears +marking-VulpEar-vulp = Vulpkanin ears (Base) +marking-VulpEar-vulp-inner = Vulpkanin ears (Inner) +marking-VulpEar = Vulpkanin + +marking-VulpEarFade-vulp = Vulpkanin ears (Base) +marking-VulpEarFade-vulp-fade = Vulpkanin ears (Fade) +marking-VulpEarFade-vulp-inner = Vulpkanin ears (Inner) +marking-VulpEarFade = Vulpkanin (Fade) + +marking-VulpEarSharp-vulp = Vulpkanin ears (Base) +marking-VulpEarSharp-vulp-sharp = Vulpkanin ears (Sharp) +marking-VulpEarSharp-vulp-inner = Vulpkanin ears (Inner) +marking-VulpEarSharp = Vulpkanin (Sharp) + +marking-VulpEarCoyote-coyote = Coyote ears (Base) +marking-VulpEarCoyote-coyote-inner = Coyote ears (Inner) +marking-VulpEarCoyote = Vulpkanin Coyote + +marking-VulpEarJackal-jackal = Jackal ears (Base) +marking-VulpEarJackal-jackal-inner = Jackal ears (Inner) +marking-VulpEarJackal = Vulpkanin Jackal + +marking-VulpEarTerrier-terrier = Terrier ears (Base) +marking-VulpEarTerrier-terrier-inner = Terrier ears (Inner) +marking-VulpEarTerrier = Vulpkanin Terrier + +marking-VulpEarFennec-fennec = Fennec ears (Base) +marking-VulpEarFennec-fennec-inner = Fennec ears (Inner) +marking-VulpEarFennec = Vulpkanin Fennec + +marking-VulpEarFox-fox = Fox ears (Base) +marking-VulpEarFox-fox-inner = Fox ears (Inner) +marking-VulpEarFox = Vulpkanin Fox + +marking-VulpEarOtie-otie = Otie ears (Base) +marking-VulpEarOtie-otie-inner = Otie ears (Inner) +marking-VulpEarOtie = Vulpkanin Otie + +marking-VulpEarShock-shock = Shock ears (Base) +marking-VulpEarShock-inner = Shock ears (Inner) +marking-VulpEarShock = Vulpkanin Shock + + +# Snout + +marking-VulpSnout-snout = Snout +marking-VulpSnout = Vulpkanin Snout + +marking-VulpSnoutNose-snout-nose = Nose +marking-VulpSnoutNose = Vulpkanin Nose + +marking-VulpSnoutVulpine-vulpine = Vulpine +marking-VulpSnoutVulpine = Vulpkanin Vulpine + +marking-VulpSnoutVulpineLines-vulpine-lines = Vulpine Lines +marking-VulpSnoutVulpineLines = Vulpkanin Vulpine Lines + +marking-VulpSnoutBlaze-blaze = Blaze +marking-VulpSnoutBlaze = Vulpkanin Blaze + +marking-VulpSnoutMask-mask = Mask +marking-VulpSnoutMask = Vulpkanin Mask + +marking-VulpSnoutTop-snout-top = Top +marking-VulpSnoutTop = Vulpkanin Snout Top + +marking-VulpSnoutPatch-patch = Patch +marking-VulpSnoutPatch = Vulpkanin Patch + + +# Head + +marking-VulpHeadBlaze-blaze = Blaze +marking-VulpHeadBlaze = Vulpkanin Blaze + +marking-VulpHeadMask-mask = Mask +marking-VulpHeadMask = Vulpkanin Mask + +marking-VulpPatch-patch = Patch +marking-VulpPatch = Vulpkanin Patch + +marking-VulpSlash-slash = Slash +marking-VulpSlash = Vulpkanin Slash + +marking-VulpStripes1-stripes_1 = Stripes +marking-VulpStripes1 = Vulpkanin Stripes 1 + +marking-VulpStripes2-stripes_2 = Stripes +marking-VulpStripes2 = Vulpkanin Stripes 2 + +marking-VulpVulpine-vulpine = Nose +marking-VulpVulpine = Vulpkanin Nose + + +# Tails + +marking-VulpTailFennec-fennec = Fennec tail (Base) +marking-VulpTailFennec-fennec-tip = Fennec tail (Tip) +marking-VulpTailFennec = Vulpkanin Fennec + +marking-VulpTailFluffy-fluffy = Fluffy tail (Base) +marking-VulpTailFluffy-fluffy-tip = Fluffy tail (Tip) +marking-VulpTailFluffy = Vulpkanin Fluffy + +marking-VulpTailHusky-husky = Husky tail (Base) +marking-VulpTailHusky-husky-inner = Husky tail (Inner) +marking-VulpTailHusky-husky-outer = Husky tail (Outer) +marking-VulpTailHusky = Vulpkanin Husky + +marking-VulpTailLong-long = Long tail (Base) +marking-VulpTailLong-long-tip = Long tail (Tip) +marking-VulpTailLong = Vulpkanin Long + +marking-VulpTailVulp-vulp = Vulpkanin tail (Base) +marking-VulpTailVulp-vulp-tip = Vulpkanin tail (Tip) +marking-VulpTailVulp = Vulpkanin + +marking-VulpTailVulpFade-vulp = Vulpkanin tail (Base) +marking-VulpTailVulpFade-vulp-fade = Vulpkanin tail (Fade) +marking-VulpTailVulpFade = Vulpkanin (Fade) + + +# Chest + +marking-VulpBellyCrest-belly_crest = Belly +marking-VulpBellyCrest = Vulpkanin Belly Crest + +marking-VulpBellyFull-belly_full = Belly +marking-VulpBellyFull = Vulpkanin Belly Full + +marking-VulpBellyFox-belly_fox = Belly +marking-VulpBellyFox = Vulpkanin Belly Fox + + +# Arms + +marking-VulpClawsHandLeft = Claws (Left Hand) +marking-VulpClawsHandRight = Claws (Right Hand) + +marking-VulpClawsHandLeft-claws_l_hand = Claws +marking-VulpClawsHandRight-claws_r_hand = Claws + +marking-VulpPointsCrestArmLeft = Crest (Left Arm) +marking-VulpPointsCrestHandLeft = Crest (Left Hand) +marking-VulpPointsCrestArmRight = Crest (Right Arm) +marking-VulpPointsCrestHandRight = Crest (Right Hand) + +marking-VulpPointsCrestArmLeft-crest-arm-l = Crest +marking-VulpPointsCrestHandLeft-crest-hand-l = Crest +marking-VulpPointsCrestArmRight-crest-arm-r = Crest +marking-VulpPointsCrestHandRight-crest-hand-r = Crest + +marking-VulpPointsFadeArmLeft = Fade (Left Arm) +marking-VulpPointsFadeHandLeft = Fade (Left Hand) +marking-VulpPointsFadeArmRight = Fade (Right Arm) +marking-VulpPointsFadeHandRight = Fade (Right Hand) + +marking-VulpPointsFadeArmLeft-points_fade-arm-l = Fade +marking-VulpPointsFadeHandLeft-points_fade-hand-l = Fade +marking-VulpPointsFadeArmRight-points_fade-arm-r = Fade +marking-VulpPointsFadeHandRight-points_fade-hand-r = Fade + +marking-VulpPointsSharpArmLeft = Sharp (Left Arm) +marking-VulpPointsSharpLongArmLeft = Sharp Long (Left Arm) +marking-VulpPointsSharpHandLeft = Sharp (Left Hand) +marking-VulpPointsSharpArmRight = Sharp (Right Arm) +marking-VulpPointsSharpLongArmRight = Sharp Long (Right Arm) +marking-VulpPointsSharpHandRight = Sharp (Right Hand) + +marking-VulpPointsSharpArmLeft-points_sharp-arm-l = Sharp +marking-VulpPointsSharpLongArmLeft-points_sharp-arm-long-l = Sharp Long +marking-VulpPointsSharpHandLeft-points_sharp-hand-l = Sharp +marking-VulpPointsSharpArmRight-points_sharp-arm-r = Sharp +marking-VulpPointsSharpLongArmRight-points_sharp-arm-long-r = Sharp Long +marking-VulpPointsSharpHandRight-points_sharp-hand-r = Sharp + + +# Legs + +marking-VulpClawsFootLeft = Claws (Left Foot) +marking-VulpClawsFootRight = Claws (Right Foot) + +marking-VulpClawsFootLeft-claws_l_foot = Claws +marking-VulpClawsFootRight-claws_r_foot = Claws + +marking-VulpPointsCrestLegLeft = Crest (Left Leg) +marking-VulpPointsCrestFootLeft = Crest (Left Foot) +marking-VulpPointsCrestLegRight = Crest (Right Leg) +marking-VulpPointsCrestFootRight = Crest (Right Foot) + +marking-VulpPointsCrestLegLeft-crest-leg-l = Crest +marking-VulpPointsCrestFootLeft-crest-foot-l = Crest +marking-VulpPointsCrestLegRight-crest-leg-r = Crest +marking-VulpPointsCrestFootRight-crest-foot-r = Crest + +marking-VulpPointsFadeLegLeft = Fade (Left Leg) +marking-VulpPointsFadeFootLeft = Fade (Left Foot) +marking-VulpPointsFadeLegRight = Fade (Right Leg) +marking-VulpPointsFadeFootRight = Fade (Right Foot) + +marking-VulpPointsFadeLegLeft-points_fade-leg-l = Fade +marking-VulpPointsFadeFootLeft-points_fade-foot-l = Fade +marking-VulpPointsFadeLegRight-points_fade-leg-r = Fade +marking-VulpPointsFadeFootRight-points_fade-foot-r = Fade + +marking-VulpPointsSharpLegLeft = Sharp (Left Leg) +marking-VulpPointsSharpFootLeft = Sharp (Left Foot) +marking-VulpPointsSharpLegRight = Sharp (Right Leg) +marking-VulpPointsSharpFootRight = Sharp (Right Foot) + +marking-VulpPointsSharpLegLeft-points_sharp-leg-l = Sharp +marking-VulpPointsSharpFootLeft-points_sharp-foot-l = Sharp +marking-VulpPointsSharpLegRight-points_sharp-leg-r = Sharp +marking-VulpPointsSharpFootRight-points_sharp-foot-r = Sharp + + +# Hair + +marking-VulpHairAdhara = Adhara +marking-VulpHairAnita = Anita +marking-VulpHairApollo = Apollo +marking-VulpHairBelle = Belle +marking-VulpHairBraided = Braided Hair +marking-VulpHairBun = Bun +marking-VulpHairCleanCut = Clean Cut +marking-VulpHairCurl = Curl +marking-VulpHairHawk = Hawk +marking-VulpHairJagged = Jagged +marking-VulpHairJeremy = Jeremy +marking-VulpHairKajam = Kajam +marking-VulpHairKeid = Keid +marking-VulpHairKleeia = Kleeia +marking-VulpHairMizar = Mizar +marking-VulpHairPunkBraided = Punk Braided +marking-VulpHairRaine = Raine +marking-VulpHairRough = Rough +marking-VulpHairShort = Short Hair +marking-VulpHairShort2 = Short Hair 2 +marking-VulpHairSpike = Spike + + +# Facial Hair + +marking-VulpFacialHairRuff = Ruff +marking-VulpFacialHairElder = Elder +marking-VulpFacialHairElderChin = Elder Chin +marking-VulpFacialHairKita = Kita +marking-VulpFacialHairGoatee = Beard (Snout Goatee) diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index edae826358..8c0900bb21 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -10,7 +10,8 @@ species-name-moth = Moth Person species-name-skeleton = Skeleton species-name-vox = Vox species-name-gingerbread = delicious baked good +species-name-vulpkanin = Vulpkanin ## Misc species things -snail-hurt-by-salt-popup = The salty solution burns like acid! \ No newline at end of file +snail-hurt-by-salt-popup = The salty solution burns like acid! diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index c8ea03502a..6202b49333 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -396,6 +396,17 @@ useDelay: 1 itemIconStyle: BigAction +# TODO: Add back once we have animated tails again. Were removed due to the sprite rework, causing all of them to not fit anymore. +# - type: entity +# parent: ActionToggleWagging +# id: ActionToggleWaggingVulpkanin +# components: +# - type: Action +# icon: { sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon } +# iconOn: { sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon } +# itemIconStyle: NoItem +# useDelay: 1 # Prevents Emote Spam + - type: entity parent: BaseAction id: ActionGravityJump @@ -410,6 +421,20 @@ - type: InstantAction event: !type:GravityJumpEvent {} +- type: entity + parent: BaseAction + id: ActionVulpkaninGravityJump + name: Leap + description: Use your agile legs to leap a short distance. Be careful not to bump into anything! + components: + - type: Action + useDelay: 12 + icon: + sprite: Interface/Actions/jump.rsi + state: icon + - type: InstantAction + event: !type:GravityJumpEvent {} + - type: entity parent: BaseToggleAction id: ActionToggleRootable diff --git a/Resources/Prototypes/Body/Parts/vulpkanin.yml b/Resources/Prototypes/Body/Parts/vulpkanin.yml new file mode 100644 index 0000000000..d563a6423f --- /dev/null +++ b/Resources/Prototypes/Body/Parts/vulpkanin.yml @@ -0,0 +1,89 @@ +# Limbs that spawn when gibbed should get descriptions. +- type: entity + abstract: true + parent: [ BasePart ] + id: PartVulpkanin + name: vulpkanin body part + components: + - type: Sprite + sprite: Mobs/Species/Vulpkanin/parts.rsi + +- type: entity + parent: [ PartVulpkanin, BaseTorso ] + id: TorsoVulpkanin + name: vulpkanin torso + components: + - type: Sprite + state: torso_m + +- type: entity + parent: [ PartVulpkanin, BaseHead ] + id: HeadVulpkanin + name: vulpkanin head + components: + - type: Sprite + state: head_m + +- type: entity + parent: [ PartVulpkanin, BaseLeftArm ] + id: LeftArmVulpkanin + name: left vulpkanin arm + components: + - type: Sprite + state: l_arm + +- type: entity + parent: [ PartVulpkanin, BaseRightArm ] + id: RightArmVulpkanin + name: right vulpkanin arm + components: + - type: Sprite + state: r_arm + +- type: entity + parent: [ PartVulpkanin, BaseLeftHand ] + id: LeftHandVulpkanin + name: left vulpkanin hand + components: + - type: Sprite + state: l_hand + +- type: entity + parent: [ PartVulpkanin, BaseRightHand ] + id: RightHandVulpkanin + name: right vulpkanin hand + components: + - type: Sprite + state: r_hand + +- type: entity + parent: [ PartVulpkanin, BaseLeftLeg ] + id: LeftLegVulpkanin + name: left vulpkanin leg + components: + - type: Sprite + state: l_leg + +- type: entity + parent: [ PartVulpkanin, BaseRightLeg ] + id: RightLegVulpkanin + name: right vulpkanin leg + components: + - type: Sprite + state: r_leg + +- type: entity + parent: [ PartVulpkanin, BaseLeftFoot ] + id: LeftFootVulpkanin + name: left vulpkanin foot + components: + - type: Sprite + state: l_foot + +- type: entity + parent: [ PartVulpkanin, BaseRightFoot ] + id: RightFootVulpkanin + name: right vulpkanin foot + components: + - type: Sprite + state: r_foot diff --git a/Resources/Prototypes/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/Body/Prototypes/vulpkanin.yml new file mode 100644 index 0000000000..ad0d1fcf2c --- /dev/null +++ b/Resources/Prototypes/Body/Prototypes/vulpkanin.yml @@ -0,0 +1,49 @@ +- type: body + id: Vulpkanin + name: vulpkanin + root: torso + slots: + head: + part: HeadVulpkanin + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoVulpkanin + connections: + - right arm + - left arm + - right leg + - left leg + organs: + heart: OrganAnimalHeart + lungs: OrganHumanLungs + stomach: OrganAnimalStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + right arm: + part: RightArmVulpkanin + connections: + - right hand + left arm: + part: LeftArmVulpkanin + connections: + - left hand + right hand: + part: RightHandVulpkanin + left hand: + part: LeftHandVulpkanin + right leg: + part: RightLegVulpkanin + connections: + - right foot + left leg: + part: LeftLegVulpkanin + connections: + - left foot + right foot: + part: RightFootVulpkanin + left foot: + part: LeftFootVulpkanin diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index ae0255f30e..1fff75cf71 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -321,3 +321,10 @@ id: ManifestedSpirit coefficients: Holy: 2 + +# Vulps get more heat damage because fur +- type: damageModifierSet + id: Vulpkanin + coefficients: + Heat: 1.15 + Cold: 0.85 diff --git a/Resources/Prototypes/Datasets/Names/vulpkanin_female.yml b/Resources/Prototypes/Datasets/Names/vulpkanin_female.yml new file mode 100644 index 0000000000..f13e5bfeb6 --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/vulpkanin_female.yml @@ -0,0 +1,5 @@ +- type: localizedDataset + id: names_vulpkanin_female + values: + prefix: names-vulpkanin-female-dataset- + count: 113 diff --git a/Resources/Prototypes/Datasets/Names/vulpkanin_last.yml b/Resources/Prototypes/Datasets/Names/vulpkanin_last.yml new file mode 100644 index 0000000000..298a29a16d --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/vulpkanin_last.yml @@ -0,0 +1,5 @@ +- type: localizedDataset + id: names_vulpkanin_last + values: + prefix: names-vulpkanin-last-dataset- + count: 252 diff --git a/Resources/Prototypes/Datasets/Names/vulpkanin_male.yml b/Resources/Prototypes/Datasets/Names/vulpkanin_male.yml new file mode 100644 index 0000000000..cb5589e365 --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/vulpkanin_male.yml @@ -0,0 +1,5 @@ +- type: localizedDataset + id: names_vulpkanin_male + values: + prefix: names-vulpkanin-male-dataset- + count: 80 diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index e4afec873c..5d512cb3c7 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -141,6 +141,7 @@ - Snout - HeadTop - HeadSide + - FacialHair - type: entity abstract: true @@ -189,6 +190,7 @@ - Snout - HeadTop - HeadSide + - FacialHair - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 699711e815..043c4f6166 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -33,6 +33,9 @@ head-vox: - state: equipped-head-light-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-light-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-light-reptilian shader: unshaded @@ -49,6 +52,10 @@ - state: equipped-head-vox - state: equipped-head-unshaded-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-vulpkanin + - state: equipped-head-unshaded-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-reptilian - state: equipped-head-unshaded-reptilian @@ -100,6 +107,9 @@ head-vox: - state: equipped-head-light-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-light-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-light-reptilian shader: unshaded @@ -116,6 +126,10 @@ - state: equipped-head-vox - state: equipped-head-unshaded-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-vulpkanin + - state: equipped-head-unshaded-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-reptilian - state: equipped-head-unshaded-reptilian @@ -161,6 +175,9 @@ head-vox: - state: equipped-head-light-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-light-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-light-reptilian shader: unshaded @@ -177,6 +194,10 @@ - state: equipped-head-vox - state: equipped-head-unshaded-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-vulpkanin + - state: equipped-head-unshaded-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-reptilian - state: equipped-head-unshaded-reptilian @@ -426,6 +447,9 @@ head-vox: - state: equipped-head-light-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-light-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-light-reptilian shader: unshaded @@ -442,6 +466,10 @@ - state: equipped-head-vox - state: equipped-head-unshaded-vox shader: unshaded + head-vulpkanin: + - state: equipped-head-vulpkanin + - state: equipped-head-unshaded-vulpkanin + shader: unshaded head-reptilian: - state: equipped-head-reptilian - state: equipped-head-unshaded-reptilian diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml new file mode 100644 index 0000000000..316332b7b0 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml @@ -0,0 +1,27 @@ +# Body Markings (Chest) +- type: marking + id: VulpBellyCrest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: belly_crest + +- type: marking + id: VulpBellyFull + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: belly_full + +- type: marking + id: VulpBellyFox + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: belly_fox \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml new file mode 100644 index 0000000000..12bba0c6c5 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml @@ -0,0 +1,115 @@ + +# Ears Markings +- type: marking + id: VulpEar + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp-inner + +- type: marking + id: VulpEarSharp + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp-sharp + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp-inner + +- type: marking + id: VulpEarFade + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp-fade + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: vulp-inner + +- type: marking + id: VulpEarJackal + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: jackal + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: jackal-inner + +- type: marking + id: VulpEarTerrier + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: terrier + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: terrier-inner + +- type: marking + id: VulpEarFennec + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: fennec + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: fennec-inner + +- type: marking + id: VulpEarFox + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: fox + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: fox-inner + +- type: marking + id: VulpEarOtie + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: otie + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: otie-inner + +- type: marking + id: VulpEarShock + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: shock + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: shock-inner + +- type: marking + id: VulpEarCoyote + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: coyote + - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi + state: coyote-inner diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_hair.yml new file mode 100644 index 0000000000..880f737977 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_hair.yml @@ -0,0 +1,261 @@ +# Hairs +- type: marking + id: VulpHairAdhara + bodyPart: Hair + speciesRestriction: [ Vulpkanin ] + markingCategory: Hair + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: adhara + +- type: marking + id: VulpHairAnita + bodyPart: Hair + speciesRestriction: [ Vulpkanin ] + markingCategory: Hair + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: anita + +- type: marking + id: VulpHairApollo + bodyPart: Hair + speciesRestriction: [ Vulpkanin ] + markingCategory: Hair + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: apollo + +- type: marking + id: VulpHairBelle + bodyPart: Hair + speciesRestriction: [ Vulpkanin ] + markingCategory: Hair + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: belle + +- type: marking + id: VulpHairBraided + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: braided + +- type: marking + id: VulpHairBun + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: bun + +- type: marking + id: VulpHairCleanCut + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: clean_cut + +- type: marking + id: VulpHairCurl + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: curl + +- type: marking + id: VulpHairHawk + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: hawk + +- type: marking + id: VulpHairJagged + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: jagged + +- type: marking + id: VulpHairJeremy + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: jeremy + +- type: marking + id: VulpHairKajam + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: kajam + +- type: marking + id: VulpHairKeid + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: keid + +- type: marking + id: VulpHairKleeia + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: kleeia + +- type: marking + id: VulpHairMizar + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: mizar + +- type: marking + id: VulpHairPunkBraided + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: punkbraided + +- type: marking + id: VulpHairRaine + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: raine + +- type: marking + id: VulpHairRough + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: rough + +- type: marking + id: VulpHairShort + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: short + +- type: marking + id: VulpHairShort2 + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: short2 + +- type: marking + id: VulpHairSpike + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/hair.rsi + state: spike + +# Facial Hairs +- type: marking + id: VulpFacialHairRuff + bodyPart: FacialHair + markingCategory: FacialHair + speciesRestriction: [ Vulpkanin ] + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi + state: ruff + +- type: marking + id: VulpFacialHairElder + bodyPart: FacialHair + markingCategory: FacialHair + speciesRestriction: [ Vulpkanin ] + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi + state: elder + +- type: marking + id: VulpFacialHairElderChin + bodyPart: FacialHair + markingCategory: FacialHair + speciesRestriction: [ Vulpkanin ] + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi + state: elder_chin + +- type: marking + id: VulpFacialHairKita + bodyPart: FacialHair + markingCategory: FacialHair + speciesRestriction: [ Vulpkanin ] + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi + state: kita + +- type: marking + id: VulpFacialHairGoatee + bodyPart: FacialHair + markingCategory: FacialHair + speciesRestriction: [ Vulpkanin ] + canBeDisplaced: false + sprites: + - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi + state: goatee diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_head.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_head.yml new file mode 100644 index 0000000000..6fefbe3e4c --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_head.yml @@ -0,0 +1,63 @@ +# Head Markings (Head) +- type: marking + id: VulpHeadBlaze + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi + state: blaze + +- type: marking + id: VulpHeadMask + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi + state: mask + +- type: marking + id: VulpPatch + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi + state: patch + +- type: marking + id: VulpSlash + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi + state: slash + +- type: marking + id: VulpStripes1 + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi + state: stripes_1 + +- type: marking + id: VulpStripes2 + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi + state: stripes_2 + +- type: marking + id: VulpVulpine + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi + state: vulpine diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_limbs.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_limbs.yml new file mode 100644 index 0000000000..23d7b0242f --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_limbs.yml @@ -0,0 +1,436 @@ +- type: marking + id: VulpClawsHandLeft + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: claws_l_hand + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpClawsHandRight + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: claws_r_hand + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpClawsFootLeft + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: claws_l_foot + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpClawsFootRight + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: claws_r_foot + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +# Crest + +## Left Side +- type: marking + id: VulpPointsCrestLegLeft + markingCategory: Legs + bodyPart: LLeg + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-leg-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsCrestArmLeft + markingCategory: Arms + bodyPart: LArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-arm-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsCrestFootLeft + markingCategory: Legs + bodyPart: LFoot + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-foot-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsCrestHandLeft + markingCategory: Arms + bodyPart: LHand + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-hand-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +## Right Side + +- type: marking + id: VulpPointsCrestLegRight + markingCategory: Legs + bodyPart: RLeg + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-leg-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsCrestArmRight + markingCategory: Arms + bodyPart: RArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-arm-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsCrestFootRight + markingCategory: Legs + bodyPart: RFoot + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-foot-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsCrestHandRight + markingCategory: Arms + bodyPart: RHand + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: crest-hand-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +# Fade + +## Left Side + +- type: marking + id: VulpPointsFadeLegLeft + markingCategory: Legs + bodyPart: LLeg + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-leg-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsFadeArmLeft + markingCategory: Arms + bodyPart: LArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-arm-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsFadeFootLeft + markingCategory: Legs + bodyPart: LFoot + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-foot-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsFadeHandLeft + markingCategory: Arms + bodyPart: LHand + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-hand-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +## Right Side + +- type: marking + id: VulpPointsFadeLegRight + markingCategory: Legs + bodyPart: RLeg + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-leg-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsFadeArmRight + markingCategory: Arms + bodyPart: RArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-arm-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsFadeFootRight + markingCategory: Legs + bodyPart: RFoot + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-foot-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsFadeHandRight + markingCategory: Arms + bodyPart: RHand + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_fade-hand-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +# Sharp + +## Left Side + +- type: marking + id: VulpPointsSharpLegLeft + markingCategory: Legs + bodyPart: LLeg + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-leg-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpArmLeft + markingCategory: Arms + bodyPart: LArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-arm-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpLongArmLeft + markingCategory: Arms + bodyPart: LArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-arm-long-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpFootLeft + markingCategory: Legs + bodyPart: LFoot + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-foot-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpHandLeft + markingCategory: Arms + bodyPart: LHand + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-hand-l + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +## Right Side + +- type: marking + id: VulpPointsSharpLegRight + markingCategory: Legs + bodyPart: RLeg + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-leg-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpArmRight + markingCategory: Arms + bodyPart: RArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-arm-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpLongArmRight + markingCategory: Arms + bodyPart: RArm + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-arm-long-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpFootRight + markingCategory: Legs + bodyPart: RFoot + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-foot-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" + +- type: marking + id: VulpPointsSharpHandRight + markingCategory: Arms + bodyPart: RHand + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi + state: points_sharp-hand-r + coloring: + default: + type: + !type:SimpleColoring + color: "#e5e3d1" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_snout.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_snout.yml new file mode 100644 index 0000000000..44c494d52d --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_snout.yml @@ -0,0 +1,73 @@ +# Snout Markings + +- type: marking + id: VulpSnout + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: snout + +- type: marking + id: VulpSnoutNose + bodyPart: Snout + markingCategory: SnoutCover + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: snout-nose + +- type: marking + id: VulpSnoutVulpine + bodyPart: Snout + markingCategory: SnoutCover + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: vulpine + +- type: marking + id: VulpSnoutVulpineLines + bodyPart: Snout + markingCategory: SnoutCover + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: vulpine-lines + +- type: marking + id: VulpSnoutBlaze + bodyPart: Snout + markingCategory: SnoutCover + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: blaze + +- type: marking + id: VulpSnoutMask + bodyPart: Snout + markingCategory: SnoutCover + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: mask + +- type: marking + id: VulpSnoutTop + bodyPart: Snout + markingCategory: SnoutCover + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: snout-top + +- type: marking + id: VulpSnoutPatch + bodyPart: Snout + markingCategory: SnoutCover + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi + state: patch diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml new file mode 100644 index 0000000000..238bf88134 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml @@ -0,0 +1,68 @@ +# Tail Markings +- type: marking + id: VulpTailFennec + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fennec + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fennec-tip + +- type: marking + id: VulpTailFluffy + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fluffy + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: fluffy-tip + +- type: marking + id: VulpTailHusky + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: husky + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: husky-inner + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: husky-outer + +- type: marking + id: VulpTailLong + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: long + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: long-tip + +- type: marking + id: VulpTailVulp + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: vulp + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: vulp-tip + +- type: marking + id: VulpTailVulpFade + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Vulpkanin ] + sprites: + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: vulp + - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi + state: vulp-fade \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index eaca0d719c..f4b7e2aca2 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -113,8 +113,8 @@ - type: marking id: TattooEyeRight bodyPart: Eyes - markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf] + markingCategory: [Head] + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, 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] coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml index 5c59f82744..ca100ea110 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml @@ -110,8 +110,10 @@ # that means we only need to copy them over when switching between species. # So these don't need to be part of the Body settings, unless someone makes a trait that adjusts these components. - BodyEmotes + - MessyDrinker # - Fixtures TODO: A better way to clone fixtures or a fixture fix. Currently if you devour someone on the ground and transform, you lose collision with tables as they were knocked down when they were copied. - Speech + - TemperatureProtection - TypingIndicator - ScaleVisuals # for dwarf height eventComponents: diff --git a/Resources/Prototypes/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Player/vulpkanin.yml new file mode 100644 index 0000000000..52a839dd4a --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Player/vulpkanin.yml @@ -0,0 +1,5 @@ +- type: entity + save: false + name: Urist McBark + parent: BaseMobVulpkanin + id: MobVulpkanin diff --git a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml new file mode 100644 index 0000000000..2a44c70270 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml @@ -0,0 +1,241 @@ +- type: entity + abstract: true + save: false + parent: [BaseMobSpeciesOrganic] + id: BaseMobVulpkanin + name: Urist McBark + components: + - type: Hunger + - type: Thirst + - type: MessyDrinker + spillChance: 0.33 + - type: Icon + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: full + - type: Body + prototype: Vulpkanin + - type: Speech + speechSounds: Vulpkanin + speechVerb: Vulpkanin + allowedEmotes: [ 'Bark', 'Snarl', 'Whine', 'Howl', 'Growl' ] + - type: Vocal + sounds: + Male: MaleVulpkanin + Female: FemaleVulpkanin + Unsexed: MaleVulpkanin + - type: Damageable + damageModifierSet: Vulpkanin + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/pierce.ogg + animation: WeaponArcClaw + damage: + types: + Piercing: 2 + Slash: 3 + - type: Temperature # Same as moth temperatures until below is solved. + heatDamageThreshold: 320 # TODO: 315 when there is a way to make the temperature alert not blink to the side of the screen and disappear when you "sweat" at 39C. + coldDamageThreshold: 230 # TODO: 220 when the above is solved. + specificHeat: 44 + coldDamage: + types: + Cold: 0.05 # Per second, scales with temperature & other constants + heatDamage: + types: + Heat: 2.5 # Per second, scales with temperature & other constants + # - type: Wagging TODO: Add back once we have animated tails again. Were removed due to the sprite rework, causing all of them to not fit anymore. + # action: ActionToggleWaggingVulpkanin + - 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 + - type: InteractionPopup # Crucial detail. + successChance: 1 + interactSuccessString: petting-success-soft-floofy-vulp + messagePerceivedByOthers: petting-success-soft-floofy-vulp-others + interactFailureString: petting-failure-generic + - type: Sprite # Drawlayers. Top to bottom in order I believe. + netsync: false + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ] + - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ] + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.SnoutCover" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] + sprite: "Effects/creampie.rsi" + state: "creampie_vulpkanin" + visible: false + - type: HumanoidAppearance + species: Vulpkanin + hideLayersOnEquip: + - Snout + - SnoutCover + - 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 + +- type: entity + parent: [BaseSpeciesDummy] + id: MobVulpkaninDummy + name: Vulpkanin Dummy + categories: [ HideSpawnMenu ] + description: A dummy Vulpkanin meant to be used in character setup. + components: + - type: HumanoidAppearance + species: Vulpkanin + hideLayersOnEquip: + - 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 diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index 78111d0fd1..9783b23285 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -3,14 +3,15 @@ name: guide-entry-species text: "/ServerInfo/Guidebook/Mobs/Species.xml" children: - - Arachnid - - Diona - - Dwarf - - Human - - Moth - - Reptilian - - SlimePerson - - Vox + - Arachnid + - Diona + - Dwarf + - Human + - Moth + - Reptilian + - SlimePerson + - Vox + - Vulpkanin - type: guideEntry id: Arachnid @@ -51,3 +52,8 @@ id: Vox name: species-name-vox text: "/ServerInfo/Guidebook/Mobs/Vox.xml" + +- type: guideEntry + id: Vulpkanin + name: species-name-vulpkanin + text: "/ServerInfo/Guidebook/Mobs/Vulpkanin.xml" diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 2f12b9a1f5..04bb1d8bdf 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -18,6 +18,7 @@ - Human - Moth - Reptilian + - Vulpkanin - type: loadoutEffectGroup id: EffectSpeciesVox @@ -75,6 +76,7 @@ - Dwarf - Human - Reptilian + - Vulpkanin - type: loadoutEffectGroup id: OxygenBreatherMimeMoth diff --git a/Resources/Prototypes/SoundCollections/screams.yml b/Resources/Prototypes/SoundCollections/screams.yml index 34cdeaf374..8339678d8d 100644 --- a/Resources/Prototypes/SoundCollections/screams.yml +++ b/Resources/Prototypes/SoundCollections/screams.yml @@ -61,3 +61,11 @@ - /Audio/Machines/robotscream_7.ogg - /Audio/Machines/robotscream_8.ogg - /Audio/Machines/robotscream_9.ogg + +- type: soundCollection + id: VulpkaninScreams + files: + - /Audio/Voice/Vulpkanin/vulp_scream1.ogg + - /Audio/Voice/Vulpkanin/vulp_scream2.ogg + - /Audio/Voice/Vulpkanin/vulp_scream3.ogg + - /Audio/Voice/Vulpkanin/vulp_scream4.ogg diff --git a/Resources/Prototypes/SoundCollections/vulpkanin.yml b/Resources/Prototypes/SoundCollections/vulpkanin.yml new file mode 100644 index 0000000000..89ce641f39 --- /dev/null +++ b/Resources/Prototypes/SoundCollections/vulpkanin.yml @@ -0,0 +1,33 @@ +- type: soundCollection + id: VulpkaninBarks + files: + - /Audio/Voice/Vulpkanin/dog_bark1.ogg + - /Audio/Voice/Vulpkanin/dog_bark2.ogg + - /Audio/Voice/Vulpkanin/dog_bark3.ogg + +- type: soundCollection + id: VulpkaninGrowls + files: + - /Audio/Voice/Vulpkanin/dog_growl1.ogg + - /Audio/Voice/Vulpkanin/dog_growl2.ogg + - /Audio/Voice/Vulpkanin/dog_growl3.ogg + - /Audio/Voice/Vulpkanin/dog_growl4.ogg + - /Audio/Voice/Vulpkanin/dog_growl5.ogg + - /Audio/Voice/Vulpkanin/dog_growl6.ogg + +- type: soundCollection + id: VulpkaninSnarls + files: + - /Audio/Voice/Vulpkanin/dog_snarl1.ogg + - /Audio/Voice/Vulpkanin/dog_snarl2.ogg + - /Audio/Voice/Vulpkanin/dog_snarl3.ogg + +- type: soundCollection + id: VulpkaninWhines + files: + - /Audio/Voice/Vulpkanin/dog_whine.ogg + +- type: soundCollection + id: VulpkaninHowls + files: + - /Audio/Voice/Vulpkanin/howl.ogg diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml index 63c196b95d..e226d2064a 100644 --- a/Resources/Prototypes/Species/species_weights.yml +++ b/Resources/Prototypes/Species/species_weights.yml @@ -6,3 +6,4 @@ Reptilian: 4 SlimePerson: 4 Diona: 2 + Vulpkanin: 4 diff --git a/Resources/Prototypes/Species/vulpkanin.yml b/Resources/Prototypes/Species/vulpkanin.yml new file mode 100644 index 0000000000..5d2b4418c8 --- /dev/null +++ b/Resources/Prototypes/Species/vulpkanin.yml @@ -0,0 +1,168 @@ +- type: species + id: Vulpkanin + name: species-name-vulpkanin + roundStart: true + prototype: MobVulpkanin + sprites: MobVulpkaninSprites + defaultSkinTone: "#5a3f2d" + markingLimits: MobVulpkaninMarkingLimits + dollPrototype: MobVulpkaninDummy + skinColoration: Hues # TODO: Introduce clamping once #39175 or a similiar PR is merged. Ideally lower max saturation to around 80% and some minimum brightness. Same for markings. + maleFirstNames: names_vulpkanin_male + femaleFirstNames: names_vulpkanin_female + lastNames: names_vulpkanin_last + +- type: speciesBaseSprites + id: MobVulpkaninSprites + sprites: + Head: MobVulpkaninHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + SnoutCover: MobHumanoidAnyMarking + UndergarmentTop: MobHumanoidAnyMarking + UndergarmentBottom: MobHumanoidAnyMarking + Chest: MobVulpkaninTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobHumanoidAnyMarking + Eyes: MobVulpkaninEyes + LArm: MobVulpkaninLArm + RArm: MobVulpkaninRArm + LHand: MobVulpkaninLHand + RHand: MobVulpkaninRHand + LLeg: MobVulpkaninLLeg + RLeg: MobVulpkaninRLeg + LFoot: MobVulpkaninLFoot + RFoot: MobVulpkaninRFoot + +- type: markingPoints # 6 points on arms and legs due to the "expected" marking usage. Two for hands, two for arms and 2 for claws. Can be lower once we have a distinction between LeftArm and RightArm instead of just Arms. + id: MobVulpkaninMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + onlyWhitelisted: true # Beards lack displacement maps and are impossible to displace onto a snout. + required: false + Snout: + points: 1 + required: true + defaultMarkings: [ VulpSnout ] + SnoutCover: + points: 3 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ VulpTailVulp ] + Head: + points: 3 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ VulpEar ] + UndergarmentTop: + points: 1 + required: false + UndergarmentBottom: + points: 1 + required: false + Arms: + points: 6 + required: false + Legs: + points: 6 + required: false + +- type: humanoidBaseSprite + id: MobVulpkaninEyes + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: eyes + +- type: humanoidBaseSprite + id: MobVulpkaninHead + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobVulpkaninHeadMale + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobVulpkaninHeadFemale + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobVulpkaninTorso + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobVulpkaninTorsoMale + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobVulpkaninTorsoFemale + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobVulpkaninLLeg + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobVulpkaninLHand + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobVulpkaninLArm + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobVulpkaninLFoot + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobVulpkaninRLeg + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobVulpkaninRHand + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobVulpkaninRArm + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobVulpkaninRFoot + baseSprite: + sprite: Mobs/Species/Vulpkanin/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index ee2b1e0d5f..c21091051c 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -458,6 +458,63 @@ Ping: collection: XenoborgPing +# Vulp Sounds +- type: emoteSounds + id: MaleVulpkanin + params: + variation: 0.125 + sounds: + Laugh: + collection: MaleLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Whistle: + collection: Whistles + Sigh: + collection: MaleSigh + Scream: + collection: VulpkaninScreams + Growl: + collection: VulpkaninGrowls + Snarl: + collection: VulpkaninSnarls + Bark: + collection: VulpkaninBarks + Whine: + collection: VulpkaninWhines + Howl: + collection: VulpkaninHowls + +- type: emoteSounds + id: FemaleVulpkanin + params: + variation: 0.125 + sounds: + Laugh: + collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + Whistle: + collection: Whistles + Sigh: + collection: FemaleSigh + Scream: + collection: VulpkaninScreams + Growl: + collection: VulpkaninGrowls + Snarl: + collection: VulpkaninSnarls + Bark: + collection: VulpkaninBarks + Whine: + collection: VulpkaninWhines + Howl: + collection: VulpkaninHowls + # body emotes - type: emoteSounds id: GeneralBodyEmotes diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 64f39fe8a3..b5e546480d 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -198,6 +198,97 @@ - click - clicks +# Vulpkanin +- type: emote + id: Bark + name: chat-emote-name-bark + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [barks.] + chatTriggers: + - bark + - barks + - barked + - barking + +- type: emote + id: Snarl + name: chat-emote-name-snarl + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [snarls.] + chatTriggers: + - snarl + - snarls + - snarled + - snarling + +- type: emote + id: Whine + name: chat-emote-name-whine + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [whines.] + chatTriggers: + - whine + - whines + - whined + - whining + +- type: emote + id: Howl + name: chat-emote-name-howl + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [howls.] + chatTriggers: + - howl + - howls + - howling + - howled + +- type: emote + id: Growl + name: chat-emote-name-growl + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [growls.] + chatTriggers: + - growl + - growls + - growled + - growling + # hand emotes - type: emote id: Clap diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml index 5f48013e87..d11e32d5d6 100644 --- a/Resources/Prototypes/Voice/speech_sounds.yml +++ b/Resources/Prototypes/Voice/speech_sounds.yml @@ -178,6 +178,15 @@ exclaimSound: path: /Audio/Animals/goat_bah.ogg +- type: speechSounds + id: Vulpkanin + saySound: + path: /Audio/Voice/Talk/vulp.ogg + askSound: + path: /Audio/Voice/Talk/vulp_ask.ogg + exclaimSound: + path: /Audio/Voice/Talk/vulp_exclaim.ogg + - type: speechSounds id: Wawa saySound: diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml index 39f304018b..1b8d6a0ac5 100644 --- a/Resources/Prototypes/Voice/speech_verbs.yml +++ b/Resources/Prototypes/Voice/speech_verbs.yml @@ -173,6 +173,15 @@ - chat-speech-verb-electricity-2 - chat-speech-verb-electricity-3 +- type: speechVerb + id: Vulpkanin + name: chat-speech-verb-vulpkanin + speechVerbStrings: + - chat-speech-verb-vulpkanin-1 + - chat-speech-verb-vulpkanin-2 + - chat-speech-verb-vulpkanin-3 + - chat-speech-verb-vulpkanin-4 + - type: speechVerb id: Wawa name: chat-speech-verb-name-wawa diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index f1b36f9d73..fc9c5db710 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -15,5 +15,8 @@ + + + diff --git a/Resources/ServerInfo/Guidebook/Mobs/Vulpkanin.xml b/Resources/ServerInfo/Guidebook/Mobs/Vulpkanin.xml new file mode 100644 index 0000000000..8ee0b17727 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Mobs/Vulpkanin.xml @@ -0,0 +1,16 @@ + + # Vulpkanin + + + + + + Vulpkanin, due to their dense fur, [color=#1e90ff]prefer colder temperatures[/color] and [color=#ffa500]heat up faster.[/color] + Their agile (but clumsy) legs allow them to leap short distances, be careful not to bump into anything! + + Their diet allows them to safely eat raw meat but they get poisoned by theobromine. + + Their weirdly shaped muzzle leads to difficulties drinking, making them sometimes spill small amounts of whatever they drank onto the ground. + + They take [color=#1e90ff]15% less Cold damage[/color] but [color=#ffa500]15% more Heat damage.[/color]. + diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json index 9f0ca9d7d5..8d193c197d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Reptilian states by TiniestShark (Github)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-equipped-HELMET-reptilian", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..b2d0af2958 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..bdfaafecb8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json index 9f0ca9d7d5..8d193c197d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Reptilian states by TiniestShark (Github)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-equipped-HELMET-reptilian", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..c3c622c191 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..7d90c69661 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json index 797289b12e..699cfa711e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Reptilian state by TiniestShark (Github)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github)", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-equipped-HELMET-reptilian", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..37fa840749 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..ff127877ed Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json index 9f0ca9d7d5..8d193c197d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Reptilian states by TiniestShark (Github)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-equipped-HELMET-reptilian", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..5e1ce0f264 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..e906af3b09 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json index 9f0ca9d7d5..8d193c197d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Reptilian states by TiniestShark (Github)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-equipped-HELMET-reptilian", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..936a565b1d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..e997e77261 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vulpkanin.png new file mode 100644 index 0000000000..1583682958 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vulpkanin.png new file mode 100644 index 0000000000..a5888c1525 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png new file mode 100644 index 0000000000..d8ec3fcf24 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index de6873e510..b836ddf24d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states made by Flareguy for SS14. equipped-head-dog modified from equipped-head by Sparlight (GitHub). equipped-head-light-dog modified from equipped-head-light by Sparlight (GitHub). equipped-head-unshaded-dog modified from equipped-head-unshaded by Sparlight (GitHub). Reptilian states by TiniestShark (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states made by Flareguy for SS14. equipped-head-dog modified from equipped-head by Sparlight (GitHub). equipped-head-light-dog modified from equipped-head-light by Sparlight (GitHub). equipped-head-unshaded-dog modified from equipped-head-unshaded by Sparlight (GitHub). Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -43,6 +43,18 @@ "name": "equipped-head-unshaded-vox", "directions": 4 }, + { + "name": "equipped-head-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-light-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-vulpkanin", + "directions": 4 + }, { "name": "equipped-head-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..a00e2ce75f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json index 1ed746dd7e..bc5b39e8b1 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET by Sparlight (GitHub).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET by Sparlight (GitHub), vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-HELMET-dog", "directions": 4 }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index 4fb1630995..94ee712358 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14. Vox states by Flareguy for SS14. Dog states modified from base states in a collaborative shared effort by casiliuscestus (GitHub), Sparlight (GitHub), and Raccoononi (GitHub) for SS14. Reptilian states by TiniestShark (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14. Vox states by Flareguy for SS14. Dog states modified from base states in a collaborative shared effort by casiliuscestus (GitHub), Sparlight (GitHub), and Raccoononi (GitHub) for SS14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -41,6 +41,14 @@ "name": "on-equipped-HELMET-reptilian", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "on-equipped-HELMET-dog", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..594f893277 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..eb426189b1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..f665139df6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index f0207bb688..26ddd960ef 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state by Flareguy for SS14. Vulpkanin states by TiniestShark (Github)", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-HELMET-vox", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vulpkanin.png new file mode 100644 index 0000000000..52261ea29b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vulpkanin.png new file mode 100644 index 0000000000..2da6040ec6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vulpkanin.png new file mode 100644 index 0000000000..457f45b46f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 408be006cf..677dcde457 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -66,6 +66,18 @@ { "name": "equipped-head-unshaded-dog", "directions": 4 + }, + { + "name": "equipped-head-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-light-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vulpkanin.png new file mode 100644 index 0000000000..52261ea29b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vulpkanin.png new file mode 100644 index 0000000000..2da6040ec6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vulpkanin.png new file mode 100644 index 0000000000..9a25a7caf4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json index 9ac76a6b83..5a3a068eac 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Vulpkanin and Reptilian states by TiniestShark (github).", "size": { "x": 32, "y": 32 @@ -66,6 +66,18 @@ { "name": "equipped-head-unshaded-dog", "directions": 4 + }, + { + "name": "equipped-head-light-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json index e7bcd692b1..9094ad9c12 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Reptilian states by TiniestShark (Github)", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,14 @@ "name": "on-equipped-HELMET-vox", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..1b4dbe743b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..c0522fd8d2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json index 88dabe491a..9c72a18f05 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub), vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-vox", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..471bdb6e3a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..f7edf7fc2e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json index 8e2d7ffa51..b77964a470 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states made by Flareguy for SS14. Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states made by Flareguy for SS14. Dog states modified from base states by Sparlight (GitHub). Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,14 @@ "name": "on-equipped-HELMET-vox", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..88c5c2081b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..11179b057a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json index 173acff6f9..2503479959 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,14 @@ "name": "on-equipped-HELMET-vox", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..7990e7c91e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..d7a68bd7e2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json index 327d019285..abf9f5df9c 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Reptilian states by TiniestShark (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,14 @@ "name": "on-equipped-HELMET-vox", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..5a75da60ee Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..9bbd474272 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json index 5063697595..d5939650ab 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14. Vox states by Flareguy for Space Station 14. Reptilian states by TiniestShark (Github)", + "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14. Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-vox", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..a9838f4da4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..a423b15d38 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json index 7afc9e6e12..ae8704a6a2 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (Github)", + "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -37,6 +37,14 @@ "name": "on-equipped-HELMET-reptilian", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "on-equipped-HELMET-dog", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..b15aac2c6b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..13dfd5b4d4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-vulpkanin.png new file mode 100644 index 0000000000..ecedc601f0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-vulpkanin.png new file mode 100644 index 0000000000..54b275df68 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png new file mode 100644 index 0000000000..ec214c187a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json index 5ca348323f..14733a86f4 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404. Vox states by Flareguy for SS14. Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (Github)", + "copyright": "Original by Emisse, modified by EmoGarbage404. Vox states by Flareguy for SS14. Dog states modified from base states by Sparlight (GitHub). Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, @@ -44,6 +44,18 @@ "name": "equipped-head-unshaded-vox", "directions": 4 }, + { + "name": "equipped-head-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-light-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-vulpkanin", + "directions": 4 + }, { "name": "equipped-head-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json index a1281af068..a5e1c85e00 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14, dog states modified from base states by casiliuscestus (GitHub) for Space Station 14. Reptilian states by TiniestShark (Github).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14, dog states modified from base states by casiliuscestus (GitHub) for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,14 @@ "name": "on-equipped-HELMET-vox", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..3dfeab3a5b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..79efdf9f48 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json index bed041dc33..5797ccbd36 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Scrubdelub (GitHub) for Space Station 14. Reptilian state by TiniestShark (Github).", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Scrubdelub (GitHub) for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, @@ -30,6 +30,14 @@ "name": "on-equipped-HELMET-vox", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..1b8c1c45c5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..fcc47feff1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json index b06adf10de..22db9c8df3 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json @@ -1,7 +1,8 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14. Dog states modified from base states by casiliuscestus for Space Station 14. Reptilian states by TiniestShark (Github).", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14. Dog states modified from base states by casiliuscestus for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", + "size": { "x": 32, "y": 32 @@ -21,6 +22,14 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-vox", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..51fc59ad19 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..308fd60ff9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json index 38073c60e1..f6502df22b 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github). Vox states by Flareguy for Space Station 14. Reptilian state by TiniestShark (Github).", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github). Vox states by Flareguy for Space Station 14. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,14 @@ "name": "on-equipped-HELMET-vox", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..1b920b43ea Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..cc47c5b779 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json index a12c9e18b6..d97a50b933 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub). Vulpkanin states by TiniestShark (Github)", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "off-equipped-HELMET-vox", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..73c3eb8c37 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..7967c2b98e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..a53e225cf1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json index 1ec42d8676..12f9dcfd9a 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET in parts and collaboration by Sparlight (GitHub) and Raccoononi (GitHub). Reptilian state by TiniestShark (Github)", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET in parts and collaboration by Sparlight (GitHub) and Raccoononi (GitHub). Vulpkanin and Reptilian state by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -26,6 +26,10 @@ "name": "equipped-HELMET-dog", "directions": 4 }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..007e1da74d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json index b8564ef427..0212f8f482 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET in parts and collaboration by Sparlight (GitHub) and Raccoononi (GitHub). Reptilian states by TiniestShark (Github)", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET in parts and collaboration by Sparlight (GitHub) and Raccoononi (GitHub). Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -26,6 +26,10 @@ "name": "equipped-HELMET-dog", "directions": 4 }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..ea18bd353f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json index f23dec5cd9..f90b1ca0dc 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. Reptilian states by TiniestShark (Github)", + "copyright": "Sprite edited by Flareguy for SS14, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. Vulpkanin and Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..f10c9173ff Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json index 4d3520881c..8aa54f6a8a 100644 --- a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit). Vox state by Flareguy for SS14. Reptilian state by TiniestShark (Github).", + "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit). Vox state by Flareguy for SS14. Vulpkanin version made by Floofers. Reptilian state by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json index 5e5c1cf2e0..057d0b0ab2 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..93b33ef9b9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json index 04f0d87cf2..2dd3c5010c 100644 --- a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. vox state by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. vox state by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157dm, resprited for SS14 by MilonPL", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, { "name": "equipped-HELMET-vox", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..4c6ce58ca3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json index e9b30b5437..5d0093fe7e 100644 --- a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", + "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state | ulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -44,6 +44,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..d6c8799127 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..cab90cf170 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json index b486fbbc86..68ca6518bc 100644 --- a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", + "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -44,6 +44,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..b6749f9860 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..46e451b3c9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json index 2a9b8dfba7..f46ecd5beb 100644 --- a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 | ulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -44,6 +44,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..34296974d1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..701775a222 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json index 10c0a80701..569555b869 100644 --- a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -52,6 +52,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..39c534f564 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..a326b5db4a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/blushingclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/blushingclown.rsi/meta.json index 1fcceb3516..104886feb8 100644 --- a/Resources/Textures/Clothing/Mask/blushingclown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/blushingclown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..54828c8bd6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/blushingmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/blushingmime.rsi/meta.json index 88aad8fdc9..8db7368657 100644 --- a/Resources/Textures/Clothing/Mask/blushingmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/blushingmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..d317cba50e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index 654b8824dc..c37ca01b35 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox & up-equipped-MASK-vox state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox & up-equipped-MASK-vox state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -73,6 +73,14 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..d8ae1134fb Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..38ea9a62c8 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json index de1f50a21b..c465987d07 100644 --- a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -26,6 +26,10 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..070974034f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json index bd410c6de9..dad21e1844 100644 --- a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github), vox edit by Flareguy", + "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github), vox edit by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..488c0387a7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json index b8ea712aff..c4c8ecef98 100644 --- a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github), vox edit by Flareguy", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github), vox edit by Flareguy | vulpkanin version made by Floofers", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..fba0ec9b2b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json index ae1156c2f3..e851f85ea4 100644 --- a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -26,6 +26,10 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..141a7cc981 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json index f0d269dcd4..10425dd461 100644 --- a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state modified by Flareguy from 'gas-alt' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state modified by Flareguy from 'gas-alt' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..d13d3212c0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json index d54a0aedee..8bb6909e45 100644 --- a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for ss14. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from 'gas-alt' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e, and modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for ss14. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from 'gas-alt' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e, and modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..9d85ba2f06 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json index dc99f7504b..d4879abf8a 100644 --- a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..91da2da7c7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json index 021dcf76b7..a83de36ef9 100644 --- a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). Vox state by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). Vox state by Flareguy for SS14 | vulpkanin version edited by Floofers", "size": { "x": 32, "y": 32 @@ -30,6 +30,10 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..b9395a9026 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index 9c1b597c1d..576b3d129f 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox & up-equipped-MASK-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox & up-equipped-MASK-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -37,6 +37,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..a7c913dc1e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json index 22e5230685..9db104ae10 100644 --- a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified to fix an error", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified to fix an error | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -28,6 +28,16 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ] + ] + }, { "name": "equipped-MASK-reptilian", "directions": 4, diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..9bde35f041 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json index b36ab9a3a6..71ce7feeec 100644 --- a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..687ac3aed3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index 6d0cf06eee..ed5341f1b6 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox & up-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox & up-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -64,6 +64,14 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..99c3205640 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..d317cba50e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json index 9f566f23b9..99c06491bb 100644 --- a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by LinkUyx#6557. Reptilian edit by Nairod(Github)", + "copyright": "Sprited by LinkUyx#6557. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -54,6 +54,14 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..d8ae1134fb Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..cdcebb8231 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json index 5b745bcfd0..b7708a22e3 100644 --- a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github), equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified to look like mercenary gas mask by Flareguy", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github), equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified to look like mercenary gas mask by Flareguy | vulpkanin version edited by Floofers", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..cf3d8629a3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json index 41f28d6b51..b938e221c2 100644 --- a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d and edited by Floofers", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-MASK-hamster", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..8de17b9d3a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json b/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json index 19aa5ab859..969938d847 100644 --- a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..886ea7a9b1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json index 4da74959dd..6845040bf6 100644 --- a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord) | equipped-MASK-vox sprited by PuroSlavKing (Github)", + "copyright": "Sprited by belay5 (Discord) | equipped-MASK-vox sprited by PuroSlavKing (Github) | equipped-MASK-vulpkanin sprited by TJohnson (Delta-V)", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..80efc668dd Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json index d5005eec9f..21cd28bf15 100644 --- a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github). equipped-MASK-vox sprited by PuroSlavKing (Github) and recolored by Flareguy", + "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github). equipped-MASK-vox sprited by PuroSlavKing (Github) and recolored by Flareguy | equipped-MASK-vulpkanin sprited by TJohnson (Delta-V)", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..95d236c98b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json index a8d15a80ad..27858f0e76 100644 --- a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997. equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997. equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -25,6 +25,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..528fa82fc8 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json index 028c4bcc29..2469f1db45 100644 --- a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh. equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh. equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-vox", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..da36b18523 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json index c43909e6a9..572b364904 100644 --- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github).Vox edit by foboscheshir (github)", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github).Vox edit by foboscheshir (github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..c0dda91a72 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json index 413a718154..a21dbca961 100644 --- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). . Vox edit by foboscheshir (github)", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). . Vox edit by foboscheshir (github) | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 edited by Floofers", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..71f2c83018 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json index 7af2fde86e..6e4782881a 100644 --- a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -37,6 +37,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..4e0309f011 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..23cfef31d1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json index 2d5073b988..b767cf5ffb 100644 --- a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", + "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_vulpkanin.png b/Resources/Textures/Effects/creampie.rsi/creampie_vulpkanin.png new file mode 100644 index 0000000000..53369c158d Binary files /dev/null and b/Resources/Textures/Effects/creampie.rsi/creampie_vulpkanin.png differ diff --git a/Resources/Textures/Effects/creampie.rsi/meta.json b/Resources/Textures/Effects/creampie.rsi/meta.json index 8db8a77945..67b4981767 100644 --- a/Resources/Textures/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/Effects/creampie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0. creampie_moth by MilenVolf, creampie_arachnid by PixelTheKermit (Github), creampie_vox by Errant", + "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0. creampie_moth by MilenVolf, creampie_arachnid by PixelTheKermit (Github), creampie_vox by Errant, creampie_vulpkanin by Floofers", "size": { "x": 32, "y": 32 @@ -83,6 +83,10 @@ { "name": "creampie_xenomorph", "directions": 4 - } + }, + { + "name": "creampie_vulpkanin", + "directions": 4 + } ] } diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest.png new file mode 100644 index 0000000000..61a0b9b49b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox.png new file mode 100644 index 0000000000..41d2abe2ad Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full.png new file mode 100644 index 0000000000..4100cd7036 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_l_foot.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_l_foot.png new file mode 100644 index 0000000000..4cb29842b8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_l_foot.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_l_hand.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_l_hand.png new file mode 100644 index 0000000000..4a99e5b793 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_l_hand.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_r_foot.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_r_foot.png new file mode 100644 index 0000000000..2f24c99f41 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_r_foot.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_r_hand.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_r_hand.png new file mode 100644 index 0000000000..c6ab5e2d5e Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/claws_r_hand.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arm-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arm-l.png new file mode 100644 index 0000000000..54f05c2a29 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arm-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arm-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arm-r.png new file mode 100644 index 0000000000..693d06f0df Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arm-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arms.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arms.png new file mode 100644 index 0000000000..ad61bb8b5b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-arms.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-foot-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-foot-l.png new file mode 100644 index 0000000000..ffda357aa6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-foot-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-foot-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-foot-r.png new file mode 100644 index 0000000000..75c6c62d0e Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-foot-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-hand-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-hand-l.png new file mode 100644 index 0000000000..7ad80d0a92 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-hand-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-hand-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-hand-r.png new file mode 100644 index 0000000000..e5059c73cd Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-hand-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-leg-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-leg-l.png new file mode 100644 index 0000000000..a4c9449bc3 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-leg-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-leg-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-leg-r.png new file mode 100644 index 0000000000..4c218c8c07 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-leg-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-legs.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-legs.png new file mode 100644 index 0000000000..2997a0f844 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crest-legs.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crests.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crests.png new file mode 100644 index 0000000000..8d2dbc9cf8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/crests.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json new file mode 100644 index 0000000000..94ea970a61 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json @@ -0,0 +1,183 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by FairlySadPanda (GitHub/Discord), based off of sprites taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "belly_crest", + "directions": 4 + }, + { + "name": "belly_fox", + "directions": 4 + }, + { + "name": "belly_full", + "directions": 4 + }, + { + "name": "claws_l_hand", + "directions": 4 + }, + { + "name": "claws_r_hand", + "directions": 4 + }, + { + "name": "claws_l_foot", + "directions": 4 + }, + { + "name": "claws_r_foot", + "directions": 4 + }, + { + "name": "crests", + "directions": 4 + }, + { + "name": "crest-legs", + "directions": 4 + }, + { + "name": "crest-leg-l", + "directions": 4 + }, + { + "name": "crest-leg-r", + "directions": 4 + }, + { + "name": "crest-foot-l", + "directions": 4 + }, + { + "name": "crest-foot-r", + "directions": 4 + }, + { + "name": "crest-arms", + "directions": 4 + }, + { + "name": "crest-arm-l", + "directions": 4 + }, + { + "name": "crest-arm-r", + "directions": 4 + }, + { + "name": "crest-hand-l", + "directions": 4 + }, + { + "name": "crest-hand-r", + "directions": 4 + }, + { + "name": "points_fade", + "directions": 4 + }, + { + "name": "points_fade-arms", + "directions": 4 + }, + { + "name": "points_fade-arm-l", + "directions": 4 + }, + { + "name": "points_fade-arm-r", + "directions": 4 + }, + { + "name": "points_fade-hand-l", + "directions": 4 + }, + { + "name": "points_fade-hand-r", + "directions": 4 + }, + { + "name": "points_fade-legs", + "directions": 4 + }, + { + "name": "points_fade-leg-l", + "directions": 4 + }, + { + "name": "points_fade-leg-r", + "directions": 4 + }, + { + "name": "points_fade-foot-l", + "directions": 4 + }, + { + "name": "points_fade-foot-r", + "directions": 4 + }, + { + "name": "points_sharp", + "directions": 4 + }, + { + "name": "points_sharp-arms", + "directions": 4 + }, + { + "name": "points_sharp-arm-l", + "directions": 4 + }, + { + "name": "points_sharp-arm-r", + "directions": 4 + }, + { + "name": "points_sharp-arms-long", + "directions": 4 + }, + { + "name": "points_sharp-arm-long-l", + "directions": 4 + }, + { + "name": "points_sharp-arm-long-r", + "directions": 4 + }, + { + "name": "points_sharp-hand-l", + "directions": 4 + }, + { + "name": "points_sharp-hand-r", + "directions": 4 + }, + { + "name": "points_sharp-legs", + "directions": 4 + }, + { + "name": "points_sharp-leg-l", + "directions": 4 + }, + { + "name": "points_sharp-leg-r", + "directions": 4 + }, + { + "name": "points_sharp-foot-l", + "directions": 4 + }, + { + "name": "points_sharp-foot-r", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arm-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arm-l.png new file mode 100644 index 0000000000..2b150f5c8c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arm-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arm-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arm-r.png new file mode 100644 index 0000000000..e19c21fa92 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arm-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arms.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arms.png new file mode 100644 index 0000000000..d2a3c45a91 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arms.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-foot-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-foot-l.png new file mode 100644 index 0000000000..8753c24db3 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-foot-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-foot-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-foot-r.png new file mode 100644 index 0000000000..a62cf642d8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-foot-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-hand-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-hand-l.png new file mode 100644 index 0000000000..b6d08a5d30 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-hand-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-hand-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-hand-r.png new file mode 100644 index 0000000000..1f636c60da Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-hand-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-leg-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-leg-l.png new file mode 100644 index 0000000000..0fbf3a76b6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-leg-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-leg-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-leg-r.png new file mode 100644 index 0000000000..0301b7870c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-leg-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-legs.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-legs.png new file mode 100644 index 0000000000..c56de65c54 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-legs.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade.png new file mode 100644 index 0000000000..827335ffdb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-l.png new file mode 100644 index 0000000000..62dfacdd8b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-long-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-long-l.png new file mode 100644 index 0000000000..dbe094916c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-long-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-long-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-long-r.png new file mode 100644 index 0000000000..45158524e4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-long-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-r.png new file mode 100644 index 0000000000..9d99f2c3a8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arm-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arms-long.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arms-long.png new file mode 100644 index 0000000000..01e389cf26 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arms-long.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arms.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arms.png new file mode 100644 index 0000000000..e0d3d4a185 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arms.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-foot-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-foot-l.png new file mode 100644 index 0000000000..35158209f6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-foot-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-foot-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-foot-r.png new file mode 100644 index 0000000000..a62cf642d8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-foot-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-hand-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-hand-l.png new file mode 100644 index 0000000000..806b8ed9a9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-hand-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-hand-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-hand-r.png new file mode 100644 index 0000000000..e058e35de3 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-hand-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-leg-l.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-leg-l.png new file mode 100644 index 0000000000..761f51a966 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-leg-l.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-leg-r.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-leg-r.png new file mode 100644 index 0000000000..cc598df4db Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-leg-r.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-legs.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-legs.png new file mode 100644 index 0000000000..aa9af05944 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-legs.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp.png b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp.png new file mode 100644 index 0000000000..cae0e16e83 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/coyote-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/coyote-inner.png new file mode 100644 index 0000000000..84f7795ffb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/coyote-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/coyote.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/coyote.png new file mode 100644 index 0000000000..0c8c557b74 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/coyote.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec-inner.png new file mode 100644 index 0000000000..8cad855b08 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec.png new file mode 100644 index 0000000000..5efd39b045 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox-inner.png new file mode 100644 index 0000000000..60f004b929 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox.png new file mode 100644 index 0000000000..6eef15c7a6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal-inner.png new file mode 100644 index 0000000000..bb98f3c41c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal.png new file mode 100644 index 0000000000..9dd74cb31f Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json new file mode 100644 index 0000000000..d736b67282 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "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)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fennec", + "directions": 4 + }, + { + "name": "fennec-inner", + "directions": 4 + }, + { + "name": "fox", + "directions": 4 + }, + { + "name": "fox-inner", + "directions": 4 + }, + { + "name": "jackal", + "directions": 4 + }, + { + "name": "jackal-inner", + "directions": 4 + }, + { + "name": "otie", + "directions": 4 + }, + { + "name": "otie-inner", + "directions": 4 + }, + { + "name": "shock", + "directions": 4 + }, + { + "name": "shock-inner", + "directions": 4 + }, + { + "name": "terrier", + "directions": 4 + }, + { + "name": "terrier-inner", + "directions": 4 + }, + { + "name": "vulp", + "directions": 4 + }, + { + "name": "vulp-inner", + "directions": 4 + }, + { + "name": "vulp-sharp", + "directions": 4 + }, + { + "name": "vulp-fade", + "directions": 4 + }, + { + "name": "coyote", + "directions": 4 + }, + { + "name": "coyote-inner", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie-inner.png new file mode 100644 index 0000000000..a48a0dd661 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie.png new file mode 100644 index 0000000000..842a4a398d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/shock-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/shock-inner.png new file mode 100644 index 0000000000..0fea035575 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/shock-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/shock.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/shock.png new file mode 100644 index 0000000000..0fbc809ba9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/shock.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier-inner.png new file mode 100644 index 0000000000..1f6e3cc3f0 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier.png new file mode 100644 index 0000000000..967e5e5f54 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-fade.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-fade.png new file mode 100644 index 0000000000..e4c45a23cf Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-fade.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-inner.png new file mode 100644 index 0000000000..8362fe7782 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-sharp.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-sharp.png new file mode 100644 index 0000000000..a79ec4e175 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-sharp.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp.png b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp.png new file mode 100644 index 0000000000..25b7680097 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder.png b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder.png new file mode 100644 index 0000000000..85240e6f65 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder_chin.png b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder_chin.png new file mode 100644 index 0000000000..cbbef4ebce Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder_chin.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/goatee.png b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/goatee.png new file mode 100644 index 0000000000..4ffcaa9467 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/goatee.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/kita.png b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/kita.png new file mode 100644 index 0000000000..3333e031c8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/kita.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/meta.json new file mode 100644 index 0000000000..df8042cb9c --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86, modified by FairlySadPanda (Github/Discord)", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "ruff", + "directions": 4 + }, + { + "name": "elder", + "directions": 4 + }, + { + "name": "elder_chin", + "directions": 4 + }, + { + "name": "kita", + "directions": 4 + }, + { + "name": "goatee", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/ruff.png b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/ruff.png new file mode 100644 index 0000000000..6f1dc3a4d9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/facial_hair.rsi/ruff.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/adhara.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/adhara.png new file mode 100644 index 0000000000..98749a8d33 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/adhara.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/anita.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/anita.png new file mode 100644 index 0000000000..fe9949a981 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/anita.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/apollo.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/apollo.png new file mode 100644 index 0000000000..3514ebee8a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/apollo.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/belle.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/belle.png new file mode 100644 index 0000000000..0b052e6a58 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/belle.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/braided.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/braided.png new file mode 100644 index 0000000000..0c3cc0990c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/braided.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/bun.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/bun.png new file mode 100644 index 0000000000..42b84b5dc7 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/bun.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/clean_cut.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/clean_cut.png new file mode 100644 index 0000000000..61adec36fb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/clean_cut.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/curl.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/curl.png new file mode 100644 index 0000000000..3f9cf9465d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/curl.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/hawk.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/hawk.png new file mode 100644 index 0000000000..c062252a96 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/hawk.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/jagged.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/jagged.png new file mode 100644 index 0000000000..a1dd3858bf Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/jagged.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/jeremy.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/jeremy.png new file mode 100644 index 0000000000..b0a09298c6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/jeremy.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/kajam.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/kajam.png new file mode 100644 index 0000000000..2201c8eafb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/kajam.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/keid.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/keid.png new file mode 100644 index 0000000000..1cee898dcd Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/keid.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/kleeia.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/kleeia.png new file mode 100644 index 0000000000..04319210c8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/kleeia.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/meta.json new file mode 100644 index 0000000000..952d14af05 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/meta.json @@ -0,0 +1,92 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86, modified by FairlySadPanda (Github/Discord)", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "adhara", + "directions": 4 + }, + { + "name": "anita", + "directions": 4 + }, + { + "name": "apollo", + "directions": 4 + }, + { + "name": "belle", + "directions": 4 + }, + { + "name": "braided", + "directions": 4 + }, + { + "name": "bun", + "directions": 4 + }, + { + "name": "clean_cut", + "directions": 4 + }, + { + "name": "curl", + "directions": 4 + }, + { + "name": "hawk", + "directions": 4 + }, + { + "name": "jagged", + "directions": 4 + }, + { + "name": "jeremy", + "directions": 4 + }, + { + "name": "kajam", + "directions": 4 + }, + { + "name": "keid", + "directions": 4 + }, + { + "name": "kleeia", + "directions": 4 + }, + { + "name": "mizar", + "directions": 4 + }, + { + "name": "punkbraided", + "directions": 4 + }, + { + "name": "raine", + "directions": 4 + }, + { + "name": "rough", + "directions": 4 + }, + { + "name": "short", + "directions": 4 + }, + { + "name": "short2", + "directions": 4 + }, + { + "name": "spike", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/mizar.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/mizar.png new file mode 100644 index 0000000000..ba2f513f38 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/mizar.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/punkbraided.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/punkbraided.png new file mode 100644 index 0000000000..1847a901da Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/punkbraided.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/raine.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/raine.png new file mode 100644 index 0000000000..b1512ae219 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/raine.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/rough.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/rough.png new file mode 100644 index 0000000000..b75c310aaf Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/rough.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/short.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/short.png new file mode 100644 index 0000000000..fefa54ad82 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/short.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/short2.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/short2.png new file mode 100644 index 0000000000..2c90ff5e8c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/short2.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/spike.png b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/spike.png new file mode 100644 index 0000000000..04c037bef5 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/hair.rsi/spike.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/blaze.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/blaze.png new file mode 100644 index 0000000000..045eabb9ae Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/blaze.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/mask.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/mask.png new file mode 100644 index 0000000000..b285a227c6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/mask.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 new file mode 100644 index 0000000000..858db18b26 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "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)", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "blaze", + "directions": 4 + }, + { + "name": "mask", + "directions": 4 + }, + { + "name": "patch", + "directions": 4 + }, + { + "name": "slash", + "directions": 4 + }, + { + "name": "stripes_1", + "directions": 4 + }, + { + "name": "stripes_2", + "directions": 4 + }, + { + "name": "vulpine", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/patch.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/patch.png new file mode 100644 index 0000000000..a0565703f6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/patch.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/slash.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/slash.png new file mode 100644 index 0000000000..bd88946490 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/slash.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/stripes_1.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/stripes_1.png new file mode 100644 index 0000000000..12a6fe3ceb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/stripes_1.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/stripes_2.png b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/stripes_2.png new file mode 100644 index 0000000000..e62ce7a7a1 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/stripes_2.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 new file mode 100644 index 0000000000..a0d480f1ba Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_full.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_full.png new file mode 100644 index 0000000000..ed04708fd8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_full.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_none.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_none.png new file mode 100644 index 0000000000..8a925761fb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_none.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_top.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_top.png new file mode 100644 index 0000000000..7f924cd879 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_top.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/full.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/full.png new file mode 100644 index 0000000000..f78008f58a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/full.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_full.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_full.png new file mode 100644 index 0000000000..f78008f58a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_full.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_none.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_none.png new file mode 100644 index 0000000000..44e0c1358d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_none.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_top.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_top.png new file mode 100644 index 0000000000..a96eb3c294 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_top.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/meta.json new file mode 100644 index 0000000000..1fced5e275 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/meta.json @@ -0,0 +1,100 @@ +{ + "copyright": "Discord PJB#3005 Altered By Floofers in: Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86", + "license": "CC-BY-SA-3.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ], + "directions": 4, + "name": "female_none" + }, + { + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ], + "directions": 4, + "name": "female_full" + }, + { + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ], + "directions": 4, + "name": "female_top" + }, + { + "name": "none" + }, + { + "name": "male_full", + "directions": 4 + }, + { + "name": "male_none", + "directions": 1 + }, + { + "name": "male_top", + "directions": 4 + }, + { + "name": "unisex_full", + "directions": 4 + }, + { + "name": "unisex_none", + "directions": 1 + }, + { + "name": "unisex_top", + "directions": 4 + }, + { + "name": "full", + "directions": 4 + }, + { + "name": "top", + "directions": 4 + } + ], + "version": 1 +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/none.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/none.png new file mode 100644 index 0000000000..6e3cb09bcf Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/none.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/top.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/top.png new file mode 100644 index 0000000000..f78008f58a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/top.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_full.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_full.png new file mode 100644 index 0000000000..1b69c04a7a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_full.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_none.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_none.png new file mode 100644 index 0000000000..44e0c1358d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_none.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_top.png b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_top.png new file mode 100644 index 0000000000..44e0c1358d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_top.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/blaze.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/blaze.png new file mode 100644 index 0000000000..a1f6f44860 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/blaze.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/mask.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/mask.png new file mode 100644 index 0000000000..6d05cf62f5 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/mask.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/meta.json new file mode 100644 index 0000000000..ed5188934f --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "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)", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "blaze", + "directions": 4 + }, + { + "name": "mask", + "directions": 4 + }, + { + "name": "snout-top", + "directions": 4 + }, + { + "name": "patch", + "directions": 4 + }, + { + "name": "snout", + "directions": 4 + }, + { + "name": "snout-nose", + "directions": 4 + }, + { + "name": "vulpine", + "directions": 4 + }, + { + "name": "vulpine-lines", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/patch.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/patch.png new file mode 100644 index 0000000000..deb5dcc615 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/patch.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout-nose.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout-nose.png new file mode 100644 index 0000000000..dedcd65878 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout-nose.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout-top.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout-top.png new file mode 100644 index 0000000000..1bbc8c62d1 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout-top.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout.png new file mode 100644 index 0000000000..ee5f51489d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/snout.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/vulpine-lines.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/vulpine-lines.png new file mode 100644 index 0000000000..ba5cac9a06 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/vulpine-lines.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/vulpine.png b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/vulpine.png new file mode 100644 index 0000000000..a69e8e6417 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/snout_markings.rsi/vulpine.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/coyote.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/coyote.png new file mode 100644 index 0000000000..63e5ddba19 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/coyote.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec-tip.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec-tip.png new file mode 100644 index 0000000000..fba6426e08 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec-tip.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec.png new file mode 100644 index 0000000000..df930645da Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy-tip.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy-tip.png new file mode 100644 index 0000000000..39784b103b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy-tip.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy.png new file mode 100644 index 0000000000..933a41d91f Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-inner.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-inner.png new file mode 100644 index 0000000000..eb1b58c7e9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-inner.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-outer.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-outer.png new file mode 100644 index 0000000000..be1edfca02 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-outer.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky.png new file mode 100644 index 0000000000..d096ef5d9b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long-tip.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long-tip.png new file mode 100644 index 0000000000..3fafab6fac Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long-tip.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long.png new file mode 100644 index 0000000000..0e6d0cf807 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long.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 new file mode 100644 index 0000000000..04503abb6c --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "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)", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "tail-wag-icon" + }, + { + "name": "fennec", + "directions": 4 + }, + { + "name": "fennec-tip", + "directions": 4 + }, + { + "name": "fluffy", + "directions": 4 + }, + { + "name": "fluffy-tip", + "directions": 4 + }, + { + "name": "husky", + "directions": 4 + }, + { + "name": "husky-inner", + "directions": 4 + }, + { + "name": "husky-outer", + "directions": 4 + }, + { + "name": "long", + "directions": 4 + }, + { + "name": "long-tip", + "directions": 4 + }, + { + "name": "vulp", + "directions": 4 + }, + { + "name": "vulp-fade", + "directions": 4 + }, + { + "name": "vulp-tip", + "directions": 4 + }, + { + "name": "coyote", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png new file mode 100644 index 0000000000..c7e544012d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-fade.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-fade.png new file mode 100644 index 0000000000..17bcc67712 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-fade.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-tip.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-tip.png new file mode 100644 index 0000000000..1203cc4bb4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-tip.png differ diff --git a/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp.png b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp.png new file mode 100644 index 0000000000..dca86f6422 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/back.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/back.png new file mode 100644 index 0000000000..973267afb7 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/back.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/belt.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/belt.png new file mode 100644 index 0000000000..4d818b67b5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/belt.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/ears.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/ears.png new file mode 100644 index 0000000000..7b09f26b62 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/ears.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/eyes.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/eyes.png new file mode 100644 index 0000000000..468fbe56c6 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/eyes.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/hair.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/hair.png new file mode 100644 index 0000000000..add37c8207 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/hair.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/hand.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/hand.png new file mode 100644 index 0000000000..8b3a1a2a07 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/hand.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/head.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/head.png new file mode 100644 index 0000000000..1af97efb34 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/head.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/jumpsuit.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/jumpsuit.png new file mode 100644 index 0000000000..13b284c971 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/jumpsuit.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/meta.json new file mode 100644 index 0000000000..dda72541d1 --- /dev/null +++ b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/meta.json @@ -0,0 +1,58 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "FairlySadPanda (Discord/Github)", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "jumpsuit", + "directions": 4 + }, + { + "name": "back", + "directions": 4 + }, + { + "name": "hand", + "directions": 4 + }, + { + "name": "head", + "directions": 4 + }, + { + "name": "neck", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "shoes", + "directions": 4 + }, + { + "name": "belt", + "directions": 4 + }, + { + "name": "outerwear", + "directions": 4 + }, + { + "name": "hair", + "directions": 4 + }, + { + "name": "ears", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/neck.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/neck.png new file mode 100644 index 0000000000..b886c01310 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/neck.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/outerwear.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/outerwear.png new file mode 100644 index 0000000000..febed60a63 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/outerwear.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/shoes.png b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/shoes.png new file mode 100644 index 0000000000..e5f899c356 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/shoes.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/eyes.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/eyes.png new file mode 100644 index 0000000000..a4f647ba15 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/eyes.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/full.png new file mode 100644 index 0000000000..54ea598a5e Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/full.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/head_f.png new file mode 100644 index 0000000000..dae646062b Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/head_m.png new file mode 100644 index 0000000000..dae646062b Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/icon.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/icon.png new file mode 100644 index 0000000000..016d8ba5a7 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_arm.png new file mode 100644 index 0000000000..f7cbaf13be Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_foot.png new file mode 100644 index 0000000000..c2fe095d56 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_hand.png new file mode 100644 index 0000000000..0caddb8b96 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_leg.png new file mode 100644 index 0000000000..4b33469ab4 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/meta.json new file mode 100644 index 0000000000..fb445e85a1 --- /dev/null +++ b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/meta.json @@ -0,0 +1,73 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by FairlySadPanda (Github/Discord); with help from ScarKy0 (Github/Discord)", + "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": "eyes", + "directions": 4 + }, + { + "name": "overlay_husk", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/overlay_husk.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/overlay_husk.png new file mode 100644 index 0000000000..9570139afc Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/overlay_husk.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_arm.png new file mode 100644 index 0000000000..a3d7fa7c5c Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_foot.png new file mode 100644 index 0000000000..69ebcf2137 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_hand.png new file mode 100644 index 0000000000..c8b521fa93 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_leg.png new file mode 100644 index 0000000000..c389957645 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png new file mode 100644 index 0000000000..8ddbb03b9d Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png new file mode 100644 index 0000000000..8866db031e Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..ceea1e2e99 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json index 21312feb7b..8d6da16f6f 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Adapted from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Adapted from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..fc81b838cb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..f4e2671805 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json index 435e9748b1..cd4355ac14 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..bd01ccf61f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..60c0c634f6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json index 00fcb768fb..0d4fd176a0 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..9e6a86b142 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..4a3544c8fa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json index 5e4d9412b0..50aa75e5f8 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8. lit-equipped-MASK-vox & unlit-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8. lit-equipped-MASK-vox & unlit-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -215,6 +215,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..b9ab1e483f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..4a3544c8fa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json index 5e4d9412b0..50aa75e5f8 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8. lit-equipped-MASK-vox & unlit-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8. lit-equipped-MASK-vox & unlit-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -215,6 +215,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..b9ab1e483f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..bc72d5c2e8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json index 00fcb768fb..0d4fd176a0 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..806e5c4160 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-vulpkanin.png differ