diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index bb4f8c8a..d8e36751 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -976,10 +976,13 @@ datum/preferences metadata = sanitize(copytext(new_metadata,1,MAX_MESSAGE_LEN)) if("b_type") +// if(species != "Kocasslani") var/new_b_type = input(user, "Choose your character's blood-type:", "Character Preference") as null|anything in list( "A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-" ) if(new_b_type) b_type = new_b_type - +/* else + b_type = "K" +*/ if("hair") if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell") var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as color|null @@ -1053,6 +1056,7 @@ datum/preferences g_eyes = hex2num(copytext(new_eyes, 4, 6)) b_eyes = hex2num(copytext(new_eyes, 6, 8)) + if("s_tone") if(species != "Human") return diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index c94e8565..1d04a95c 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -73,6 +73,13 @@ colour = "rough" key = "3" +/datum/language/sini + name = "Sini" + desc = "Kocasslani traditional language" + speech_verb = "sings" + colour = "skrell" + key = "z" + // Language handling. /mob/proc/add_language(var/language) @@ -102,4 +109,4 @@ dat += "[L.name] (:[L.key])
[L.desc]

" src << browse(dat, "window=checklanguage") - return \ No newline at end of file + return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d1e42f06..1030154b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1,3 +1,4 @@ + /mob/living/carbon/human name = "unknown" real_name = "unknown" @@ -39,6 +40,11 @@ h_style = "blue IPC screen" ..(new_loc, "Machine") +/mob/living/carbon/human/kocasslani/New(var/new_loc) + h_style = "Bald" + ..(new_loc, "Kocasslani") + + /mob/living/carbon/human/New(var/new_loc, var/new_species = null) if(!species) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 2f8dfd97..a181e03f 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -375,7 +375,7 @@ var/miss_sound = 'sound/weapons/punchmiss.ogg' var/sharp = 0 var/edge = 0 - + /datum/unarmed_attack/punch attack_verb = list("punch") @@ -394,3 +394,24 @@ /datum/unarmed_attack/claws/armalis attack_verb = list("slash", "claw") damage = 10 //they're huge! they should do a little more damage, i'd even go for 15-20 maybe... + +/datum/species/kocasslani + name = "Kocasslani" + icobase = 'icons/mob/human_races/r_kocasslani.dmi' + deform = 'icons/mob/human_races/r_def_kocasslani.dmi' + language = "Sini" + darksight = 8 + + cold_level_1 = 160 //Default 260 + cold_level_2 = 100 //Default 200 + cold_level_3 = 60 //Default 120 + + heat_level_1 = 300 //Default 360 + heat_level_2 = 360 //Default 400 + heat_level_3 = 800 //Default 1000 + + flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR + +/* blood_color = "#659CEF" + flesh_color = "#D3AA8E" +*/ \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 5e32095a..d8693284 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -51,7 +51,7 @@ name = "Bald" icon_state = "bald" gender = MALE - species_allowed = list("Human","Unathi") + species_allowed = list("Human","Unathi","Kocasslani") short name = "Short Hair" // try to capatilize the names please~ @@ -431,7 +431,7 @@ name = "Shaved" icon_state = "bald" gender = NEUTER - species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Machine") + species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Machine","Kocasslani") watson name = "Watson Mustache" @@ -633,6 +633,31 @@ icon_state = "vox_shortquills" species_allowed = list("Vox") + kocasslani_m_1 + name = "Kocasslani Male 1" + icon_state = "kocasslani_m_hair1" + species_allowed = list("Kocasslani") + + kocasslani_m_2 + name = "Kocasslani Male 2" + icon_state = "kocasslani_m_hair2" + species_allowed = list("Kocasslani") + + kocasslani_f_1 + name = "Kocasslani Female 1" + icon_state = "kocasslani_f_hair1" + species_allowed = list("Kocasslani") + + kocasslani_f_2 + name = "Kocasslani Female 2" + icon_state = "kocasslani_f_hair2" + species_allowed = list("Kocasslani") + + kocasslani_f_3 + name = "Kocasslani Female 3" + icon_state = "kocasslani_f_hair3" + species_allowed = list("Kocasslani") + /datum/sprite_accessory/facial_hair taj_sideburns @@ -697,4 +722,10 @@ name = "Default skrell skin" icon_state = "default" icon = 'icons/mob/human_races/r_skrell.dmi' - species_allowed = list("Skrell") \ No newline at end of file + species_allowed = list("Skrell") + + kocasslani + name = "Default Kocasslani skin" + icon_state = "default" + icon = 'icons/mob/human_races/r_kocasslani.dmi' + species_allowed = list("Kocasslani") \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index c091f1db..9f3a9ea5 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -18,11 +18,25 @@ update_icon() update_icon() - var/percent = round((reagents.total_volume / volume) * 100) - switch(percent) - if(0 to 9) icon_state = "empty" - if(10 to 50) icon_state = "half" - if(51 to INFINITY) icon_state = "full" + + + + +/* + if(blood_type != "K") + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 9) icon_state = "empty" + if(10 to 50) icon_state = "half" + if(51 to INFINITY) icon_state = "full" + else + var/percent2 = round((reagents.total_volume / volume) * 100) + switch(percent2) + if(0 to 9) icon_state = "empty" + if(10 to 50) icon_state = "kocas_half" + if(51 to INFINITY) icon_state = "kocas_full" + +*/ /obj/item/weapon/reagent_containers/blood/APlus blood_type = "A+" diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi index d5405066..9574e0f0 100644 Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 9abc8227..d1df5278 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_races/r_def_kocasslani.dmi b/icons/mob/human_races/r_def_kocasslani.dmi new file mode 100644 index 00000000..63d2cf73 Binary files /dev/null and b/icons/mob/human_races/r_def_kocasslani.dmi differ diff --git a/icons/mob/human_races/r_kocasslani.dmi b/icons/mob/human_races/r_kocasslani.dmi new file mode 100644 index 00000000..eba4c840 Binary files /dev/null and b/icons/mob/human_races/r_kocasslani.dmi differ diff --git a/icons/obj/bloodpack.dmi b/icons/obj/bloodpack.dmi index 1d403bd5..aa151f29 100644 Binary files a/icons/obj/bloodpack.dmi and b/icons/obj/bloodpack.dmi differ