diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index edd6cc8b818..147aa5da6d9 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -289,7 +289,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
dat += "[ha_style] "
dat += "Color [color_square(r_headacc, g_headacc, b_headacc)]
"
- if(species in list("Machine", "Tajaran", "Unathi")) //Species with head markings.
+ if(species in list("Machine", "Tajaran", "Unathi", "Vulpkanin")) //Species with head markings.
var/list/marking_styles = params2list(m_styles)
var/list/marking_colours = params2list(m_colours)
marking_colours["head"] = sanitize_hexcolor(marking_colours["head"])
@@ -1401,7 +1401,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
m_styles = list2params(marking_styles)
if("m_style_head")
- if(species in list("Machine", "Tajaran", "Unathi")) //Species with head markings.
+ if(species in list("Machine", "Tajaran", "Unathi", "Vulpkanin")) //Species with head markings.
var/list/valid_markings = list()
valid_markings["None"] = marking_styles_list["None"]
for(var/markingstyle in marking_styles_list)
@@ -1439,7 +1439,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
m_styles = list2params(marking_styles)
if("m_head_colour")
- if(species in list("Machine", "Tajaran", "Unathi")) //Species with head markings.
+ if(species in list("Machine", "Tajaran", "Unathi", "Vulpkanin")) //Species with head markings.
var/input = "Choose the colour of your your character's head markings:"
var/list/marking_colours = params2list(m_colours)
marking_colours["head"] = sanitize_hexcolor(marking_colours["head"])
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index d3698e85b36..d54a892e8e2 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -172,11 +172,11 @@
flags = HAS_LIPS
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
- bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_BODY_MARKINGS | HAS_TAIL_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR
+ bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS | HAS_TAIL_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR
dietflags = DIET_OMNI
reagent_tag = PROCESS_ORG
flesh_color = "#966464"
- base_color = "#E63F1C"
+ base_color = "#CF4D2F"
butt_sprite = "vulp"
has_organ = list(
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 20d3dc9b573..f2f31463e5d 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -202,6 +202,11 @@
icon_state = "hair_hbraid"
gender = FEMALE
+ braid3
+ name = "Hippie Braid"
+ icon_state = "hair_ubraid"
+ species_allowed = list("Human", "Unathi")
+
buzz
name = "Buzzcut"
icon_state = "hair_buzzcut"
@@ -243,9 +248,9 @@
icon_state = "hair_bigafro"
gender = MALE
- sargeant
+ sergeant
name = "Flat Top"
- icon_state = "hair_sargeant"
+ icon_state = "hair_sergeant"
gender = MALE
emo
@@ -300,7 +305,7 @@
icon_state = "hair_spikey"
species_allowed = list("Human", "Unathi")
- kusangi
+ kusanagi
name = "Kusanagi Hair"
icon_state = "hair_kusanagi"
@@ -759,8 +764,8 @@
species_allowed = list("Tajaran")
taj_hair_spiky
- name = "Tajara Spiky"
- icon_state = "hair_tajspiky"
+ name = "Tajara Spikey"
+ icon_state = "hair_tajspikey"
species_allowed = list("Tajaran")
taj_hair_messy
@@ -845,6 +850,11 @@
icon_state = "spike"
species_allowed = list("Vulpkanin")
+ vulp_hair_braided
+ name = "Braided"
+ icon_state = "braided"
+ species_allowed = list("Vulpkanin")
+
//Vox
vox_quills_short
@@ -1909,6 +1919,11 @@
species_allowed = list("Vulpkanin")
icon_state = "markings_belly_fox_vulp"
+/datum/sprite_accessory/body_markings/belly_crest_vulp
+ name = "Vulpkanin Belly Crest"
+ species_allowed = list("Vulpkanin")
+ icon_state = "markings_belly_crest_vulp"
+
/datum/sprite_accessory/body_markings/tiger
name = "Tiger Body"
species_allowed = list("Unathi", "Tajaran", "Vulpkanin")
@@ -1980,6 +1995,11 @@
icon_state = "markings_face_snout_lower_una"
heads_allowed = list("Unathi Sharp Snout")
+/datum/sprite_accessory/body_markings/head/nose_default_vulp
+ name = "Vulpkanin Nose"
+ species_allowed = list("Vulpkanin")
+ icon_state = "markings_face_nose_vulp"
+
/datum/sprite_accessory/body_markings/head/optics
name = "Humanoid Optics"
species_allowed = list("Machine")
diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi
index 800cb025aed..94236ed04bf 100644
Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 49f5955fc00..c3c1746c1a1 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/human_races/r_vulpkanin.dmi b/icons/mob/human_races/r_vulpkanin.dmi
index db8b583b082..3bcdb3539b7 100644
Binary files a/icons/mob/human_races/r_vulpkanin.dmi and b/icons/mob/human_races/r_vulpkanin.dmi differ