cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8350 from KasparoVy/fix_hair_dye

Browse Source 
Fixes Barber's Dye Bottle
This commit is contained in:
Fox McCloud
2017-11-05 17:33:45 -05:00
committed by GitHub
parent bc58d32dc6 727cf1998a
commit 18cbce0ec6
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/dye_generator.dm
+11 -18
View File
@@ -96,36 +96,29 @@
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/dye_list = list("hair")
var/dye_list = list("hair", "alt. hair theme")
if(H.gender == MALE || H.get_species() == "Vulpkanin")
dye_list += "facial hair"
dye_list += "alt. facial hair theme"
if(H && (H.species.bodyflags & HAS_SKIN_COLOR))
dye_list += "body"
var/what_to_dye = input(user, "Choose an area to apply the dye","Dye Application") in dye_list
var/what_to_dye = input(user, "Choose an area to apply the dye", "Dye Application") in dye_list
user.visible_message("<span class='notice'>[user] starts dying [M]'s [what_to_dye]!</span>", "<span class='notice'>You start dying [M]'s [what_to_dye]!</span>")
if(do_after(user, 50, target = H))
switch(what_to_dye)
if("hair")
var/r_hair = color2R(dye_color)
var/g_hair = color2G(dye_color)
var/b_hair = color2B(dye_color)
if(H.change_hair_color(r_hair, g_hair, b_hair))
H.update_dna()
H.change_hair_color(dye_color)
if("alt. hair theme")
H.change_hair_color(dye_color, 1)
if("facial hair")
var/r_facial = color2R(dye_color)
var/g_facial = color2G(dye_color)
var/b_facial = color2B(dye_color)
if(H.change_facial_hair_color(r_facial, g_facial, b_facial))
H.update_dna()
H.change_facial_hair_color(dye_color)
if("alt. facial hair theme")
H.change_facial_hair_color(dye_color, 1)
if("body")
var/r_skin = color2R(dye_color)
var/g_skin = color2G(dye_color)
var/b_skin = color2B(dye_color)
if(H.change_skin_color(r_skin, g_skin, b_skin))
H.update_dna()
H.change_skin_color(dye_color)
H.update_dna()
user.visible_message("<span class='notice'>[user] finishes dying [M]'s [what_to_dye]!</span>", "<span class='notice'>You finish dying [M]'s [what_to_dye]!</span>")