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

Removes eye color vars on the human, stores it on the eyes

Browse Source 
Also adds a proc nifty for SDQL fans, which grants greater control over
spawning atoms.

Also fixes deserialization to make hair show up again
This commit is contained in:
Crazylemon64
2016-08-13 23:05:32 -07:00
parent dbfc4562fa
commit 3ca5a1f3f7
21 changed files with 212 additions and 169 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) // Probably needs a means for IPCs to have their optics show
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]