From 294349125ecb63dc5118a507406d1c451a15ccc6 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 6 Apr 2019 16:32:29 -0500 Subject: [PATCH 1/2] fixes floaty-leg syndrome for xenos also fixes random gen colors from bugging out, idk why it was working just fine before but whatever --- code/__HELPERS/mobs.dm | 9 ++++++--- .../human/species_types/lizardpeople.dm | 7 ++++++- code/modules/surgery/bodyparts/bodyparts.dm | 1 - .../mob/dead/new_player/sprite_accessories.dm | 2 +- .../carbon/human/species_types/furrypeople.dm | 6 +++--- .../icons/mob/mutant_bodyparts.dmi | Bin 9053 -> 8311 bytes .../icons/mob/xeno_parts_greyscale.dmi | Bin 3235 -> 3266 bytes 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index effeb274ab..74a1fbd785 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -123,12 +123,15 @@ var/datum/sprite_accessory/S = instance if(!S.ckeys_allowed) snowflake_mam_snouts_list[S.name] = mspath + var/color1 = random_short_color() + var/color2 = random_short_color() + var/color3 = random_short_color() //CIT CHANGE - changes this entire return to support cit's snowflake parts return(list( - "mcolor" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "mcolor2" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "mcolor3" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), + "mcolor" = color1, + "mcolor2" = color2, + "mcolor3" = color3, "tail_lizard" = pick(GLOB.tails_list_lizard), "tail_human" = "None", "wings" = "None", diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index b851552dc5..a02c93e365 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -94,4 +94,9 @@ inherent_traits = list(TRAIT_NOGUNS) mutantlungs = /obj/item/organ/lungs/ashwalker burnmod = 0.9 - brutemod = 0.9 \ No newline at end of file + brutemod = 0.9 + +/datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species) + if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines + C.dna.features["tail"] == "Smooth" + return ..() diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 03af32f660..f394351285 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -495,7 +495,6 @@ if(should_draw_greyscale) - marking.color = null var/draw_color = mutation_color || species_color || (skin_tone && skintone2hex(skin_tone)) if(draw_color) limb.color = "#[draw_color]" diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm index 81eb93106c..b5be18cec3 100644 --- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -1256,7 +1256,7 @@ datum/sprite_accessory/mam_tails/insect /datum/sprite_accessory/mam_body_markings/none name = "None" icon_state = "none" - color_src = MUTCOLORS + ckeys_allowed = list("yousshouldnteverbeseeingthisyoumeme") /datum/sprite_accessory/mam_body_markings/plain name = "Plain" diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index c34146a90c..6b6349c0f3 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -195,10 +195,10 @@ say_mod = "hisses" default_color = "00FF00" should_draw_citadel = TRUE - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS) inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) - mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur") - default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None") + mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur", "legs") + default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade Legs") attack_verb = "slash" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' diff --git a/modular_citadel/icons/mob/mutant_bodyparts.dmi b/modular_citadel/icons/mob/mutant_bodyparts.dmi index f369f21afbf272645b8be38efae31bdd7925d2c8..6a0bf77cd3410c2556d5a4fbd2ab3dcb27016014 100644 GIT binary patch delta 8064 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 delta 8813 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 diff --git a/modular_citadel/icons/mob/xeno_parts_greyscale.dmi b/modular_citadel/icons/mob/xeno_parts_greyscale.dmi index 0f27cf8f3073e436e6170e40a6f512baababb842..26da9bce101be94f00a50d261d377b96e5d9c160 100644 GIT binary patch delta 3223 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 JPDHLkV1k1IY1jY& delta 3191 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 From 3af678fc2373448c60a722397bcf8d4955f8f777 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 6 Apr 2019 17:09:43 -0500 Subject: [PATCH 2/2] somehow didn't save? even after a compile check? Nanithefuck --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index a02c93e365..c5a64ebd13 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -98,5 +98,5 @@ /datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species) if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines - C.dna.features["tail"] == "Smooth" + C.dna.features["tail"] = "Smooth" return ..()