From 65bcef04eaf76d96b1056ed5f11f6ea77a6e69e5 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 30 Dec 2015 23:47:37 +0100 Subject: [PATCH] makes manifest entries use get_flat_human_icon --- code/datums/datacore.dm | 161 +--------------------------------------- 1 file changed, 3 insertions(+), 158 deletions(-) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 095b53dd585..89d3e04808f 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -266,161 +266,6 @@ var/record_id_num = 1001 return /datum/datacore/proc/get_id_photo(mob/living/carbon/human/H) - var/icon/photo = null - var/g = (H.gender == FEMALE) ? "f" : "m" - if(!config.mutant_races || H.dna.species.use_skintones) - photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]_s") - else - photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]_s") - photo.Blend("#[H.dna.features["mcolor"]]", ICON_MULTIPLY) - - var/icon/eyes_s - if(EYECOLOR in H.dna.species.specflags) - eyes_s = icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[H.dna.species.eyes]_s") - eyes_s.Blend("#[H.eye_color]", ICON_MULTIPLY) - - var/datum/sprite_accessory/S - S = hair_styles_list[H.hair_style] - if(S && (HAIR in H.dna.species.specflags)) - var/icon/hair_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") - hair_s.Blend("#[H.hair_color]", ICON_MULTIPLY) - eyes_s.Blend(hair_s, ICON_OVERLAY) - - S = facial_hair_styles_list[H.facial_hair_style] - if(S && (FACEHAIR in H.dna.species.specflags)) - var/icon/facial_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") - facial_s.Blend("#[H.facial_hair_color]", ICON_MULTIPLY) - eyes_s.Blend(facial_s, ICON_OVERLAY) - - if(eyes_s) - photo.Blend(eyes_s, ICON_OVERLAY) - - var/icon/clothes_s = null - switch(H.mind.assigned_role) - if("Assistant") - clothes_s = icon('icons/mob/uniform.dmi', "grey_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - if("Scientist") - clothes_s = icon('icons/mob/uniform.dmi', "toxinswhite_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat_tox"), ICON_OVERLAY) - if("Station Engineer") - clothes_s = icon('icons/mob/uniform.dmi', "engine_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - if("Security Officer") - clothes_s = icon('icons/mob/uniform.dmi', "security_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY) - if("Medical Doctor") - clothes_s = icon('icons/mob/uniform.dmi', "medical_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat"), ICON_OVERLAY) - if("Cargo Technician") - clothes_s = icon('icons/mob/uniform.dmi', "cargo_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - if("Shaft Miner") - clothes_s = icon('icons/mob/uniform.dmi', "miner_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - if("Atmospheric Technician") - clothes_s = icon('icons/mob/uniform.dmi', "atmos_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - if("Botanist") - clothes_s = icon('icons/mob/uniform.dmi', "hydroponics_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY) - if("Chemist") - clothes_s = icon('icons/mob/uniform.dmi', "chemistrywhite_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat_chem"), ICON_OVERLAY) - if("Cook") - clothes_s = icon('icons/mob/uniform.dmi', "chef_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "chef"), ICON_OVERLAY) - if("Janitor") - clothes_s = icon('icons/mob/uniform.dmi', "janitor_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - if("Geneticist") - clothes_s = icon('icons/mob/uniform.dmi', "geneticswhite_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat_gen"), ICON_OVERLAY) - if("Virologist") - clothes_s = icon('icons/mob/uniform.dmi', "virologywhite_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat_vir"), ICON_OVERLAY) - if("Roboticist") - clothes_s = icon('icons/mob/uniform.dmi', "robotics_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat"), ICON_OVERLAY) - if("Lawyer") - clothes_s = icon('icons/mob/uniform.dmi', "bluesuit_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY) - if("Clown") - clothes_s = icon('icons/mob/uniform.dmi', "clown_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY) - if("Mime") - clothes_s = icon('icons/mob/uniform.dmi', "mime_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY) - if("Bartender") - clothes_s = icon('icons/mob/uniform.dmi', "barman_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY) - if("Quartermaster") - clothes_s = icon('icons/mob/uniform.dmi', "qm_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - if("Chaplain") - clothes_s = icon('icons/mob/uniform.dmi', "chapblack_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - if("Research Director") - clothes_s = icon('icons/mob/uniform.dmi', "director_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat"), ICON_OVERLAY) - if("Chief Medical Officer") - clothes_s = icon('icons/mob/uniform.dmi', "cmo_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "labcoat_cmo"), ICON_OVERLAY) - if("Captain") - clothes_s = icon('icons/mob/uniform.dmi', "captain_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "capcarapace"), ICON_OVERLAY) - if("Head of Security") - clothes_s = icon('icons/mob/uniform.dmi', "hos_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "hostrench"), ICON_OVERLAY) - if("Warden") - clothes_s = icon('icons/mob/uniform.dmi', "warden_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "warden_jacket"), ICON_OVERLAY) - if("Detective") - clothes_s = icon('icons/mob/uniform.dmi', "detective_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY) - clothes_s.Blend(icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY) - if("Chief Engineer") - clothes_s = icon('icons/mob/uniform.dmi', "chief_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - if("Head of Personnel") - clothes_s = icon('icons/mob/uniform.dmi', "hop_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - if("Librarian") - clothes_s = icon('icons/mob/uniform.dmi', "red_suit_s") - clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - - if(clothes_s) - photo.Blend(clothes_s, ICON_OVERLAY) - - return photo + var/datum/job/J = SSjob.GetJob(H.mind.assigned_role) + var/datum/preferences/P = H.client.prefs + return get_flat_human_icon(null,J.outfit,P)