diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm index eb431256914..b07f634aa9d 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm @@ -10,31 +10,6 @@ /mob/living/carbon/human/tajaran/New() tajspeak_letters = new/list("~","*","-") - var/datum/reagents/R = new/datum/reagents(1000) - reagents = R - R.my_atom = src - - if(!dna) dna = new /datum/dna(null) - - new /datum/organ/external/chest(src) - new /datum/organ/external/groin(src) - new /datum/organ/external/head(src) - new /datum/organ/external/l_arm(src) - new /datum/organ/external/r_arm(src) - new /datum/organ/external/r_leg(src) - new /datum/organ/external/l_leg(src) - - var/datum/organ/external/part = new /datum/organ/external/l_hand(src) - part.parent = organs["l_arm"] - part = new /datum/organ/external/l_foot(src) - part.parent = organs["l_leg"] - part = new /datum/organ/external/r_hand(src) - part.parent = organs["r_arm"] - part = new /datum/organ/external/r_foot(src) - part.parent = organs["r_leg"] - - debug_leftarm = organs["l_arm"] - debug_lefthand = organs["l_hand"] var/g = "m" if (gender == FEMALE) @@ -559,7 +534,7 @@ del(face_lying) return - if(!facial_hair_style || !hair_style) return//Seems people like to lose their icons, this should stop the runtimes for now + //if(!facial_hair_style || !hair_style) return//Seems people like to lose their icons, this should stop the runtimes for now del(face_standing) del(face_lying) @@ -577,31 +552,31 @@ eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD) eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD) - var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") - var/icon/hair_l = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_l") - hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) - hair_l.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) + //var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") + //var/icon/hair_l = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_l") + //hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) + //hair_l.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) - var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") - var/icon/facial_l = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_l") - facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) - facial_l.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) + //var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") + //var/icon/facial_l = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_l") + //facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) + //facial_l.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) var/icon/mouth_s = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "mouth_[g]_s") var/icon/mouth_l = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "mouth_[g]_l") // if the head or mask has the flag BLOCKHAIR (equal to 5), then do not apply hair - if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR))) - eyes_s.Blend(hair_s, ICON_OVERLAY) - eyes_l.Blend(hair_l, ICON_OVERLAY) + //if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR))) + //eyes_s.Blend(hair_s, ICON_OVERLAY) + //eyes_l.Blend(hair_l, ICON_OVERLAY) eyes_s.Blend(mouth_s, ICON_OVERLAY) eyes_l.Blend(mouth_l, ICON_OVERLAY) // if BLOCKHAIR, do not apply facial hair - if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR))) - eyes_s.Blend(facial_s, ICON_OVERLAY) - eyes_l.Blend(facial_l, ICON_OVERLAY) + //if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR))) + //eyes_s.Blend(facial_s, ICON_OVERLAY) + //eyes_l.Blend(facial_l, ICON_OVERLAY) face_standing = new /image() @@ -613,10 +588,10 @@ del(mouth_l) del(mouth_s) - del(facial_l) - del(facial_s) - del(hair_l) - del(hair_s) + //del(facial_l) + //del(facial_s) + //del(hair_l) + //del(hair_s) del(eyes_l) del(eyes_s)