From ebc9c6d8f01c7de7e4fe0228d05921ae6c0c700d Mon Sep 17 00:00:00 2001 From: Poojawa Date: Thu, 4 Apr 2019 22:01:52 -0500 Subject: [PATCH] attempts to make slime sprites equally transparent also gives them snouts and markings for improvments --- .../mob/living/carbon/human/species.dm | 11 ++++---- .../carbon/human/species_types/jellypeople.dm | 4 +-- code/modules/surgery/bodyparts/bodyparts.dm | 8 +++--- config/game_options.txt | 2 +- .../carbon/human/species_types/jellypeople.dm | 25 ++++++++++++++++--- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e1935a9b5d..ca4f230905 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -724,10 +724,10 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/list/colorlist = list() colorlist.Cut() - colorlist += ReadRGB(H.dna.features["mcolor"]) - colorlist += ReadRGB(H.dna.features["mcolor2"]) - colorlist += ReadRGB(H.dna.features["mcolor3"]) - colorlist += list(0,0,0) + colorlist += ReadRGB("[H.dna.features["mcolor"]]0") + colorlist += ReadRGB("[H.dna.features["mcolor2"]]0") + colorlist += ReadRGB("[H.dna.features["mcolor3"]]0") + colorlist += list(0,0,0, hair_alpha) for(var/index=1, index<=colorlist.len, index++) colorlist[index] = colorlist[index]/255 @@ -774,11 +774,10 @@ GLOBAL_LIST_EMPTY(roundstart_races) husklist += ReadRGB("#a3a3a3") husklist += ReadRGB("#a3a3a3") husklist += ReadRGB("#a3a3a3") - husklist += list(0,0,0) + husklist += list(0,0,0, hair_alpha) for(var/index=1, index<=husklist.len, index++) husklist[index] = husklist[index]/255 accessory_overlay.color = husklist - standing += accessory_overlay if(S.hasinner) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index c72534972c..0461fb9b79 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -5,8 +5,8 @@ default_color = "00FF90" say_mod = "chirps" species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD) - mutant_bodyparts = list("mam_tail", "mam_ears", "taur") //CIT CHANGE - default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None") //CIT CHANGE + mutant_bodyparts = list("mam_tail", "mam_ears", "mam_snouts", "taur") //CIT CHANGE + default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None") //CIT CHANGE inherent_traits = list(TRAIT_TOXINLOVER) meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime exotic_blood = "slimejelly" diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 4ecac39ecc..03af32f660 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -306,10 +306,10 @@ //body marking memes var/list/colorlist = list() colorlist.Cut() - colorlist += ReadRGB(H.dna.features["mcolor"]) - colorlist += ReadRGB(H.dna.features["mcolor2"]) - colorlist += ReadRGB(H.dna.features["mcolor3"]) - colorlist += list(0,0,0) + colorlist += ReadRGB("[H.dna.features["mcolor"]]0") + colorlist += ReadRGB("[H.dna.features["mcolor2"]]0") + colorlist += ReadRGB("[H.dna.features["mcolor3"]]0") + colorlist += list(0,0,0, S.hair_alpha) for(var/index=1, index<=colorlist.len, index++) colorlist[index] = colorlist[index]/255 diff --git a/config/game_options.txt b/config/game_options.txt index 6ff9182f0a..6d59f10807 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -441,7 +441,7 @@ ROUNDSTART_RACES avian ROUNDSTART_RACES aquatic ROUNDSTART_RACES insect ROUNDSTART_RACES xeno -ROUNDSTART_RACES datashark +ROUNDSTART_RACES slimeperson ROUNDSTART_RACES guilmon ROUNDSTART_RACES ipc diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 38b4c505b5..64898f0121 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -10,8 +10,8 @@ default_color = "00FFFF" species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD) inherent_traits = list(TRAIT_TOXINLOVER) - mutant_bodyparts = list("mam_tail", "mam_ears", "taur") - default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None") + mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur") + default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None") say_mod = "says" hair_color = "mutcolor" hair_alpha = 180 @@ -69,7 +69,7 @@ /datum/action/innate/slime_change/proc/change_form() var/mob/living/carbon/human/H = owner - var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Ears", "Taur body", "Cancel") + var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Cancel") if(select_alteration == "Hair Style") if(H.gender == MALE) var/new_style = input(owner, "Select a facial hair style", "Hair Alterations") as null|anything in GLOB.facial_hair_styles_list @@ -144,6 +144,25 @@ H.dna.features["mam_snouts"] = new_snout H.update_body() + else if (select_alteration == "Markings") + var/list/snowflake_markings_list = list() + for(var/path in GLOB.mam_body_markings_list) + var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path] + if(istype(instance, /datum/sprite_accessory)) + var/datum/sprite_accessory/S = instance + if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey))) + snowflake_markings_list[S.name] = path + var/new_mam_body_markings + new_mam_body_markings = input(H, "Choose your character's body markings:", "Marking Alteration") as null|anything in snowflake_markings_list + if(new_mam_body_markings) + H.dna.features["mam_body_markings"] = new_mam_body_markings + if(new_mam_body_markings == "None") + H.dna.features["mam_body_markings"] = "Plain" + for(var/X in H.bodyparts) //propagates the markings changes + var/obj/item/bodypart/BP = X + BP.update_limb(FALSE, H) + H.update_body() + else if (select_alteration == "Tail") var/list/snowflake_tails_list = list("Normal" = null) for(var/path in GLOB.mam_tails_list)