From 76fab07f5278b4c98924b744c40831be5d6962c1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 20 Feb 2018 20:58:36 -0600 Subject: [PATCH] Zheng Hu Improvements --- code/modules/organs/organ_icon.dm | 4 ++-- code/modules/organs/robolimbs.dm | 6 ++++-- .../cyberlimbs/zenghu/zenghu_main.dmi | Bin 1413 -> 1403 bytes 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 170475a208..8301b912cc 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -18,7 +18,7 @@ var/global/list/limb_icon_cache = list() h_col = null if(robotic >= ORGAN_ROBOT) var/datum/robolimb/franchise = all_robolimbs[model] - if(!(franchise && franchise.lifelike)) + if(!(franchise && franchise.skin_tone)) if(human.synth_color) s_col = list(human.r_synth, human.g_synth, human.b_synth) return @@ -36,7 +36,7 @@ var/global/list/limb_icon_cache = list() h_col = null if(robotic >= ORGAN_ROBOT) var/datum/robolimb/franchise = all_robolimbs[model] - if(!(franchise && franchise.lifelike)) + if(!(franchise && franchise.skin_tone)) return if(!isnull(dna.GetUIValue(DNA_UI_SKIN_TONE)) && (species.appearance_flags & HAS_SKIN_TONE)) s_tone = dna.GetUIValue(DNA_UI_SKIN_TONE) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index e5988cf96c..ed736c94d3 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -40,6 +40,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ var/unavailable_at_chargen // If set, not available at chargen. var/unavailable_to_build // If set, can't be constructed. var/lifelike // If set, appears organic. + var/skin_tone // If set, applies skin tone rather than part color var/blood_color = "#030303" var/list/species_cannot_use = list("Teshari") var/list/monitor_styles //If empty, the model of limbs offers a head compatible with monitors. @@ -100,7 +101,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt2.dmi' unavailable_to_build = 1 parts = list(BP_HEAD) - + /datum/robolimb/cybersolutions_alt1 company = "Cyber Solutions - Wight" desc = "This limb has cheap plastic panels mounted on grey metal." @@ -198,6 +199,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ icon = 'icons/mob/human_races/cyberlimbs/veymed/veymed_main.dmi' unavailable_to_build = 1 lifelike = 1 + skin_tone = 1 blood_color = "#CCCCCC" speech_bubble_appearance = "normal" @@ -220,7 +222,6 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi' unavailable_to_build = 1 - /datum/robolimb/wardtakahashi_monitor company = "Ward-Takahashi Monitor" desc = "Ward-Takahashi's unique spin on a popular prosthetic head model. It looks sleek and modern." @@ -278,6 +279,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ desc = "This limb has a rubbery fleshtone covering with visible seams." icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi' unavailable_to_build = 1 + skin_tone = 1 /obj/item/weapon/disk/limb name = "Limb Blueprints" diff --git a/icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi b/icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi index 8694f1b16fa323356ef05b81cca8e662c581af87..ebc3bb066c6764e727a0936714f61a2aaacdebfd 100644 GIT binary patch delta 1189 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