diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index ea09d68f02a..0fa777e13aa 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm @@ -7,7 +7,8 @@ "Akula" = 'icons/mob/species/akula/helmet_vr.dmi', "Sergal" = 'icons/mob/species/sergal/helmet_vr.dmi', "Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi', - "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi' + "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' ) @@ -21,5 +22,6 @@ "Akula" = 'icons/mob/species/akula/suit_vr.dmi', "Sergal" = 'icons/mob/species/sergal/suit_vr.dmi', "Flatland Zorren" = 'icons/mob/species/fennec/suit_vr.dmi', - "Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi' + "Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index 94808a1c58c..41fac3b0f4c 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -7,7 +7,8 @@ "Akula" = 'icons/mob/species/akula/helmet_vr.dmi', "Sergal" = 'icons/mob/species/sergal/helmet_vr.dmi', "Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi', - "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi' + "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' ) @@ -21,5 +22,6 @@ "Akula" = 'icons/mob/species/akula/suit_vr.dmi', "Sergal" = 'icons/mob/species/sergal/suit_vr.dmi', "Flatland Zorren" = 'icons/mob/species/fennec/suit_vr.dmi', - "Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi' + "Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi' ) \ No newline at end of file diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 0956290f0a6..b0ba0a50c2a 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -103,20 +103,6 @@ else return ..() -/datum/language/vulpkanin - name = "Canilunzt" - desc = "The guttural language spoken and utilized by the inhabitants of Vazzend system, composed of growls, barks, yaps, and heavy utilization of ears and tail movements.Vulpkanin speak this language with ease." - speech_verb = "rrrfts" - ask_verb = "rurs" - exclaim_verb = "barks" - colour = "vulpkanin" - key = "8" //lol, no idea - Poojawa - flags = RESTRICTED - syllables = list("rur","ya","cen","rawr","bar","kuk","tek","qat","uk","wu","vuh","tah","tch","schz","auch", \ - "ist","ein","entch","zwichs","tut","mir","wo","bis","es","vor","nic","gro","lll","enem","zandt","tzch","noch", \ - "hel","ischt","far","wa","baram","iereng","tech","lach","sam","mak","lich","gen","or","ag","eck","gec","stag","onn", \ - "bin","ket","jarl","vulf","einech","cresthz","azunein","ghzth") - /datum/language/machine name = "Encoded Audio Language" desc = "A efficient language of encoded tones developed by synthetics and cyborgs." @@ -216,4 +202,4 @@ "al", "an", "ar", "as", "at", "ea", "ed", "en", "er", "es", "ha", "he", "hi", "in", "is", "it", "le", "me", "nd", "ne", "ng", "nt", "on", "or", "ou", "re", "se", "st", "te", "th", "ti", "to", "ve", "wa", "all", "and", "are", "but", "ent", "era", "ere", "eve", "for", "had", "hat", "hen", "her", "hin", -"his", "ing", "ion", "ith", "not", "ome", "oul", "our", "sho", "ted", "ter", "tha", "the", "thi") +"his", "ing", "ion", "ith", "not", "ome", "oul", "our", "sho", "ted", "ter", "tha", "the", "thi") \ No newline at end of file diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 8abb49d1c7a..d349a2cc51b 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -23,4 +23,18 @@ speech_verb = "snarls" colour = "sergal" key = "z" - syllables = list ("grr", "gah", "woof", "arf", "arra", "rah", "wor", "sarg") \ No newline at end of file + syllables = list ("grr", "gah", "woof", "arf", "arra", "rah", "wor", "sarg") + +/datum/language/vulpkanin + name = "Canilunzt" + desc = "The guttural language spoken and utilized by the inhabitants of Vazzend system, composed of growls, barks, yaps, and heavy utilization of ears and tail movements.Vulpkanin speak this language with ease." + speech_verb = "rrrfts" + ask_verb = "rurs" + exclaim_verb = "barks" + colour = "vulpkanin" + key = "8" //lol, no idea - Poojawa + flags = RESTRICTED + syllables = list("rur","ya","cen","rawr","bar","kuk","tek","qat","uk","wu","vuh","tah","tch","schz","auch", \ + "ist","ein","entch","zwichs","tut","mir","wo","bis","es","vor","nic","gro","lll","enem","zandt","tzch","noch", \ + "hel","ischt","far","wa","baram","iereng","tech","lach","sam","mak","lich","gen","or","ag","eck","gec","stag","onn", \ + "bin","ket","jarl","vulf","einech","cresthz","azunein","ghzth") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index 53b039a9be4..436ff01784d 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -102,17 +102,4 @@ default_language = "Stok" flesh_color = "#34AF10" base_color = "#066000" - reagent_tag = IS_UNATHI - -/datum/species/monkey/vulpkanin - name = "Wolpin" - name_plural = "Wolpin" - - icobase = 'icons/mob/human_races/monkeys/r_wolpin.dmi' - deform = 'icons/mob/human_races/monkeys/r_wolpin.dmi' - - greater_form = "Vulpkanin" - default_language = "Wolpin" - flesh_color = "#966464" - base_color = "#000000" - tail = "wolpintail" \ No newline at end of file + reagent_tag = IS_UNATHI \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm b/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm index dd9164e4937..39c283071ba 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm @@ -33,3 +33,16 @@ base_color = "#333333" tail = "farwatail" */ + +/datum/species/monkey/vulpkanin + name = "Wolpin" + name_plural = "Wolpin" + speak_emote = list("rrfts") + + icobase = 'icons/mob/human_races/monkeys/r_wolpin.dmi' + deform = 'icons/mob/human_races/monkeys/r_wolpin.dmi' + + greater_form = "Vulpkanin" + default_language = "Canilunzt" + flesh_color = "#966464" + base_color = "#000000" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 266111f969e..8a2480556f0 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -246,11 +246,10 @@ // clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR -// bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR // Paradise stuff -// dietflags = DIET_OMNI +/* bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR // Paradise stuff dietflags = DIET_OMNI flesh_color = "#966464" base_color = "#B43214" -// butt_sprite = "vulp" + butt_sprite = "vulp" */ min_age = 17 max_age = 80 diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 3f33eb16ae4..cbc2d3b6754 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -48,84 +48,98 @@ vulp_hair_kajam name = "Kajam" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "kajam" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_keid name = "Keid" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "keid" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_adhara name = "Adhara" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "adhara" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_kleeia name = "Kleeia" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "kleeia" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_mizar name = "Mizar" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "mizar" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_apollo name = "Apollo" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "apollo" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_belle name = "Belle" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "belle" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_bun name = "Bun" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "bun" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_jagged name = "Jagged" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "jagged" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_curl name = "Curl" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "curl" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_hawk name = "Hawk" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "hawk" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_anita name = "Anita" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "anita" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_short name = "Short" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "short" species_allowed = list("Vulpkanin") gender = NEUTER vulp_hair_spike name = "Spike" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "spike" species_allowed = list("Vulpkanin") gender = NEUTER @@ -134,48 +148,56 @@ vulp_blaze name = "Blaze" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_blaze" species_allowed = list("Vulpkanin") gender = NEUTER vulp_vulpine name = "Vulpine" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_vulpine" species_allowed = list("Vulpkanin") gender = NEUTER vulp_earfluff name = "Earfluff" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_earfluff" species_allowed = list("Vulpkanin") gender = NEUTER vulp_mask name = "Mask" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_mask" species_allowed = list("Vulpkanin") gender = NEUTER vulp_patch name = "Patch" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_patch" species_allowed = list("Vulpkanin") gender = NEUTER vulp_ruff name = "Ruff" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_ruff" species_allowed = list("Vulpkanin") gender = NEUTER vulp_kita name = "Kita" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_kita" species_allowed = list("Vulpkanin") gender = NEUTER vulp_swift name = "Swift" + icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_swift" species_allowed = list("Vulpkanin") gender = NEUTER diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 207601ebe6a..ec10e508c73 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_face_vr.dmi b/icons/mob/human_face_vr.dmi index 6afc04bfb56..b145c015c4a 100644 Binary files a/icons/mob/human_face_vr.dmi and b/icons/mob/human_face_vr.dmi differ diff --git a/icons/mob/human_races/monkeys/r_wolpin.dmi b/icons/mob/human_races/monkeys/r_wolpin.dmi index 9214eb3a983..97fb66896d7 100644 Binary files a/icons/mob/human_races/monkeys/r_wolpin.dmi and b/icons/mob/human_races/monkeys/r_wolpin.dmi differ diff --git a/icons/mob/human_races/monkeys/tail.dmi b/icons/mob/human_races/monkeys/tail.dmi deleted file mode 100644 index 7a3e0bd9c44..00000000000 Binary files a/icons/mob/human_races/monkeys/tail.dmi and /dev/null differ