shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3589 from Citadel-Station-13/upstream-merge-31855

Browse Source 
[MIRROR] Dullahans
This commit is contained in:
LetterJay
2017-10-30 23:54:25 -04:00
committed by GitHub
parent 8c1dcd9429 53314289c8
commit 32fb136bf0
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bodyparts/head.dm
+15 -17
View File
@@ -124,39 +124,37 @@
cut_overlays() cut_overlays()
. = ..() . = ..()
if(dropped) //certain overlays only appear when the limb is being detached from its owner. if(dropped) //certain overlays only appear when the limb is being detached from its owner.
var/datum/sprite_accessory/S
if(status != BODYPART_ROBOTIC) //having a robotic head hides certain features. if(status != BODYPART_ROBOTIC) //having a robotic head hides certain features.
//facial hair //facial hair
if(facial_hair_style) if(facial_hair_style)
S = GLOB.facial_hair_styles_list[facial_hair_style] var/datum/sprite_accessory/S = GLOB.facial_hair_styles_list[facial_hair_style]
if(S) if(S)
var/image/facial_overlay = image(S.icon, "[S.icon_state]", -HAIR_LAYER, SOUTH) var/image/facial_overlay = image(S.icon, "[S.icon_state]", -HAIR_LAYER, SOUTH)
facial_overlay.color = "#" + facial_hair_color facial_overlay.color = "#" + facial_hair_color
facial_overlay.alpha = hair_alpha facial_overlay.alpha = hair_alpha
. += facial_overlay . += facial_overlay
var/image/hair_overlay = image(layer = -HAIR_LAYER, dir = SOUTH)
. += hair_overlay
//Applies the debrained overlay if there is no brain //Applies the debrained overlay if there is no brain
if(!brain) if(!brain)
var/image/debrain_overlay = image(layer = -HAIR_LAYER, dir = SOUTH)
if(animal_origin == ALIEN_BODYPART) if(animal_origin == ALIEN_BODYPART)
hair_overlay.icon = 'icons/mob/animal_parts.dmi' debrain_overlay.icon = 'icons/mob/animal_parts.dmi'
hair_overlay.icon_state = "debrained_alien" debrain_overlay.icon_state = "debrained_alien"
else if(animal_origin == LARVA_BODYPART) else if(animal_origin == LARVA_BODYPART)
hair_overlay.icon = 'icons/mob/animal_parts.dmi' debrain_overlay.icon = 'icons/mob/animal_parts.dmi'
hair_overlay.icon_state = "debrained_larva" debrain_overlay.icon_state = "debrained_larva"
else if(!(NOBLOOD in species_flags_list)) else if(!(NOBLOOD in species_flags_list))
hair_overlay.icon = 'icons/mob/human_face.dmi' debrain_overlay.icon = 'icons/mob/human_face.dmi'
hair_overlay.icon_state = "debrained" debrain_overlay.icon_state = "debrained"
. += debrain_overlay
else else
if(hair_style) var/datum/sprite_accessory/S2 = GLOB.hair_styles_list[hair_style]
S = GLOB.hair_styles_list[hair_style] if(S2)
if(S) var/image/hair_overlay = image(S2.icon, "[S2.icon_state]", -HAIR_LAYER, SOUTH)
hair_overlay.icon = icon hair_overlay.color = "#" + hair_color
hair_overlay.icon_state = "[S.icon_state]" hair_overlay.alpha = hair_alpha
hair_overlay.color = "#" + hair_color . += hair_overlay
hair_overlay.alpha = hair_alpha
// lipstick // lipstick