diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index c094ec32e37..67018e5e3e7 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -238,9 +238,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_BLOOD_CLANS "blood_clans" /// Species with this trait have markings (this SUCKS, remove this later in favor of bodypart overlays) #define TRAIT_HAS_MARKINGS "has_markings" -/// Species with this trait have mutant colors +/// Species with this trait use skin tones for coloration +#define TRAIT_USES_SKINTONES "uses_skintones" +/// Species with this trait use mutant colors for coloration #define TRAIT_MUTANT_COLORS "mutcolors" -/// Species with this trait have mutant colors that cannot be chosen by the player +/// 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" /// Humans with this trait won't get bloody hands, nor bloody feet #define TRAIT_NO_BLOOD_OVERLAY "no_blood_overlay" diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index da399f2a250..27a848ea028 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -172,6 +172,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_AGENDER" = TRAIT_AGENDER, "TRAIT_BLOOD_CLANS" = TRAIT_BLOOD_CLANS, "TRAIT_HAS_MARKINGS" = TRAIT_HAS_MARKINGS, + "TRAIT_USES_SKINTONES" = TRAIT_USES_SKINTONES, "TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS, "TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS, "TRAIT_NO_BLOOD_OVERLAY" = TRAIT_NO_BLOOD_OVERLAY, diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 0d6ba92b578..53ed501787c 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -209,14 +209,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) var/datum/species/newrace = selectable_races[racechoice] amazed_human.set_species(newrace, icon_update = FALSE) - - if(amazed_human.dna.species.use_skintones) + if(HAS_TRAIT(amazed_human, TRAIT_USES_SKINTONES)) var/new_s_tone = tgui_input_list(user, "Choose your skin tone", "Race change", GLOB.skin_tones) if(new_s_tone) amazed_human.skin_tone = new_s_tone amazed_human.dna.update_ui_block(DNA_SKIN_TONE_BLOCK) - - if(HAS_TRAIT(amazed_human, TRAIT_MUTANT_COLORS) && !HAS_TRAIT(amazed_human, TRAIT_FIXED_MUTANT_COLORS)) + else if(HAS_TRAIT(amazed_human, TRAIT_MUTANT_COLORS) && !HAS_TRAIT(amazed_human, TRAIT_FIXED_MUTANT_COLORS)) var/new_mutantcolor = input(user, "Choose your skin color:", "Race change", amazed_human.dna.features["mcolor"]) as color|null if(!user.can_perform_action(src, FORBID_TELEKINESIS_REACH)) return TRUE diff --git a/code/modules/client/preferences/skin_tone.dm b/code/modules/client/preferences/skin_tone.dm index 119fd6a86a3..d2359f8ce69 100644 --- a/code/modules/client/preferences/skin_tone.dm +++ b/code/modules/client/preferences/skin_tone.dm @@ -1,7 +1,8 @@ /datum/preference/choiced/skin_tone - category = PREFERENCE_CATEGORY_SECONDARY_FEATURES - savefile_identifier = PREFERENCE_CHARACTER savefile_key = "skin_tone" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_SECONDARY_FEATURES + relevant_inherent_trait = TRAIT_USES_SKINTONES /datum/preference/choiced/skin_tone/init_possible_values() return GLOB.skin_tones @@ -27,10 +28,3 @@ /datum/preference/choiced/skin_tone/apply_to_human(mob/living/carbon/human/target, value) target.skin_tone = value - -/datum/preference/choiced/skin_tone/is_accessible(datum/preferences/preferences) - if (!..(preferences)) - return FALSE - - var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) - return initial(species_type.use_skintones) diff --git a/code/modules/client/preferences/species.dm b/code/modules/client/preferences/species.dm index f35f242320b..a91a93fc84b 100644 --- a/code/modules/client/preferences/species.dm +++ b/code/modules/client/preferences/species.dm @@ -56,7 +56,7 @@ data[species_id]["desc"] = species.get_species_description() data[species_id]["lore"] = species.get_species_lore() data[species_id]["icon"] = sanitize_css_class_name(species.name) - data[species_id]["use_skintones"] = species.use_skintones + data[species_id]["use_skintones"] = (TRAIT_USES_SKINTONES in species.inherent_traits) data[species_id]["sexes"] = species.sexes data[species_id]["enabled_features"] = species.get_features() data[species_id]["perks"] = species.get_species_perks() diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 77f7b1b6c39..fb456b0a8a4 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -21,8 +21,10 @@ GLOBAL_LIST_EMPTY(features_by_species) var/examine_limb_id ///This is the fluff name. They are displayed on health analyzers and in the character setup menu. Leave them generic for other servers to customize. var/name - /// The formatting of the name of the species in plural context. Defaults to "[name]\s" if unset. - /// Ex "[Plasmamen] are weak", "[Mothmen] are strong", "[Lizardpeople] don't like", "[Golems] hate" + /** + * The formatting of the name of the species in plural context. Defaults to "[name]\s" if unset. + * Ex "[Plasmamen] are weak", "[Mothmen] are strong", "[Lizardpeople] don't like", "[Golems] hate" + */ var/plural_form ///Whether or not the race has sexual characteristics (biological genders). At the moment this is only FALSE for skeletons and shadows @@ -39,8 +41,6 @@ GLOBAL_LIST_EMPTY(features_by_species) ///Never, Optional, or Forced digi legs? var/digitigrade_customization = DIGITIGRADE_NEVER - ///Does the species use skintones or not? As of now only used by humans. - var/use_skintones = FALSE ///If your race bleeds something other than bog standard blood, change this to reagent id. For example, ethereals bleed liquid electricity. var/datum/reagent/exotic_blood ///If your race uses a non standard bloodtype (A+, O-, AB-, etc). For example, lizards have L type blood. diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 7b1b7eb7b6a..9e2d801d68a 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -278,7 +278,7 @@ msg += "[t_He] look[p_s()] extremely disgusted.\n" var/apparent_blood_volume = blood_volume - if(dna.species.use_skintones && skin_tone == "albino") + if(HAS_TRAIT(src, TRAIT_USES_SKINTONES) && (skin_tone == "albino")) apparent_blood_volume -= 150 // enough to knock you down one tier switch(apparent_blood_volume) if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 60c29d6b45a..8b429bbeb8f 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -5,10 +5,10 @@ inherent_traits = list( TRAIT_NOBREATH, TRAIT_NOHUNGER, + TRAIT_USES_SKINTONES, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("wings" = "None") - use_skintones = TRUE mutantbrain = /obj/item/organ/internal/brain/dullahan mutanteyes = /obj/item/organ/internal/eyes/dullahan mutanttongue = /obj/item/organ/internal/tongue/dullahan diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 75de0bd2fca..611beb79ba6 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -11,8 +11,11 @@ /obj/item/organ/external/tail/cat = "Cat", ) */ // SKYRAT EDIT REMOVAL END - - inherent_traits = list(TRAIT_CAN_USE_FLIGHT_POTION, TRAIT_HATED_BY_DOGS) + inherent_traits = list( + TRAIT_CAN_USE_FLIGHT_POTION, + TRAIT_HATED_BY_DOGS, + TRAIT_USES_SKINTONES, + ) changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/felinid payday_modifier = 0.75 diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index cd3d4e28cdb..3e8a8d6bbf7 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -3,9 +3,9 @@ id = SPECIES_HUMAN inherent_traits = list( TRAIT_CAN_USE_FLIGHT_POTION, + TRAIT_USES_SKINTONES, ) mutant_bodyparts = list("wings" = "None") - use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT payday_modifier = 1 diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 522a176905f..308645c9ea1 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -23,7 +23,6 @@ mutanttongue = /obj/item/organ/internal/tongue/mush mutanteyes = /obj/item/organ/internal/eyes/night_vision/mushroom mutantlungs = null - use_skintones = FALSE species_language_holder = /datum/language_holder/mushroom bodypart_overrides = list( diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index c34543abb37..d7b8fdf34db 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -3,7 +3,7 @@ name = "Shadow" plural_form = "Shadowpeople" id = SPECIES_SHADOW - sexes = 0 + sexes = FALSE meat = /obj/item/food/meat/slab/human/mutant/shadow inherent_traits = list( TRAIT_NOBREATH, diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 24ad8e7d291..4fff061ebf1 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -10,16 +10,16 @@ examine_limb_id = SPECIES_HUMAN inherent_traits = list( TRAIT_BLOOD_CLANS, + TRAIT_DRINKS_BLOOD, TRAIT_NOBREATH, TRAIT_NOHUNGER, - TRAIT_DRINKS_BLOOD, + TRAIT_USES_SKINTONES, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("wings" = "None") changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN exotic_bloodtype = "U" blood_deficiency_drain_rate = BLOOD_DEFICIENCY_MODIFIER // vampires already passively lose blood, so this just makes them lose it slightly more quickly when they have blood deficiency. - use_skintones = TRUE mutantheart = /obj/item/organ/internal/heart/vampire mutanttongue = /obj/item/organ/internal/tongue/vampire mutantstomach = null diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 7f1a8758e5f..d8b2125aa64 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -195,8 +195,6 @@ name = "\improper Human" id = SPECIES_ZOMBIE_KROKODIL examine_limb_id = SPECIES_HUMAN - sexes = 0 - mutanttongue = /obj/item/organ/internal/tongue/zombie changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN bodypart_overrides = list( @@ -208,5 +206,4 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/zombie ) - #undef REGENERATION_DELAY diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c0e4b7aa1e6..bfd42891eb6 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -501,7 +501,7 @@ if(ishuman(exposed_mob)) if(methods & (PATCH|VAPOR)) var/mob/living/carbon/human/exposed_human = exposed_mob - if(exposed_human.dna.species.use_skintones) + if(HAS_TRAIT(exposed_human, TRAIT_USES_SKINTONES)) switch(exposed_human.skin_tone) if("african1") exposed_human.skin_tone = "african2" @@ -525,9 +525,8 @@ exposed_human.skin_tone = "caucasian2" if("albino") exposed_human.skin_tone = "caucasian1" - //take current alien color and darken it slightly - if(HAS_TRAIT(exposed_human, TRAIT_MUTANT_COLORS) && !HAS_TRAIT(exposed_human, TRAIT_FIXED_MUTANT_COLORS)) + else if(HAS_TRAIT(exposed_human, TRAIT_MUTANT_COLORS) && !HAS_TRAIT(exposed_human, TRAIT_FIXED_MUTANT_COLORS)) var/newcolor = "" var/string = exposed_human.dna.features["mcolor"] var/len = length(string) @@ -573,7 +572,7 @@ if(!HAS_TRAIT(affected_human, TRAIT_BALD)) affected_human.set_hairstyle("Spiky", update = FALSE) affected_human.set_haircolor("#000000", update = FALSE) - if(affected_human.dna.species.use_skintones) + if(HAS_TRAIT(affected_human, TRAIT_USES_SKINTONES)) affected_human.skin_tone = "orange" else if(HAS_TRAIT(affected_human, TRAIT_MUTANT_COLORS) && !HAS_TRAIT(affected_human, TRAIT_FIXED_MUTANT_COLORS)) //Aliens with custom colors simply get turned orange affected_human.dna.features["mcolor"] = "#ff8800" diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 93aa4e1fe8e..ff91be422d9 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -845,7 +845,7 @@ if(variable_color) draw_color = variable_color else if(should_draw_greyscale) - draw_color = (species_color) || (skin_tone && skintone2hex(skin_tone)) + draw_color = species_color || (skin_tone ? skintone2hex(skin_tone) : null) else draw_color = null @@ -855,27 +855,27 @@ // There should technically to be an ishuman(owner) check here, but it is absent because no basetype carbons use bodyparts // No, xenos don't actually use bodyparts. Don't ask. var/mob/living/carbon/human/human_owner = owner - var/datum/species/owner_species = human_owner.dna.species + limb_gender = (human_owner.physique == MALE) ? "m" : "f" - - if(owner_species.use_skintones) + if(HAS_TRAIT(human_owner, TRAIT_USES_SKINTONES)) skin_tone = human_owner.skin_tone - else + else if(HAS_TRAIT(human_owner, TRAIT_MUTANT_COLORS)) skin_tone = "" - - if(HAS_TRAIT(owner, TRAIT_MUTANT_COLORS)) + var/datum/species/owner_species = human_owner.dna.species if(owner_species.fixed_mut_color) species_color = owner_species.fixed_mut_color else species_color = human_owner.dna.features["mcolor"] else - species_color = null + skin_tone = "" + species_color = "" draw_color = variable_color if(should_draw_greyscale) //Should the limb be colored? - draw_color ||= (species_color) || (skin_tone && skintone2hex(skin_tone)) + draw_color ||= species_color || (skin_tone ? skintone2hex(skin_tone) : null) // SKYRAT EDIT ADDITION + var/datum/species/owner_species = human_owner.dna.species markings = LAZYCOPY(owner_species.body_markings[body_zone]) if(aux_zone) aux_zone_markings = LAZYCOPY(owner_species.body_markings[aux_zone]) diff --git a/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm b/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm index 481d1b8f3f4..b58569f4683 100644 --- a/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm +++ b/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm @@ -62,7 +62,7 @@ return human_user.set_species(newrace, icon_update = 0) - if(human_user.dna.species.use_skintones) + if(HAS_TRAIT(human_user, TRAIT_USES_SKINTONES)) var/new_s_tone = input(user, "Choose your skin tone:", "Race change") as null|anything in GLOB.skin_tones if(new_s_tone) diff --git a/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm b/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm index aa47245cd46..51dc3d30fee 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/genitals.dm @@ -100,7 +100,7 @@ /datum/preference/toggle/genital_skin_color/is_accessible(datum/preferences/preferences) var/passed_initial_check = ..(preferences) var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) - if(!initial(species_type.use_skintones)) + if(!(TRAIT_USES_SKINTONES in initial(species_type.inherent_traits))) return FALSE var/allowed = preferences.read_preference(/datum/preference/toggle/allow_mismatched_parts) var/erp_allowed = preferences.read_preference(/datum/preference/toggle/master_erp_preferences) && preferences.read_preference(/datum/preference/toggle/allow_genitals) @@ -110,7 +110,7 @@ /datum/preference/toggle/genital_skin_color/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) // If they're not using skintones, let's not apply this yeah? var/datum/species/species_type = preferences?.read_preference(/datum/preference/choiced/species) - if(!species_type || !initial(species_type.use_skintones)) + if(!species_type || !(TRAIT_USES_SKINTONES in initial(species_type.inherent_traits))) return FALSE return TRUE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_markings.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_markings.dm index 92c54f64ea9..8c6c976151e 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_markings.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_markings.dm @@ -33,7 +33,7 @@ if(DEFAULT_TERTIARY) colors = sanitize_hexcolor(features["mcolor3"]) if(DEFAULT_SKIN_OR_PRIMARY) - if(pref_species && pref_species.use_skintones) + if(pref_species && !(TRAIT_USES_SKINTONES in pref_species.inherent_traits)) colors = sanitize_hexcolor(features["skin_color"]) else colors = sanitize_hexcolor(features["mcolor"]) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index d0cc1c8f123..cd22694da79 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files) if(DEFAULT_MATRIXED) colors = list(features["mcolor"], features["mcolor2"], features["mcolor3"]) if(DEFAULT_SKIN_OR_PRIMARY) - if(pref_species && pref_species.use_skintones) + if(pref_species && !(TRAIT_USES_SKINTONES in pref_species.inherent_traits)) colors = list(features["skin_color"]) else colors = list(features["mcolor"]) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm index 1d1c76686b2..6930b5ef585 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm @@ -59,7 +59,7 @@ /datum/sprite_accessory/genital/get_special_render_colour(mob/living/carbon/human/human, render_state) var/obj/item/organ/external/genital/genital = human.get_organ_slot(associated_organ_slot) - if(genital?.uses_skin_color && human.dna.species.use_skintones) + if(genital?.uses_skin_color && HAS_TRAIT(human, TRAIT_USES_SKINTONES)) return skintone2hex(human.skin_tone) /datum/sprite_accessory/genital/penis diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm index 18121855cd9..83911c33400 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm @@ -8,9 +8,9 @@ TRAIT_CAN_STRIP, TRAIT_CAN_USE_FLIGHT_POTION, TRAIT_LITERATE, + TRAIT_USES_SKINTONES, ) mutanttongue = /obj/item/organ/internal/tongue/dwarven - use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT payday_modifier = 0.75 diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm index 6e15d1e9cf5..6495ddf3f2f 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm @@ -72,13 +72,13 @@ TRAIT_CAN_USE_FLIGHT_POTION, TRAIT_LITERATE, TRAIT_DRINKS_BLOOD, + TRAIT_USES_SKINTONES, ) inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC default_mutant_bodyparts = list( "legs" = "Normal Legs" ) exotic_bloodtype = "U" - use_skintones = TRUE mutantheart = /obj/item/organ/internal/heart/hemophage mutantliver = /obj/item/organ/internal/liver/hemophage mutantstomach = /obj/item/organ/internal/stomach/hemophage