TG sync Sunday (#201)
* stage one * datums and shit * game stuff * modules * tgstation.dme * tools * these things for icons * compiling fixes * merge spree on TG * other updates * updated maps with deepfryers * My helpers were not helping
This commit is contained in:
@@ -145,6 +145,9 @@
|
||||
LB.brainmob.container = LB
|
||||
LB.brainmob.stat = DEAD
|
||||
|
||||
/obj/item/organ/eyes/transfer_to_limb(obj/item/bodypart/head/LB, mob/living/carbon/human/C)
|
||||
LB.eyes = src
|
||||
..()
|
||||
|
||||
/obj/item/bodypart/chest/drop_limb(special)
|
||||
return
|
||||
@@ -289,7 +292,6 @@
|
||||
H.hair_style = hair_style
|
||||
H.facial_hair_color = facial_hair_color
|
||||
H.facial_hair_style = facial_hair_style
|
||||
H.eye_color = eye_color
|
||||
H.lip_style = lip_style
|
||||
H.lip_color = lip_color
|
||||
if(real_name)
|
||||
|
||||
@@ -25,8 +25,9 @@
|
||||
var/facial_hair_color = "000"
|
||||
var/facial_hair_style = "Shaved"
|
||||
//Eye Colouring
|
||||
var/eyes = "eyes"
|
||||
var/eye_color = ""
|
||||
|
||||
var/obj/item/organ/eyes/eyes = null
|
||||
|
||||
var/lip_style = null
|
||||
var/lip_color = "white"
|
||||
|
||||
@@ -61,8 +62,6 @@
|
||||
real_name = "Unknown"
|
||||
hair_style = "Bald"
|
||||
facial_hair_style = "Shaved"
|
||||
eyes = "eyes"
|
||||
eye_color = ""
|
||||
lip_style = null
|
||||
|
||||
else if(!animal_origin)
|
||||
@@ -106,14 +105,6 @@
|
||||
else
|
||||
lip_style = null
|
||||
lip_color = "white"
|
||||
// eyes
|
||||
if(EYECOLOR in S.species_traits)
|
||||
eyes = S.eyes
|
||||
eye_color = H.eye_color
|
||||
else
|
||||
eyes = "eyes"
|
||||
eye_color = ""
|
||||
|
||||
..()
|
||||
|
||||
/obj/item/bodypart/head/update_icon_dropped()
|
||||
@@ -167,9 +158,12 @@
|
||||
standing += lips
|
||||
|
||||
// eyes
|
||||
if(eye_color)
|
||||
var/image/img_eyes = image("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[eyes]", "layer" = -BODY_LAYER, "dir"=SOUTH)
|
||||
img_eyes.color = "#" + eye_color
|
||||
if(!eyes)
|
||||
standing += image("icon"='icons/mob/human_face.dmi', "icon_state" = "eyes_missing", "layer" = -BODY_LAYER, "dir"=SOUTH)
|
||||
|
||||
else if(eyes.eye_color)
|
||||
var/image/img_eyes = image("icon" = 'icons/mob/human_face.dmi', "icon_state" = "eyes", "layer" = -BODY_LAYER, "dir"=SOUTH)
|
||||
img_eyes.color = "#" + eyes.eye_color
|
||||
standing += img_eyes
|
||||
|
||||
return standing
|
||||
|
||||
Reference in New Issue
Block a user