mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-28 11:11:52 +00:00
Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)
* Ports #9294 and #9322 from VG: 'Yi' to Vox-pidgin and Framework for Icon-based Skin Tone (Feat. Vox) and Glasses/Goggles for Vox. Both ported PRs by Intigracy. Also adds all remaining in-use glasses/goggle sprites for Vox. I cleaned up the code a bit while I was in there. Otherwise, that's it. Furthermore, randomizing skin tone doesn't seem to work for Vox despite their being specified in the conditional lists and s_tone being not null. * Morph Support * CMA Support * Ports Intigracy's vgstation13/pull/9460, Noir Vision No Longer Greys Out HUD. * Fixes Positioning of Vox Jensen Shades East+West facing Sprites. Fixes Heist Goofery Game-mode (not one-click antag) Heist tweaked and returned to working order now that I've found out how to test the actual game-mode (after temporarily adjusting the population requirement). Vox Raiders won't spawn in with whatever socks were in their selected spawn-character's preferences anymore. Additionally, the set_species proc now zeroes out skin tone if the species doesn't have skin tone to avoid goofing up the icons on initial generation. Also condenses the code in preferences_setup character creation icon generation. Made it use the individual species' skin-tone handling procs instead of code snowflaked into preferences_setup.dm. * No More Vox Tail Colours, but they can Colour Their Hair. * Removes unneeded 'src's and retroactively prohibits colouring tails on species without HAS_SKIN_COLOR. Colouration won't be applied to src's tail unless HAS_SKIN_COLOR is in src's species bodyflags. * Tidies up some Lists in CharPrefs and Retroactively Prohibits Vox Hair Colouration * Reverts unnecessary commenting out of vox armalis post-spawn handling parent call. * Adds Emerald and Azure Vox Skin Tones. * Stealthy Wryn Typo Fixed. * Greyscales Vox Head+Facial Hair and Adds More Default Colours in Species Definitions * Gives Vox Raiders Default Hair Colour and Fixes Bug where Roundstart Raiders don't get Random Skin
This commit is contained in:
@@ -485,6 +485,8 @@ client/proc/one_click_antag()
|
||||
break
|
||||
|
||||
new_vox.key = theghost.key
|
||||
ticker.mode.traitors += new_vox.mind
|
||||
|
||||
to_chat(new_vox, "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red<B> [input]</B>")
|
||||
to_chat(new_vox, "\red Don't forget to turn on your nitrogen internals!")
|
||||
|
||||
@@ -497,9 +499,6 @@ client/proc/one_click_antag()
|
||||
|
||||
/datum/admins/proc/create_vox_raider(obj/spawn_location, leader_chosen = 0)
|
||||
|
||||
var/mob/living/carbon/human/new_vox = new(spawn_location.loc, "Vox")
|
||||
var/obj/item/organ/external/head/head_organ = new_vox.get_organ("head")
|
||||
|
||||
var/sounds = rand(2,8)
|
||||
var/i = 0
|
||||
var/newname = ""
|
||||
@@ -508,17 +507,21 @@ client/proc/one_click_antag()
|
||||
i++
|
||||
newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))
|
||||
|
||||
var/mob/living/carbon/human/new_vox = new /mob/living/carbon/human/vox(spawn_location.loc)
|
||||
|
||||
new_vox.add_language("Tradeband")
|
||||
new_vox.real_name = capitalize(newname)
|
||||
new_vox.dna.real_name = new_vox.real_name
|
||||
new_vox.name = new_vox.real_name
|
||||
new_vox.age = rand(12,20)
|
||||
new_vox.set_species("Vox")
|
||||
new_vox.languages = list() // Removing language from chargen.
|
||||
new_vox.flavor_text = ""
|
||||
new_vox.add_language("Vox-pidgin")
|
||||
new_vox.add_language("Galactic Common")
|
||||
new_vox.add_language("Tradeband")
|
||||
head_organ.h_style = "Short Vox Quills"
|
||||
head_organ.f_style = "Shaved"
|
||||
new_vox.change_eye_color(rand(1, 255), rand(1, 255), rand(1, 255))
|
||||
new_vox.s_tone = rand(1, 6)
|
||||
|
||||
// Do the initial caching of the player's body icons.
|
||||
new_vox.force_update_limbs()
|
||||
new_vox.update_dna()
|
||||
new_vox.update_eyes()
|
||||
|
||||
for(var/obj/item/organ/external/limb in new_vox.organs)
|
||||
limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
|
||||
@@ -529,8 +532,8 @@ client/proc/one_click_antag()
|
||||
I.implanted = 1
|
||||
cortical_stacks += I
|
||||
|
||||
ticker.mode.traitors += new_vox.mind
|
||||
new_vox.equip_vox_raider()
|
||||
new_vox.regenerate_icons()
|
||||
|
||||
return new_vox
|
||||
|
||||
|
||||
Reference in New Issue
Block a user