diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 59c94c4196a79..dcac946d85fd8 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -60,11 +60,12 @@ #define DNA_MOTH_MARKINGS_BLOCK 13 #define DNA_MUSHROOM_CAPS_BLOCK 14 #define DNA_POD_HAIR_BLOCK 15 -#define DNA_MUTANT_COLOR_SECONDARY_BLOCK 16 //Add secondary color for species MASSMETA EDIT +#define DNA_MONKEY_TAIL_BLOCK 16 +#define DNA_MUTANT_COLOR_SECONDARY_BLOCK 17 //MASSMETA ADDITION //#define DNA_FEATURE_BLOCKS 16 -#define DNA_FEATURE_BLOCKS 17 // add +1 new DNA BLOCK -#define DNA_MONKEY_TAIL_BLOCK 16 +#define DNA_FEATURE_BLOCKS 17 // add +1 new DNA BLOCK (secondary color for liz) + #define DNA_SEQUENCE_LENGTH 4 diff --git a/code/__DEFINES/sprite_accessories.dm b/code/__DEFINES/sprite_accessories.dm index 849a0f322f28f..27049cab32278 100644 --- a/code/__DEFINES/sprite_accessories.dm +++ b/code/__DEFINES/sprite_accessories.dm @@ -1,8 +1,10 @@ // ~color source defines for sprite accessories /// Color of the sprite accessory will match the owner's mutant color, which is granted by certain species #define MUTANT_COLOR "mutant_color" + ///Secondary color of the sprite accessory will match the owner's mutant secondary color, which is granted by certain species -#define MUTANT_COLOR_SECONDARY "mutant_color_secondary" // MASSMETA EDIT +#define MUTANT_COLOR_SECONDARY "mutant_color_secondary" // MASSMETA ADDITION + /// Color of the sprite accessory will match the owner's hair color #define HAIR_COLOR "hair_color" /// Color of the sprite accessory will match the owner's facial hair color diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index c50843631d45f..748d8728f4d6d 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -144,12 +144,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_USES_SKINTONES "uses_skintones" /// Species with this trait use mutant colors for coloration #define TRAIT_MUTANT_COLORS "mutcolors" + /// Species with this trait use second mutant colors for coloration -#define TRAIT_MUTANT_COLORS_SECONDARY "mutcolors_secondary" // MASSMETA EDIT +#define TRAIT_MUTANT_COLORS_SECONDARY "mutcolors_secondary" // MASSMETA ADDITION + /// Species with this trait have mutant colors that cannot be chosen by the player, nor altered ingame by external means #define TRAIT_FIXED_MUTANT_COLORS "fixed_mutcolors" -/// Species with this trait have second mutant colors that cannot be chosen by the player, nor altered ingame by external means -#define TRAIT_FIXED_MUTANT_COLORS_SECONDARY "fixed_mutcolors_secondary" // MASSMETA EDIT /// Species with this trait have a haircolor that cannot be chosen by the player, nor altered ingame by external means #define TRAIT_FIXED_HAIRCOLOR "fixed_haircolor" /// Humans with this trait won't get bloody hands, nor bloody feet diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 32d39d2a59ff3..19222dea5c69d 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -222,7 +222,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_FIST_MINING" = TRAIT_FIST_MINING, "TRAIT_FIXED_HAIRCOLOR" = TRAIT_FIXED_HAIRCOLOR, "TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS, - "TRAIT_FIXED_MUTANT_COLORS_SECONDARY" = TRAIT_FIXED_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT "TRAIT_FLESH_DESIRE" = TRAIT_FLESH_DESIRE, "TRAIT_FLOORED" = TRAIT_FLOORED, "TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION" = TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION, @@ -310,7 +309,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_MULTIZ_SUIT_SENSORS" = TRAIT_MULTIZ_SUIT_SENSORS, "TRAIT_MUSICIAN" = TRAIT_MUSICIAN, "TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS, - "TRAIT_MUTANT_COLORS_SECONDARY" = TRAIT_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT + "TRAIT_MUTANT_COLORS_SECONDARY" = TRAIT_MUTANT_COLORS_SECONDARY, //MASSMETA ADDITION "TRAIT_MUTE" = TRAIT_MUTE, "TRAIT_NAIVE" = TRAIT_NAIVE, "TRAIT_NEARSIGHTED_CORRECTED" = TRAIT_NEARSIGHTED_CORRECTED, diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 07a3405479ca8..68eca9a79bbf9 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -80,7 +80,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_FIST_MINING" = TRAIT_FIST_MINING, "TRAIT_FIXED_HAIRCOLOR" = TRAIT_FIXED_HAIRCOLOR, "TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS, - "TRAIT_FIXED_MUTANT_COLORS_SECONDARY" = TRAIT_FIXED_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT "TRAIT_FLOORED" = TRAIT_FLOORED, "TRAIT_FORCED_STANDING" = TRAIT_FORCED_STANDING, "TRAIT_FREERUNNING" = TRAIT_FREERUNNING, @@ -127,7 +126,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_MORBID" = TRAIT_MORBID, "TRAIT_MUSICIAN" = TRAIT_MUSICIAN, "TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS, - "TRAIT_MUTANT_COLORS_SECONDARY" = TRAIT_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT + "TRAIT_MUTANT_COLORS_SECONDARY" = TRAIT_MUTANT_COLORS_SECONDARY, //MASSMETA ADDITION "TRAIT_MUTE" = TRAIT_MUTE, "TRAIT_NAIVE" = TRAIT_NAIVE, "TRAIT_NEVER_WOUNDED" = TRAIT_NEVER_WOUNDED, diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index 6acbbc1894e25..a07aea7cdda2e 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(minor_mapping) return SS_INIT_NO_NEED #else trigger_migration(CONFIG_GET(number/mice_roundstart)) - place_satchels(satchel_amount = 2) + place_satchels(satchel_amount = 5) // MASSMETA EDIT 2 -> 5 return SS_INIT_SUCCESS #endif diff --git a/code/datums/bodypart_overlays/bodypart_overlay.dm b/code/datums/bodypart_overlays/bodypart_overlay.dm index e130760e5a082..22f2b15f2ccd0 100644 --- a/code/datums/bodypart_overlays/bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/bodypart_overlay.dm @@ -15,14 +15,6 @@ . = get_image(layer, limb) color_image(., layer, limb) -// Edit START (secondary color) - -///Wrapper for getting the proper secondary image, colored and everything -/datum/bodypart_overlay/proc/get_extended_overlay(layer, obj/item/bodypart/limb) // MASSMETA EDIT - return - -//Edit END - ///Generate the image. Needs to be overriden /datum/bodypart_overlay/proc/get_image(layer, obj/item/bodypart/limb) CRASH("Get image needs to be overridden") diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index b71dd0701ac1a..57c11814c022d 100644 --- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -23,20 +23,6 @@ draw_color = "#[random_color()]" imprint_on_next_insertion = FALSE -// Edit START (secondary color) - -/datum/bodypart_overlay/mutant/get_extended_overlay(layer, obj/item/bodypart/limb) // MASSMETA EDIT - layer = bitflag_to_layer(layer) - var/passed_color = sprite_datum.color_src ? draw_color : null - var/mob/living/carbon/human/owner = limb.owner - if(!owner) - return - var/datum/species/owner_species = owner.dna.species - - return owner_species.return_accessory_layer(-layer, sprite_datum, owner, passed_color) - -// Edit END - ///Grab a random sprite /datum/bodypart_overlay/mutant/proc/randomize_sprite() sprite_datum = get_random_appearance() diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 92eccfb975c78..0590cf6b2ab9d 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(identity_block_lengths, list( */ GLOBAL_LIST_INIT(features_block_lengths, list( "[DNA_MUTANT_COLOR_BLOCK]" = DNA_BLOCK_SIZE_COLOR, - "[DNA_MUTANT_COLOR_SECONDARY_BLOCK]" = DNA_BLOCK_SIZE_COLOR, // MASSMETA EDIT + "[DNA_MUTANT_COLOR_SECONDARY_BLOCK]" = DNA_BLOCK_SIZE_COLOR, // MASSMETA ADDITION "[DNA_ETHEREAL_COLOR_BLOCK]" = DNA_BLOCK_SIZE_COLOR, )) @@ -209,10 +209,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(features["mcolor"]) L[DNA_MUTANT_COLOR_BLOCK] = sanitize_hexcolor(features["mcolor"], include_crunch = FALSE) - // Add secondary species color + // MASSMETA ADDITION (secondary color for liz) if(features["mcolor_secondary"]) - L[DNA_MUTANT_COLOR_SECONDARY_BLOCK] = sanitize_hexcolor(features["mcolor_secondary"], include_crunch = FALSE) // MASSMETA EDIT - // Edit End + L[DNA_MUTANT_COLOR_SECONDARY_BLOCK] = sanitize_hexcolor(features["mcolor_secondary"], include_crunch = FALSE) + // EDIT END if(features["ethcolor"]) L[DNA_ETHEREAL_COLOR_BLOCK] = sanitize_hexcolor(features["ethcolor"], include_crunch = FALSE) @@ -361,10 +361,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(DNA_MUTANT_COLOR_BLOCK) set_uni_feature_block(blocknumber, sanitize_hexcolor(features["mcolor"], include_crunch = FALSE)) - // Add secondary color for species + // MASSMETA ADDITOION (secondary color for liz) if(DNA_MUTANT_COLOR_SECONDARY_BLOCK) - set_uni_feature_block(blocknumber, sanitize_hexcolor(features["mcolor_secondary"], include_crunch = FALSE)) // MASSMETA EDIT - // Edit End + set_uni_feature_block(blocknumber, sanitize_hexcolor(features["mcolor_secondary"], include_crunch = FALSE)) + // EDIT END if(DNA_ETHEREAL_COLOR_BLOCK) set_uni_feature_block(blocknumber, sanitize_hexcolor(features["ethcolor"], include_crunch = FALSE)) @@ -484,7 +484,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) features |= GLOB.species_prototypes[species_type].randomize_features() features["mcolor"] = "#[random_color()]" - features["mcolor_secondary"] = "#[random_color()]" // MASSMETA EDIT + features["mcolor_secondary"] = "#[random_color()]" // MASSMETA ADDITION update_dna_identity() @@ -664,10 +664,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(dna.features["mcolor"]) dna.features["mcolor"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_MUTANT_COLOR_BLOCK)) - // Add secondary color for species + // MASSMETA ADDITION (secondary color for liz) if(dna.features["mcolor_secondary"]) - dna.features["mcolor_secondary"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_MUTANT_COLOR_SECONDARY_BLOCK)) // MASSMETA EDIT - // Edit End + dna.features["mcolor_secondary"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_MUTANT_COLOR_SECONDARY_BLOCK)) + // EDIT END if(dna.features["ethcolor"]) dna.features["ethcolor"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_ETHEREAL_COLOR_BLOCK)) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 13382dd7553f2..b6ea653ebd6c3 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -703,11 +703,12 @@ GLOBAL_LIST_EMPTY(features_by_species) switch(accessory.color_src) if(MUTANT_COLOR) accessory_overlay.color = fixed_mut_color || source.dna.features["mcolor"] - // Edit START (secondary color) - if(MUTANT_COLOR_SECONDARY) // MASSMETA EDIT - if(fixed_mut_color) - accessory_overlay.color = fixed_mut_color || source.dna.features["mcolor_secondary"] - // Edit END + + // MASSMETA ADIDITION (secondary color for liz) + if(MUTANT_COLOR_SECONDARY) + accessory_overlay.color = fixed_mut_color || source.dna.features["mcolor_secondary"] + // EDIT END + if(HAIR_COLOR) accessory_overlay.color = get_fixed_hair_color(source) || source.hair_color if(FACIAL_HAIR_COLOR) @@ -718,12 +719,10 @@ GLOBAL_LIST_EMPTY(features_by_species) accessory_overlay.color = forced_colour standing += accessory_overlay - // Edit START (secondary color) - - if(length(accessory.external_slots)) // MASSMETA EDIT + // MASSMETA ADDITION (secondary color for liz) + if(length(accessory.external_slots)) standing += return_accessory_layer(layer, accessory, source, accessory_overlay.color) - - // Edit END + // EDIT END if(accessory.hasinner) var/mutable_appearance/inner_accessory_overlay = mutable_appearance(accessory.icon, layer = -layer) diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 5ef39c01b34d4..a52b6dd0dade2 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -102,7 +102,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /proc/create_consistent_human_dna(mob/living/carbon/human/target) target.dna.features["mcolor"] = COLOR_VIBRANT_LIME - target.dna.features["mcolor_secondary"] = COLOR_VIBRANT_LIME // secondary color MASSMETA EDIT + target.dna.features["mcolor_secondary"] = COLOR_VIBRANT_LIME //MASSMETA ADDITION (secondary color for liz) no clue what it does acctually target.dna.features["ethcolor"] = COLOR_WHITE target.dna.features["body_markings"] = get_consistent_feature_entry(SSaccessories.body_markings_list) target.dna.features["ears"] = get_consistent_feature_entry(SSaccessories.ears_list) 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 1285a03816081..c2e408d0e08ca 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -5,7 +5,7 @@ id = SPECIES_LIZARD inherent_traits = list( TRAIT_MUTANT_COLORS, - TRAIT_MUTANT_COLORS_SECONDARY, // Add secondary color MASSMETA EDIT + TRAIT_MUTANT_COLORS_SECONDARY, // MASSMETA ADDITION (secondary color for liz) TRAIT_TACKLING_TAILED_DEFENDER, ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE @@ -158,7 +158,7 @@ Lizard subspecies: ASHWALKERS mutantbrain = /obj/item/organ/internal/brain/primitive inherent_traits = list( TRAIT_MUTANT_COLORS, - TRAIT_MUTANT_COLORS_SECONDARY, // Add secondary color MASSMETA EDIT + TRAIT_MUTANT_COLORS_SECONDARY, // MASSMETA ADDITION (secondary color for liz) TRAIT_VIRUSIMMUNE, TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION, ) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 44221fa328550..8e617485a2c97 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -1060,13 +1060,11 @@ if(overlay.layers & external_layer) . += overlay.get_overlay(external_layer, src) - // Edit START (secondary color) - - if(overlay.get_extended_overlay(external_layer, src)) // MASSMETA EDIT + // MASSMETA ADDITION (secondary color for liz) + if(overlay.get_extended_overlay(external_layer, src)) for(var/mutable_appearance/item as anything in overlay.get_extended_overlay(external_layer, src)) . += item - - // Edit END + // EDIT END return . diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 06b50127e50f4..29d2854278be9 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -79,25 +79,6 @@ organ_owner.add_mood_event("tail_lost", /datum/mood_event/tail_lost) organ_owner.add_mood_event("tail_balance_lost", /datum/mood_event/tail_balance_lost) -/obj/item/organ/external/tail/proc/wag(mob/living/carbon/organ_owner, start = TRUE, stop_after = 0) - if(!(wag_flags & WAG_ABLE)) - return - - if(start) - if(start_wag(organ_owner) && stop_after) - addtimer(CALLBACK(src, PROC_REF(wag), organ_owner, FALSE), stop_after, TIMER_STOPPABLE|TIMER_DELETE_ME) - else - stop_wag(organ_owner) - - // Edit START - - owner.update_body_parts() // MASSMETA EDIT - if(ishuman(owner)) - var/mob/living/carbon/human/human = owner - human.update_mutant_bodyparts() - - // Edit END - ///We need some special behaviour for accessories, wrapped here so we can easily add more interactions later ///Accepts an optional timeout after which we remove the tail wagging ///Returns false if the wag worked, true otherwise @@ -116,6 +97,13 @@ if(tail_spines_overlay) //if there are spines, they should wag with the tail tail_spines_overlay.wagging = TRUE organ_owner.update_body_parts() + + // MASSMETA ADDITION (second color for liz) + if(ishuman(owner) && HAS_TRAIT(organ_owner, TRAIT_MUTANT_COLORS_SECONDARY)) + var/mob/living/carbon/human/human = owner + human.update_mutant_bodyparts() + // EDIT END + RegisterSignal(organ_owner, COMSIG_LIVING_DEATH, PROC_REF(owner_died)) return TRUE @@ -142,6 +130,13 @@ return succeeded organ_owner.update_body_parts() + + // MASSMETA ADDITION (second color for liz) + if(ishuman(owner) && HAS_TRAIT(organ_owner, TRAIT_MUTANT_COLORS_SECONDARY)) + var/mob/living/carbon/human/human = owner + human.update_mutant_bodyparts() + // EDIT END + UnregisterSignal(organ_owner, COMSIG_LIVING_DEATH) return succeeded diff --git a/massmeta/code/datums/bodypart_overlays/bodypart_overlay.dm b/massmeta/code/datums/bodypart_overlays/bodypart_overlay.dm new file mode 100644 index 0000000000000..17c821320a29b --- /dev/null +++ b/massmeta/code/datums/bodypart_overlays/bodypart_overlay.dm @@ -0,0 +1,3 @@ +// MASSMETA ADDITION (secondary color for liz) +/datum/bodypart_overlay/proc/get_extended_overlay(layer, obj/item/bodypart/limb) + return \ No newline at end of file diff --git a/massmeta/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/massmeta/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm new file mode 100644 index 0000000000000..7d27b27832c1a --- /dev/null +++ b/massmeta/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -0,0 +1,11 @@ +// MASSMETA ADDITION (secondary color for liz) + +/datum/bodypart_overlay/mutant/get_extended_overlay(layer, obj/item/bodypart/limb) + layer = bitflag_to_layer(layer) + var/passed_color = sprite_datum.color_src ? draw_color : null + var/mob/living/carbon/human/owner = limb.owner + if(!owner) + return + var/datum/species/owner_species = owner.dna.species + + return owner_species.return_accessory_layer(-layer, sprite_datum, owner, passed_color) \ No newline at end of file diff --git a/massmeta/code/modules/client/preferences/species_features/mutants_color_secondary.dm b/massmeta/code/modules/client/preferences/species_features/mutants_color_secondary.dm index bb7146407f827..1c2646a3d7bbe 100644 --- a/massmeta/code/modules/client/preferences/species_features/mutants_color_secondary.dm +++ b/massmeta/code/modules/client/preferences/species_features/mutants_color_secondary.dm @@ -5,12 +5,11 @@ relevant_inherent_trait = TRAIT_MUTANT_COLORS_SECONDARY /datum/preference/color/mutant_color_secondary/is_accessible(datum/preferences/preferences) - if (!..(preferences)) + // color box in prefs TGUI will be appear only if user choose Colored Belly + if (!..(preferences) || preferences.read_preference(/datum/preference/choiced/lizard_body_markings) != "Color Belly") return FALSE - var/species_type = preferences.read_preference(/datum/preference/choiced/species) - var/datum/species/species = new species_type - return !(TRAIT_FIXED_MUTANT_COLORS_SECONDARY in species.inherent_traits) + return TRUE /datum/preference/color/mutant_color_secondary/create_default_value() return sanitize_hexcolor("[pick("7F", "FF")][pick("7F", "FF")][pick("7F", "FF")]") diff --git a/massmeta/code/modules/mob/dead/new_player/sprite_accessories/multi_part.dm b/massmeta/code/modules/mob/dead/new_player/sprite_accessories/multi_part.dm index ee216c09c768f..1eb52a3b36a8c 100644 --- a/massmeta/code/modules/mob/dead/new_player/sprite_accessories/multi_part.dm +++ b/massmeta/code/modules/mob/dead/new_player/sprite_accessories/multi_part.dm @@ -7,7 +7,7 @@ /datum/sprite_accessory/body_markings/cbelly icon = 'massmeta/icons/mob/species/lizard/multipart.dmi' name = "Color Belly" - external_slots = list(ORGAN_SLOT_EXTERNAL_TAIL, ORGAN_SLOT_EXTERNAL_SNOUT) + external_slots = list(ORGAN_SLOT_EXTERNAL_TAIL) icon_state = "cbelly" gender_specific = 1 color_src = MUTANT_COLOR_SECONDARY \ No newline at end of file diff --git a/massmeta/icons/mob/species/lizard/multipart.dmi b/massmeta/icons/mob/species/lizard/multipart.dmi index b13e9beae1120..c40cee58a1382 100644 Binary files a/massmeta/icons/mob/species/lizard/multipart.dmi and b/massmeta/icons/mob/species/lizard/multipart.dmi differ diff --git a/massmeta/includes.dm b/massmeta/includes.dm index 5b0bd9e0e8174..48b131b3494a9 100644 --- a/massmeta/includes.dm +++ b/massmeta/includes.dm @@ -76,10 +76,14 @@ #include "code\game\objects\structures\crates_lockers\crates\large.dm" #include "code\modules\cargo\packs\imports.dm" -//species secondary color +//species secondary color (for liz) #include "code\modules\client\preferences\species_features\mutants_color_secondary.dm" #include "code\modules\mob\dead\new_player\sprite_accessories\multi_part.dm" #include "code\modules\mob\living\carbon\human\accessory_helpers.dm" +#include "code\datums\bodypart_overlays\bodypart_overlay.dm" +#include "code\datums\bodypart_overlays\mutant_bodypart_overlay.dm" +//#include "code\datums\sprite_accessories.dm" + //features #include "features\additional_circuit\includes.dm" #include "features\hardsuits\code\_jetpack.dm" @@ -87,9 +91,11 @@ #include "features\hardsuits\code\hardsuit.dm" #include "features\hardsuits\code\helmet.dm" #include "features\hardsuits\code\space_suit_beacon.dm" + //buts #include "code\modules\surgery\organs\internal\butts\butts.dm" #include "code\modules\surgery\organs\internal\butts\butts_init.dm" + //gay removal (6.21 КоАП РФ) #include "code\modules\clothing\under\accessories\badges.dm" #include "code\modules\clothing\shoes\sneakers.dm" diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx index 8a4fac7abc027..0ae928f2ed5c4 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx @@ -104,20 +104,19 @@ export const feature_lizard_tail: FeatureChoiced = { }, }; -// MASSMETA EDIT -// Add Secondary species color -export const feature_mcolor_secondary: Feature = { - name: 'Mutant Secondary color', - description: - 'Apply only on Colored Belly', +export const feature_mcolor: Feature = { + name: 'Mutant color', component: FeatureColorInput, }; -// End Edit -export const feature_mcolor: Feature = { - name: 'Mutant color', +// MASSMETA ADDITION +export const feature_mcolor_secondary: Feature = { + name: 'Second color', + description: + 'Apply only on Colored Belly', component: FeatureColorInput, }; +// EDIT END export const underwear_color: Feature = { name: 'Underwear color',