cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaces "specflags" with "species_traits" (#21851)

Browse Source 
* Replaces "specflags" with "species_traits"

* this will do
This commit is contained in:
Joan Lung
2016-12-01 21:16:33 +13:00
committed by oranges
parent d3fe2d6974
commit a5ae025549
41 changed files with 167 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+5 -5
View File
@@ -207,7 +207,7 @@ var/list/preferences_datums = list()
dat += "</td>"
if(HAIR in pref_species.specflags)
if(HAIR in pref_species.species_traits)
dat += "<td valign='top' width='21%'>"
@@ -228,7 +228,7 @@ var/list/preferences_datums = list()
dat += "</td>"
if(EYECOLOR in pref_species.specflags)
if(EYECOLOR in pref_species.species_traits)
dat += "<td valign='top' width='21%'>"
@@ -240,7 +240,7 @@ var/list/preferences_datums = list()
if(config.mutant_races) //We don't allow mutant bodyparts for humans either unless this is true.
if((MUTCOLORS in pref_species.specflags) || (MUTCOLORS_PARTSONLY in pref_species.specflags))
if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
dat += "<td valign='top' width='14%'>"
@@ -934,7 +934,7 @@ var/list/preferences_datums = list()
pref_species = new newtype()
//Now that we changed our species, we must verify that the mutant colour is still allowed.
var/temp_hsv = RGBtoHSV(features["mcolor"])
if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.specflags) && ReadHSV(temp_hsv)[3] < ReadHSV("#7F7F7F")[3]))
if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#7F7F7F")[3]))
features["mcolor"] = pref_species.default_color
if("mutant_color")
var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference") as color|null
@@ -942,7 +942,7 @@ var/list/preferences_datums = list()
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")
features["mcolor"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.specflags) || ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright, but only if they affect the skin
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright, but only if they affect the skin
features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
else
user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"