cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds skin presets for Vaurcae, based on brood colors from the wiki (#19585)

Browse Source 
title
This commit is contained in:
feartheblackout
2024-07-26 12:31:42 +00:00
committed by GitHub
parent e1ac63fb1b
commit bbd2e74613
4 changed files with 141 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/03_body.dm
+9 -12
View File
@@ -333,15 +333,13 @@ var/global/list/valid_bloodtypes = list(
out += "<br><b>Eyes</b><br>"
out += "<a href='?src=\ref[src];eye_color=1'>Change Color</a> [HTML_RECT(rgb(pref.r_eyes, pref.g_eyes, pref.b_eyes))] <br>"
if(has_flag(mob_species, HAS_SKIN_COLOR) || has_flag(mob_species, HAS_SKIN_PRESET))
if(has_flag(mob_species, HAS_SKIN_PRESET))
out += "<br><b>Body Color Presets</b><br>"
out += "<a href='?src=\ref[src];skin_color=1'>Choose Preset</a><br>"
else
out += "<br><b>Body Color</b><br>"
out += "<a href='?src=\ref[src];skin_color=1'>Change Color</a> [HTML_RECT(rgb(pref.r_skin, pref.g_skin, pref.b_skin))] <br>"
if(has_flag(mob_species, HAS_SKIN_COLOR))
out += "<br><b>Body Color</b><br>"
out += "<a href='?src=\ref[src];skin_color=1'>Change Color</a> [HTML_RECT(rgb(pref.r_skin, pref.g_skin, pref.b_skin))] <br>"
if(has_flag(mob_species, HAS_SKIN_PRESET))
out += "<br><b>Body Color Presets</b><br>"
out += "<a href='?src=\ref[src];skin_preset=1'>Choose Preset</a><br>"
out += "<br><a href='?src=\ref[src];marking_style=1'>Body Markings +</a><br>"
for(var/M in pref.body_markings)
@@ -618,9 +616,7 @@ var/global/list/valid_bloodtypes = list(
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["skin_color"])
if(!has_flag(mob_species, HAS_SKIN_COLOR) && !has_flag(mob_species, HAS_SKIN_PRESET))
return TOPIC_NOACTION
if(has_flag(mob_species, HAS_SKIN_COLOR) && !has_flag(mob_species, HAS_SKIN_PRESET))
if(has_flag(mob_species, HAS_SKIN_COLOR))
var/new_skin = input(user, "Choose your character's skin colour.", "Character Preference", rgb(pref.r_skin, pref.g_skin, pref.b_skin)) as color|null
if(new_skin && has_flag(mob_species, HAS_SKIN_COLOR) && CanUseTopic(user))
pref.r_skin = GetRedPart(new_skin)
@@ -628,7 +624,8 @@ var/global/list/valid_bloodtypes = list(
pref.b_skin = GetBluePart(new_skin)
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(has_flag(mob_species, HAS_SKIN_PRESET))
else if(href_list["skin_preset"])
if(has_flag(mob_species, HAS_SKIN_PRESET))
var/new_preset = tgui_input_list(user, "Choose your character's body color preset.", "Character Preference", mob_species.character_color_presets, rgb(pref.r_skin, pref.g_skin, pref.b_skin))
new_preset = mob_species.character_color_presets[new_preset]
pref.r_skin = GetRedPart(new_preset)
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm
+20 -1
View File
@@ -76,7 +76,7 @@
heat_level_3 = 600 //Default 1000
flags = NO_SLIP | NO_CHUBBY | NO_ARTERIES | PHORON_IMMUNE | NO_COLD_SLOWDOWN
spawn_flags = CAN_JOIN | IS_WHITELISTED | NO_AGE_MINIMUM
appearance_flags = HAS_SKIN_COLOR | HAS_HAIR_COLOR
appearance_flags = HAS_SKIN_COLOR | HAS_HAIR_COLOR | HAS_SKIN_PRESET
blood_color = COLOR_VAURCA_BLOOD // dark yellow
flesh_color = "#E6E600"
base_color = "#575757"
@@ -154,6 +154,25 @@
snore_key = "chitter"
indefinite_sleep = TRUE
character_color_presets = list(
"Zo'ra: Unbound Vaur" = "#3D0000", "Zo'ra: Bound Vaur" = "#290000",
"Zo'ra: Unbound Zoleth" = "#650015", "Zo'ra: Bound Zoleth" = "#6F1515",
"Zo'ra: Unbound Athvur" = "#83290B", "Zo'ra: Bound Athvur" = "#6F1500",
"Zo'ra: Unbound Scay" = "#47001F", "Zo'ra: Bound Scay" = "#470B33",
"Zo'ra: Unbound Xakt" = "#5B1F00", "Zo'ra: Bound Xakt" = "#511500",
"K'lax: Unbound Zkaii" = "#0B2B1B", "K'lax: Bound Zkaii" = "#335115",
"K'lax: Unbound Tupii" = "#299617", "K'lax: Bound Tupii" = "#74B72E",
"K'lax: Unbound Vedhra" = "#829614", "K'lax: Bound Vedhra" = "#14AA14",
"K'lax: Unbound Leto" = "#00503C", "K'lax: Bound Leto" = "#293B1A",
"K'lax: Unbound Vetju" = "#0B541F", "K'lax: Bound Vetju" = "#213F21",
"C'thur: Unbound C'thur" = "#002373", "C'thur: Bound C'thur" = "#00285A",
"C'thur: Unbound Vytel" = "#141437", "C'thur: Bound Vytel" = "#0A2337",
"C'thur: Unbound Mouv" = "#96B4FF", "C'thur: Bound Mouv" = "#5A96FF",
"C'thur: Unbound Xetl" = "#370078", "C'thur: Bound Xetl" = "#3C0F5F"
)
/datum/species/bug/before_equip(var/mob/living/carbon/human/H)
. = ..()
H.gender = NEUTER
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
+53
View File
@@ -47,7 +47,24 @@
valid_prosthetics = list(PROSTHETIC_VAURCA, PROSTHETIC_VAURCA_WARRIOR)
character_color_presets = list(
"Zo'ra: Unbound Vaur" = "#3D0000",
"Zo'ra: Unbound Zoleth" = "#650015",
"Zo'ra: Unbound Athvur" = "#83290B",
"Zo'ra: Unbound Scay" = "#47001F",
"Zo'ra: Unbound Xakt" = "#5B1F00",
"K'lax: Unbound Zkaii" = "#0B2B1B",
"K'lax: Unbound Tupii" = "#299617",
"K'lax: Unbound Vedhra" = "#829614",
"K'lax: Unbound Leto" = "#00503C",
"K'lax: Unbound Vetju" = "#0B541F",
"C'thur: Unbound C'thur" = "#002373",
"C'thur: Unbound Vytel" = "#141437",
"C'thur: Unbound Mouv" = "#96B4FF",
"C'thur: Unbound Xetl" = "#370078"
)
/datum/species/bug/type_c
name = SPECIES_VAURCA_BREEDER
@@ -144,6 +161,23 @@
possible_external_organs_modifications = list("Normal", "Amputated") //We don't have any limb modfications for this species
valid_prosthetics = null
character_color_presets = list(
"Zo'ra: Vaur" = "#3D000F",
"Zo'ra: Zoleth" = "#730015",
"Zo'ra: Athvur" = "#7A1F00",
"Zo'ra: Scay" = "#470029",
"Zo'ra: Xakt" = "#51230A",
"K'lax: Zkaii" = "#2B483A",
"K'lax: Tupii" = "#067C12",
"K'lax: Vedhra" = "#627308",
"K'lax: Leto" = "#1C6654",
"C'thur" = "#0F2962",
"C'thur: Vytel" = "#191937",
"C'thur: Mouv" = "#7D75FF"
)
/datum/species/bug/type_c/New()
..()
equip_adjust = list(
@@ -305,6 +339,25 @@ Bulwarks are much larger and have significantly thicker carapaces than most Vaur
possible_external_organs_modifications = list("Normal", "Amputated") //We don't have any limb modfications for this species, yet
valid_prosthetics = null
character_color_presets = list(
"Zo'ra: Unbound Vaur" = "#3D000F", "Zo'ra: Bound Vaur" = "#37000F",
"Zo'ra: Unbound Zoleth" = "#730015", "Zo'ra: Bound Zoleth" = "#610015",
"Zo'ra: Unbound Athvur" = "#7A1F00", "Zo'ra: Bound Athvur" = "#691B00",
"Zo'ra: Unbound Scay" = "#470029", "Zo'ra: Bound Scay" = "#470519",
"Zo'ra: Unbound Xakt" = "#51230A", "Zo'ra: Bound Xakt" = "#491D05",
"K'lax: Unbound Zkaii" = "#2B483A", "K'lax: Bound Zkaii" = "#263B10",
"K'lax: Unbound Tupii" = "#067C12", "K'lax: Bound Tupii" = "#7D881D",
"K'lax: Unbound Vedhra" = "#627308", "K'lax: Bound Vedhra" = "#006400",
"K'lax: Unbound Leto" = "#1C6654", "K'lax: Bound Leto" = "#1A280F",
"K'lax: Unbound Vetju" = "#0D421B", "K'lax: Bound Vetju" = "#314831",
"C'thur: Unbound C'thur" = "#0F2962", "C'thur: Bound C'thur" = "#0A213F",
"C'thur: Unbound Vytel" = "#191937", "C'thur: Bound Vytel" = "#0E0E2B",
"C'thur: Unbound Mouv" = "#7D75FF", "C'thur: Bound Mouv" = "#4A8AFC",
"C'thur: Unbound Xetl" = "#3F0876", "C'thur: Bound Xetl" = "#330563"
)
/datum/species/bug/type_e/New()
..()
equip_adjust = list(