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

Revert "Revert "Synthetics revised""

Browse Source 
This reverts commit df2980db46.
This commit is contained in:
jack-fractal
2015-07-10 20:38:24 -04:00
parent b33078ad0e
commit 8f76c3afae
29 changed files with 1756 additions and 1963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/mirror.dm
+23 -31
View File
@@ -14,43 +14,35 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/userloc = H.loc
//see code/modules/mob/new_player/preferences.dm at approx line 545 for comments!
//this is largely copypasted from there.
//handle facial hair (if necessary)
if(H.gender == MALE)
var/list/species_facial_hair = list()
if(H.species)
for(var/i in facial_hair_styles_list)
var/datum/sprite_accessory/facial_hair/tmp_facial = facial_hair_styles_list[i]
if(H.species.name in tmp_facial.species_allowed)
species_facial_hair += i
else
species_facial_hair = facial_hair_styles_list
var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in species_facial_hair
var/list/hair_styles = H.valid_hairstyles_for_this_mob()
var/list/facial_styles = H.valid_facialhairstyles_for_this_mob()
if (facial_styles.len > 1) //handle facial hair (if necessary)
var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in facial_styles
if(userloc != H.loc) return //no tele-grooming
if(new_style)
H.f_style = new_style
//handle normal hair
var/list/species_hair = list()
if(H.species)
for(var/i in hair_styles_list)
var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
if(H.species.name in tmp_hair.species_allowed)
species_hair += i
else
species_hair = hair_styles_list
var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in species_hair
if(userloc != H.loc) return //no tele-grooming
if(new_style)
H.h_style = new_style
if (hair_styles.len)
var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in hair_styles
if(userloc != H.loc) return //no tele-grooming
if(new_style)
H.h_style = new_style
//machines can change their eye colours in the mirror
if (istype(H.species,/datum/species/machine))
var/new_eyes = input(user, "Choose your new eye colour.", "Robotic Eyes") as color|null
if(new_eyes)
var/list/new_eyes_as_values = htmlcolour_to_values(new_eyes)
H.r_eyes=new_eyes_as_values[1]
H.g_eyes=new_eyes_as_values[2]
H.b_eyes=new_eyes_as_values[3]
H.update_hair() // need to do a full rebuild here
H.update_body()
return
H.update_hair()