diff --git a/code/__HELPERS/mob_helpers.dm b/code/__HELPERS/mob_helpers.dm index 29785cbaa3e..81d2bd0efbe 100644 --- a/code/__HELPERS/mob_helpers.dm +++ b/code/__HELPERS/mob_helpers.dm @@ -218,12 +218,14 @@ else return "unknown" else if(species == "Vox") switch(tone) - if(2) return "dark green" + if(2) return "plum" if(3) return "brown" if(4) return "gray" if(5) return "emerald" if(6) return "azure" - else return "green" + if(7) return "crimson" + if(8) return "nebula" + else return "lime" else return "unknown" diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index 044ea32cb62..853819c6bcd 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -2,10 +2,10 @@ name = "Vox" name_plural = "Vox" max_age = 90 // vox stacks can be older than this, but let's assume their body fails beyond repair after such ages. - icobase = 'icons/mob/human_races/vox/r_vox.dmi' + icobase = 'icons/mob/human_races/vox/r_voxlime.dmi' dangerous_existence = TRUE language = "Vox-pidgin" - tail = "voxtail" + tail = "voxtail_lime" speech_sounds = list('sound/voice/shriek1.ogg') speech_chance = 20 unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too. @@ -44,8 +44,8 @@ female_sneeze_sound = 'sound/voice/shrieksneeze.ogg' icon_skin_tones = list( - 1 = "Default Green", - 2 = "Dark Green", + 1 = "Default Lime", + 2 = "Plum", 3 = "Brown", 4 = "Grey", 5 = "Emerald", @@ -103,7 +103,7 @@ /datum/species/vox/updatespeciescolor(mob/living/carbon/human/H, owner_sensitive = 1) //Handling species-specific skin-tones for the Vox race. if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE) - var/new_icobase = 'icons/mob/human_races/vox/r_vox.dmi' //Default Green Vox. + var/new_icobase = 'icons/mob/human_races/vox/r_voxlime.dmi' //Default Lime Vox. switch(H.s_tone) if(8) //Nebula Vox. new_icobase = 'icons/mob/human_races/vox/r_voxpurp.dmi' @@ -123,11 +123,11 @@ if(3) //Brown Vox. new_icobase = 'icons/mob/human_races/vox/r_voxbrn.dmi' H.tail = "voxtail_brn" - if(2) //Dark Green Vox. - new_icobase = 'icons/mob/human_races/vox/r_voxdgrn.dmi' - H.tail = "voxtail_dgrn" - else //Default Green Vox. - H.tail = "voxtail" //Ensures they get an appropriately coloured tail depending on the skin-tone. + if(2) //Plum Vox. + new_icobase = 'icons/mob/human_races/vox/r_voxplum.dmi' + H.tail = "voxtail_plum" + else //Default Lime Vox. + H.tail = "voxtail_lime" //Ensures they get an appropriately coloured tail depending on the skin-tone. H.change_icobase(new_icobase, owner_sensitive) //Update the icobase of all our organs, but make sure we don't mess with frankenstein limbs in doing so. diff --git a/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm index 6a3d50317ac..890617eb639 100644 --- a/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm @@ -2,9 +2,9 @@ icon = 'icons/mob/sprite_accessories/vox/vox_tail_markings.dmi' species_allowed = list("Vox") -/datum/sprite_accessory/body_markings/tail/vox/vox_band - name = "Vox Tail Band" - icon_state = "band" +/datum/sprite_accessory/body_markings/tail/vox/vox_bands + name = "Vox Tail Bands" + icon_state = "bands" /datum/sprite_accessory/body_markings/tail/vox/vox_tip name = "Vox Tail Tip" diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi index 4a81c08c601..94287eab8dc 100644 Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ diff --git a/icons/mob/human_races/vox/r_vox.dmi b/icons/mob/human_races/vox/r_vox.dmi deleted file mode 100644 index 2286e060a9a..00000000000 Binary files a/icons/mob/human_races/vox/r_vox.dmi and /dev/null differ diff --git a/icons/mob/human_races/vox/r_voxazu.dmi b/icons/mob/human_races/vox/r_voxazu.dmi index 593b6b9b6d2..dbaa8742e32 100644 Binary files a/icons/mob/human_races/vox/r_voxazu.dmi and b/icons/mob/human_races/vox/r_voxazu.dmi differ diff --git a/icons/mob/human_races/vox/r_voxbrn.dmi b/icons/mob/human_races/vox/r_voxbrn.dmi index 8a0e391a749..6aab80130a2 100644 Binary files a/icons/mob/human_races/vox/r_voxbrn.dmi and b/icons/mob/human_races/vox/r_voxbrn.dmi differ diff --git a/icons/mob/human_races/vox/r_voxcrim.dmi b/icons/mob/human_races/vox/r_voxcrim.dmi index e74579cef06..fb9eda98063 100644 Binary files a/icons/mob/human_races/vox/r_voxcrim.dmi and b/icons/mob/human_races/vox/r_voxcrim.dmi differ diff --git a/icons/mob/human_races/vox/r_voxdgrn.dmi b/icons/mob/human_races/vox/r_voxdgrn.dmi deleted file mode 100644 index 6c3239a100d..00000000000 Binary files a/icons/mob/human_races/vox/r_voxdgrn.dmi and /dev/null differ diff --git a/icons/mob/human_races/vox/r_voxemrl.dmi b/icons/mob/human_races/vox/r_voxemrl.dmi index 0a551519293..dd3b8b69bbe 100644 Binary files a/icons/mob/human_races/vox/r_voxemrl.dmi and b/icons/mob/human_races/vox/r_voxemrl.dmi differ diff --git a/icons/mob/human_races/vox/r_voxgry.dmi b/icons/mob/human_races/vox/r_voxgry.dmi index df825cc399d..d5ebde68237 100644 Binary files a/icons/mob/human_races/vox/r_voxgry.dmi and b/icons/mob/human_races/vox/r_voxgry.dmi differ diff --git a/icons/mob/human_races/vox/r_voxlime.dmi b/icons/mob/human_races/vox/r_voxlime.dmi new file mode 100644 index 00000000000..2811fc27c6f Binary files /dev/null and b/icons/mob/human_races/vox/r_voxlime.dmi differ diff --git a/icons/mob/human_races/vox/r_voxplum.dmi b/icons/mob/human_races/vox/r_voxplum.dmi new file mode 100644 index 00000000000..a6d5ed943ec Binary files /dev/null and b/icons/mob/human_races/vox/r_voxplum.dmi differ diff --git a/icons/mob/human_races/vox/r_voxpurp.dmi b/icons/mob/human_races/vox/r_voxpurp.dmi index d6c18c75517..9ace8f9d48b 100644 Binary files a/icons/mob/human_races/vox/r_voxpurp.dmi and b/icons/mob/human_races/vox/r_voxpurp.dmi differ diff --git a/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi b/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi index a2d9376fd6a..ef38c22fd34 100644 Binary files a/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi and b/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi differ diff --git a/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi b/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi deleted file mode 100644 index 70ef0d08f7e..00000000000 Binary files a/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi and /dev/null differ