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

Merge pull request #5447 from Crazylemon64/serialization_eyes_fix

Browse Source 
Improves Serialization
This commit is contained in:
Fox McCloud
2016-08-17 20:10:24 -04:00
committed by GitHub
parent 0a923f271a 09cace7eae
commit c21299ddda
21 changed files with 238 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/datacore.dm
+7 -1
View File
@@ -129,6 +129,7 @@
proc/get_id_photo(var/mob/living/carbon/human/H)
var/icon/preview_icon = null
var/obj/item/organ/external/head/head_organ = H.get_organ("head")
var/obj/item/organ/internal/eyes/eyes_organ = H.get_int_organ(/obj/item/organ/internal/eyes)
var/g = "m"
if(H.gender == FEMALE)
@@ -170,7 +171,12 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
var/icon/face_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "bald_s")
if(!(H.species.bodyflags & NO_EYES))
var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = H.species ? H.species.eyes : "eyes_s")
eyes_s.Blend(rgb(H.r_eyes, H.g_eyes, H.b_eyes), ICON_ADD)
if(!eyes_organ)
return
var/eye_red = eyes_organ.eye_colour[1]
var/eye_green = eyes_organ.eye_colour[2]
var/eye_blue = eyes_organ.eye_colour[3]
eyes_s.Blend(rgb(eye_red, eye_green, eye_blue), ICON_ADD)
face_s.Blend(eyes_s, ICON_OVERLAY)
var/datum/sprite_accessory/hair_style = hair_styles_list[head_organ.h_style]