diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 1a8cffd993e..2c4350fe24e 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,2 +1,2 @@ /obj/machinery/suit_cycler - species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") \ No newline at end of file + species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin") \ No newline at end of file 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 a83484fb3b9..0e4df3dc05f 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -15,8 +15,10 @@ "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' ) + sprite_sheets_obj = list( "Tajara" = 'icons/obj/clothing/species/tajaran/hats.dmi', // Copied from void.dm "Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi', // Copied from void.dm @@ -26,7 +28,8 @@ "Akula" = 'icons/obj/clothing/species/akula/hats.dmi', "Sergal" = 'icons/obj/clothing/species/sergal/hats.dmi', "Flatland Zorren" = 'icons/obj/clothing/species/fennec/hats.dmi', - "Highlander Zorren" = 'icons/obj/clothing/species/fox/hats.dmi' + "Highlander Zorren" = 'icons/obj/clothing/species/fox/hats.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' ) /obj/item/clothing/suit/space/void @@ -39,8 +42,12 @@ "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' ) + + + sprite_sheets_obj = list( "Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi', // Copied from void.dm "Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi', // Copied from void.dm @@ -50,7 +57,8 @@ "Akula" = 'icons/obj/clothing/species/akula/suits.dmi', "Sergal" = 'icons/obj/clothing/species/sergal/suits.dmi', "Flatland Zorren" = 'icons/obj/clothing/species/fennec/suits.dmi', - "Highlander Zorren" = 'icons/obj/clothing/species/fox/suits.dmi' + "Highlander Zorren" = 'icons/obj/clothing/species/fox/suits.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' ) // This is a hack to prevent the item_state variable on the suits from taking effect diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 8abb49d1c7a..fceb30b8220 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_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 2ac1c0a634d..64c42bb5c0d 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 @@ -217,6 +217,56 @@ ) +/datum/species/vulpkanin + name = "Vulpkanin" + name_plural = "Vulpkanin" + icobase = 'icons/mob/human_races/r_vulpkanin.dmi' + deform = 'icons/mob/human_races/r_vulpkanin.dmi' +// path = /mob/living/carbon/human/vulpkanin +// default_language = "Sol Common" + secondary_langs = list("Canilunzt") + name_language = "Canilunzt" + primitive_form = "Wolpin" + tail = "vulptail" + tail_animation = 'icons/mob/species/vulpkanin/tail.dmi' // probably need more than just one of each, but w/e + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) + darksight = 5 //worse than cats, but better than lizards. -- Poojawa + gluttonous = 1 + num_alternate_languages = 2 + color_mult = 1 + egg_type = "Tajaran" //also placeholder. because I see other things using it + + blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ + dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ + culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \ + to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \ + which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." + +// flags = HAS_LIPS +// 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 + flesh_color = "#966464" + base_color = "#B43214" + butt_sprite = "vulp" */ + + min_age = 17 + max_age = 80 + +/* // I figured both of these things aren't exactly needed - Poojawa + + allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, + /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble) + + suicide_messages = list( + "is attempting to bite their tongue off!", + "is jamming their claws into their eye sockets!", + "is twisting their own neck!", + "is holding their breath!") */ + +//datum/species/vulpkanin //just to write it out, no idea where any of it goes -- Pooj +// egg_type = "Vulpkanin" /datum/species/unathi egg_type = "Unathi" diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 8ea9c6e090d..cbc2d3b6754 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -6,7 +6,7 @@ /datum/sprite_accessory/hair - species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //This lets all races use the default hairstyles. + species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin") //This lets all races use the default hairstyles. sergal_plain name = "Sergal Plain" @@ -36,4 +36,174 @@ name = "Bald" icon_state = "bald" gender = MALE - species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //Lets all the races be bald if they want. \ No newline at end of file + species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin") //Lets all the races be bald if they want. + +// Vulpa stuffs + + vulp_hair_none + name = "None" + icon_state = "bald" + species_allowed = list("Vulpkanin") + gender = NEUTER + + 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 + +/datum/sprite_accessory/facial_hair + + 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 + + vulpkanin + name = "Default Vulpkanin skin" + icon_state = "default" + icon = 'icons/mob/human_races/r_vulpkanin.dmi' + species_allowed = list("Vulpkanin") \ No newline at end of file diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 5a664002413..cda8d0a3321 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -91,6 +91,7 @@ h1.alert, h2.alert {color: #000000;} .changeling {color: #800080;} .sergal {color: #0077FF;} .birdsongc {color: #CC9900;} +.vulpkanin {color: #B97A57;} .rough {font-family: "Trebuchet MS", cursive, sans-serif;} .say_quote {font-family: Georgia, Verdana, sans-serif;} 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 new file mode 100644 index 00000000000..97fb66896d7 Binary files /dev/null and b/icons/mob/human_races/monkeys/r_wolpin.dmi differ diff --git a/icons/mob/human_races/r_vulpkanin.dmi b/icons/mob/human_races/r_vulpkanin.dmi new file mode 100644 index 00000000000..d2043705724 Binary files /dev/null and b/icons/mob/human_races/r_vulpkanin.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi new file mode 100644 index 00000000000..8ce5f3cc20e Binary files /dev/null and b/icons/mob/species/vulpkanin/helmet.dmi differ diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/species/vulpkanin/mask.dmi new file mode 100644 index 00000000000..ab7c0866bd2 Binary files /dev/null and b/icons/mob/species/vulpkanin/mask.dmi differ diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/species/vulpkanin/suit.dmi new file mode 100644 index 00000000000..c5fcba20770 Binary files /dev/null and b/icons/mob/species/vulpkanin/suit.dmi differ diff --git a/icons/mob/species/vulpkanin/tail.dmi b/icons/mob/species/vulpkanin/tail.dmi new file mode 100644 index 00000000000..56a7dd982a5 Binary files /dev/null and b/icons/mob/species/vulpkanin/tail.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/hats.dmi b/icons/obj/clothing/species/vulpkanin/hats.dmi new file mode 100644 index 00000000000..15f8ef09207 Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/hats.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/suits.dmi b/icons/obj/clothing/species/vulpkanin/suits.dmi new file mode 100644 index 00000000000..164a8247e5a Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/suits.dmi differ