diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index ea70fc0b3c9..9f0d708273d 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -62,10 +62,16 @@ #define DNA_MOTH_MARKINGS_BLOCK 13 #define DNA_MUSHROOM_CAPS_BLOCK 14 #define DNA_POD_HAIR_BLOCK 15 -#define DNA_MONKEY_TAIL_BLOCK 16 */ //SKYRAT EDIT REMOVAL END -#define DNA_FEATURE_BLOCKS SSaccessories.dna_total_feature_blocks // SKYRAT EDIT CHANGE - ORIGINAL: #define DNA_FEATURE_BLOCKS 16 +// Hey! Listen up if you're here because you're adding a species feature! +// +// You don't need to add a DNA block for EVERY species feature! +// You ONLY need DNA blocks if you intend to allow players to change it via GENETICS! +// (Which means having a DNA block for a feature tied to a mob without DNA is entirely pointless.) + +/// Total amount of DNA blocks, must be equal to the highest DNA block number +#define DNA_FEATURE_BLOCKS SSaccessories.dna_total_feature_blocks // SKYRAT EDIT CHANGE - ORIGINAL: #define DNA_FEATURE_BLOCKS 15 // SKYRAT EDIT ADDITION START #define DNA_MANDATORY_COLOR_BLOCKS 5 #define DNA_MUTANT_COLOR_BLOCK 1 diff --git a/code/controllers/subsystem/sprite_accessories.dm b/code/controllers/subsystem/sprite_accessories.dm index ac83cc01828..9bb0e286ca5 100644 --- a/code/controllers/subsystem/sprite_accessories.dm +++ b/code/controllers/subsystem/sprite_accessories.dm @@ -120,28 +120,28 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST] - /* //SKYRAT EDIT REMOVAL - CUSTOMIZATION - lizard_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/lizard_markings)[DEFAULT_SPRITE_LIST] + /* // SKYRAT EDIT REMOVAL START - Customization + lizard_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/lizard_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tails_list_human = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, add_blank = TRUE)[DEFAULT_SPRITE_LIST] - tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, add_blank = TRUE)[DEFAULT_SPRITE_LIST] - tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, add_blank = TRUE)[DEFAULT_SPRITE_LIST] + tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard)[DEFAULT_SPRITE_LIST] + tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey)[DEFAULT_SPRITE_LIST] snouts_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/snouts)[DEFAULT_SPRITE_LIST] - horns_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/horns)[DEFAULT_SPRITE_LIST] - ears_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/ears)[DEFAULT_SPRITE_LIST] - wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings)[DEFAULT_SPRITE_LIST] + horns_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/horns, add_blank = TRUE)[DEFAULT_SPRITE_LIST] + ears_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, add_blank = TRUE)[DEFAULT_SPRITE_LIST] + wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] wings_open_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings_open)[DEFAULT_SPRITE_LIST] - frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills)[DEFAULT_SPRITE_LIST] - spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines)[DEFAULT_SPRITE_LIST] - tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines)[DEFAULT_SPRITE_LIST] + frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, add_blank = TRUE)[DEFAULT_SPRITE_LIST] + spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] + tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] legs_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/legs)[DEFAULT_SPRITE_LIST] caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST] moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST] moth_antennae_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae)[DEFAULT_SPRITE_LIST] - moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings)[DEFAULT_SPRITE_LIST] */ // SKYRAT EDIT REMOVAL END + moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] pod_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair)[DEFAULT_SPRITE_LIST] // SKYRAT EDIT ADDITION START - Customization - tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, add_blank = TRUE)[DEFAULT_SPRITE_LIST] + tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey)[DEFAULT_SPRITE_LIST] caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, add_blank = TRUE)[DEFAULT_SPRITE_LIST] moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST] diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index f421122b433..158bba5eece 100644 --- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -28,13 +28,16 @@ sprite_datum = get_random_appearance() ///Grab a random appearance datum (thats not locked) -/datum/bodypart_overlay/mutant/proc/get_random_appearance() +/datum/bodypart_overlay/mutant/proc/get_random_appearance() as /datum/sprite_accessory + RETURN_TYPE(/datum/sprite_accessory) var/list/valid_restyles = list() var/list/feature_list = get_global_feature_list() for(var/accessory in feature_list) var/datum/sprite_accessory/accessory_datum = feature_list[accessory] if(initial(accessory_datum.locked)) //locked is for stuff that shouldn't appear here continue + if(!initial(accessory_datum.natural_spawn)) + continue valid_restyles += accessory_datum return pick(valid_restyles) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 9d1960a57c9..ecf1160e3a9 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -257,8 +257,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) L[DNA_TAIL_BLOCK] = construct_block(SSaccessories.tails_list_human.Find(features["tail_cat"]), length(SSaccessories.tails_list_human)) if(features["tail_lizard"]) L[DNA_LIZARD_TAIL_BLOCK] = construct_block(SSaccessories.tails_list_lizard.Find(features["tail_lizard"]), length(SSaccessories.tails_list_lizard)) - if(features["tail_monkey"]) - L[DNA_MONKEY_TAIL_BLOCK] = construct_block(SSaccessories.tails_list_monkey.Find(features["tail_monkey"]), length(SSaccessories.tails_list_monkey)) if(features["snout"]) L[DNA_SNOUT_BLOCK] = construct_block(SSaccessories.snouts_list.Find(features["snout"]), length(SSaccessories.snouts_list)) if(features["horns"]) @@ -409,8 +407,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) set_uni_feature_block(blocknumber, construct_block(SSaccessories.tails_list_human.Find(features["tail_cat"]), length(SSaccessories.tails_list_human))) if(DNA_LIZARD_TAIL_BLOCK) set_uni_feature_block(blocknumber, construct_block(SSaccessories.tails_list_lizard.Find(features["tail_lizard"]), length(SSaccessories.tails_list_lizard))) - if(DNA_MONKEY_TAIL_BLOCK) - set_uni_feature_block(blocknumber, construct_block(SSaccessories.tails_list_monkey.Find(features["tail_monkey"]), length(SSaccessories.tails_list_monkey))) if(DNA_SNOUT_BLOCK) set_uni_feature_block(blocknumber, construct_block(SSaccessories.snouts_list.Find(features["snout"]), length(SSaccessories.snouts_list))) if(DNA_HORNS_BLOCK) @@ -755,8 +751,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(dna.features["tail_lizard"]) dna.features["tail_cat"] = GLOB.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), GLOB.tails_list_lizard.len)] dna.features["tail_lizard"] = SSaccessories.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), length(SSaccessories.tails_list_lizard))] - if(dna.features["tail_monkey"]) - dna.features["tail_monkey"] = SSaccessories.tails_list_monkey[deconstruct_block(get_uni_feature_block(features, DNA_MONKEY_TAIL_BLOCK), length(SSaccessories.tails_list_monkey))] if(dna.features["ears"]) dna.features["ears"] = SSaccessories.ears_list[deconstruct_block(get_uni_feature_block(features, DNA_EARS_BLOCK), length(SSaccessories.ears_list))] if(dna.features["moth_wings"]) diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index dedb624078a..5f9869b7dda 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -51,7 +51,7 @@ var/natural_spawn = TRUE /datum/sprite_accessory/blank - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "None" ////////////////////// @@ -835,7 +835,7 @@ var/gradient_category = GRADIENT_APPLIES_TO_HAIR|GRADIENT_APPLIES_TO_FACIAL_HAIR /datum/sprite_accessory/gradient/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" /datum/sprite_accessory/gradient/full @@ -1729,10 +1729,6 @@ /datum/sprite_accessory/lizard_markings icon = 'icons/mob/human/species/lizard/lizard_markings.dmi' -/datum/sprite_accessory/lizard_markings/none - name = "None" - icon_state = "none" - /datum/sprite_accessory/lizard_markings/dtiger name = "Dark Tiger Body" icon_state = "dtiger" @@ -1757,6 +1753,11 @@ icon = 'icons/mob/human/species/lizard/lizard_tails.dmi' spine_key = SPINE_KEY_LIZARD +/datum/sprite_accessory/tails/lizard/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + natural_spawn = FALSE + /datum/sprite_accessory/tails/lizard/smooth name = "Smooth" icon_state = "smooth" @@ -1784,6 +1785,13 @@ icon_state = "default" color_src = HAIR_COLOR +/datum/sprite_accessory/tails/monkey + +/datum/sprite_accessory/tails/monkey/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + natural_spawn = FALSE + /datum/sprite_accessory/tails/monkey/default name = "Monkey" icon = 'icons/mob/human/species/monkey/monkey_tail.dmi' @@ -1858,10 +1866,6 @@ icon = 'icons/mob/human/species/lizard/lizard_misc.dmi' em_block = TRUE -/datum/sprite_accessory/horns/none - name = "None" - icon_state = "none" - /datum/sprite_accessory/horns/simple name = "Simple" icon_state = "simple" @@ -1886,10 +1890,6 @@ icon = 'icons/mob/human/cat_features.dmi' em_block = TRUE -/datum/sprite_accessory/ears/none - name = "None" - icon_state = "none" - /datum/sprite_accessory/ears/cat name = "Cat" icon_state = "cat" @@ -1924,10 +1924,6 @@ color_src = HAIR_COLOR locked = TRUE -/datum/sprite_accessory/wings/none - name = "None" - icon_state = "none" - /datum/sprite_accessory/wings icon = 'icons/mob/human/species/wings.dmi' em_block = TRUE @@ -2071,10 +2067,6 @@ /datum/sprite_accessory/frills icon = 'icons/mob/human/species/lizard/lizard_misc.dmi' -/datum/sprite_accessory/frills/none - name = "None" - icon_state = "none" - /datum/sprite_accessory/frills/simple name = "Simple" icon_state = "simple" @@ -2091,18 +2083,14 @@ icon = 'icons/mob/human/species/lizard/lizard_spines.dmi' em_block = TRUE +/datum/sprite_accessory/spines/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + /datum/sprite_accessory/tail_spines icon = 'icons/mob/human/species/lizard/lizard_spines.dmi' em_block = TRUE -/datum/sprite_accessory/spines/none - name = "None" - icon_state = "none" - -/datum/sprite_accessory/tail_spines/none - name = "None" - icon_state = "none" - /datum/sprite_accessory/spines/short name = "Short" icon_state = "short" @@ -2363,10 +2351,6 @@ icon = 'icons/mob/human/species/moth/moth_markings.dmi' color_src = null -/datum/sprite_accessory/moth_markings/none - name = "None" - icon_state = "none" - /datum/sprite_accessory/moth_markings/reddish name = "Reddish" icon_state = "reddish" diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index ce54e6cd60f..4e1f950a3f4 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -797,7 +797,7 @@ GLOBAL_LIST_EMPTY(features_by_species) sample_overlay = new overlay_path() organs_to_randomize[overlay_path] = sample_overlay - new_features["[sample_overlay.feature_key]"] = pick(sample_overlay.get_global_feature_list()) + new_features["[sample_overlay.feature_key]"] = sample_overlay.get_random_appearance().name return new_features diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 0a25b63e10a..8116b200887 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -185,7 +185,7 @@ bodypart_overlay = /datum/bodypart_overlay/mutant/tail/monkey - // dna_block = DNA_MONKEY_TAIL_BLOCK - // SKYRAT EDIT REMOVAL + dna_block = null ///Monkey tail bodypart overlay /datum/bodypart_overlay/mutant/tail/monkey diff --git a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm index 71d8702fe97..1806e0cc3a9 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm @@ -100,7 +100,7 @@ savefile_key = "feature_body_markings" relevant_mutant_bodypart = "body_markings" type_to_check = /datum/preference/toggle/mutant_toggle/body_markings - default_accessory_type = /datum/sprite_accessory/lizard_markings/none + default_accessory_type = /datum/sprite_accessory/lizard_markings /datum/preference/choiced/mutant_choice/body_markings/is_accessible(datum/preferences/preferences) . = ..() // Got to do this because of linters. @@ -213,7 +213,7 @@ savefile_key = "feature_horns" relevant_mutant_bodypart = "horns" type_to_check = /datum/preference/toggle/mutant_toggle/horns - default_accessory_type = /datum/sprite_accessory/horns/none + default_accessory_type = /datum/sprite_accessory/horns /datum/preference/tri_color/horns category = PREFERENCE_CATEGORY_SECONDARY_FEATURES @@ -239,7 +239,7 @@ savefile_key = "feature_ears" relevant_mutant_bodypart = "ears" type_to_check = /datum/preference/toggle/mutant_toggle/ears - default_accessory_type = /datum/sprite_accessory/ears/none + default_accessory_type = /datum/sprite_accessory/ears /datum/preference/tri_color/ears category = PREFERENCE_CATEGORY_SECONDARY_FEATURES @@ -291,7 +291,7 @@ savefile_key = "feature_frills" relevant_mutant_bodypart = "frills" type_to_check = /datum/preference/toggle/mutant_toggle/frills - default_accessory_type = /datum/sprite_accessory/frills/none + default_accessory_type = /datum/sprite_accessory/frills /datum/preference/tri_color/frills category = PREFERENCE_CATEGORY_SECONDARY_FEATURES @@ -317,7 +317,7 @@ savefile_key = "feature_spines" relevant_mutant_bodypart = "spines" type_to_check = /datum/preference/toggle/mutant_toggle/spines - default_accessory_type = /datum/sprite_accessory/spines/none + default_accessory_type = /datum/sprite_accessory/spines /datum/preference/tri_color/spines category = PREFERENCE_CATEGORY_SECONDARY_FEATURES @@ -399,7 +399,7 @@ savefile_key = "feature_moth_markings" relevant_mutant_bodypart = "moth_markings" type_to_check = /datum/preference/toggle/mutant_toggle/moth_markings - default_accessory_type = /datum/sprite_accessory/moth_markings/none + default_accessory_type = /datum/sprite_accessory/moth_markings /datum/preference/choiced/mutant_choice/moth_markings/is_accessible(datum/preferences/preferences) . = ..() // Got to do this because of linters. diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_marking_sets.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_marking_sets.dm index dab4129ed4f..6fa79e71942 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_marking_sets.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_marking_sets.dm @@ -7,7 +7,7 @@ var/recommended_species = list(SPECIES_MAMMAL, SPECIES_TAJARAN, SPECIES_VULP, SPECIES_AQUATIC, SPECIES_AKULA) /datum/body_marking_set/none - name = "None" + name = SPRITE_ACCESSORY_NONE recommended_species = null body_marking_list = list() 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 754d3adad0b..c9fe779c421 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 @@ -61,7 +61,7 @@ default_color = DEFAULT_MATRIXED else default_color = "#FFFFFF" - if(name == "None") + if(name == SPRITE_ACCESSORY_NONE) factual = FALSE if(color_src == USE_MATRIXED_COLORS && default_color != DEFAULT_MATRIXED) default_color = DEFAULT_MATRIXED @@ -120,6 +120,10 @@ /datum/sprite_accessory/moth_markings/is_hidden(mob/living/carbon/human/owner) return FALSE +/datum/sprite_accessory/moth_markings/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + /datum/sprite_accessory/pod_hair icon = 'modular_skyrat/master_files/icons/mob/species/podperson_hair.dmi' key = "pod_hair" @@ -127,7 +131,7 @@ organ_type = /obj/item/organ/external/pod_hair /datum/sprite_accessory/pod_hair/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" factual = FALSE @@ -147,7 +151,7 @@ return FALSE /datum/sprite_accessory/caps/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" color_src = null factual = FALSE @@ -161,6 +165,11 @@ generic = "Body Markings" default_color = DEFAULT_TERTIARY +/datum/sprite_accessory/lizard_markings/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + + /datum/sprite_accessory/legs key = "legs" generic = "Leg Type" diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm index bea20f055ca..01583cb2682 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -26,6 +26,10 @@ return FALSE +/datum/sprite_accessory/ears/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + /datum/sprite_accessory/ears/cat recommended_species = list(SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_HUMANOID, SPECIES_GHOUL) relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) @@ -42,7 +46,7 @@ uses_emissives = TRUE /datum/sprite_accessory/ears/mutant/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" color_src = null factual = FALSE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm index 991a09f9bc5..11353509aa8 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm @@ -9,7 +9,7 @@ organ_type = /obj/item/organ/external/fluff /datum/sprite_accessory/fluff/moth/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" /datum/sprite_accessory/fluff/moth/is_hidden(mob/living/carbon/human/human) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm index 29c5d7ba1a5..f94fd20a28c 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm @@ -12,6 +12,10 @@ return FALSE +/datum/sprite_accessory/frills/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + /datum/sprite_accessory/frills/divinity name = "Divinity" icon_state = "divinity" 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 090af1bbaaa..4e00fd4ee18 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 @@ -87,7 +87,7 @@ /datum/sprite_accessory/genital/penis/none icon_state = "none" - name = "None" + name = SPRITE_ACCESSORY_NONE factual = FALSE color_src = null @@ -161,7 +161,7 @@ /datum/sprite_accessory/genital/testicles/none icon_state = "none" - name = "None" + name = SPRITE_ACCESSORY_NONE factual = FALSE color_src = null @@ -188,8 +188,8 @@ var/alt_aroused = TRUE /datum/sprite_accessory/genital/vagina/none + name = SPRITE_ACCESSORY_NONE icon_state = "none" - name = "None" factual = FALSE color_src = null @@ -236,7 +236,7 @@ /datum/sprite_accessory/genital/womb/none icon_state = "none" - name = "None" + name = SPRITE_ACCESSORY_NONE factual = FALSE color_src = null @@ -253,7 +253,7 @@ /datum/sprite_accessory/genital/anus/none icon_state = "none" - name = "None" + name = SPRITE_ACCESSORY_NONE factual = FALSE color_src = null @@ -276,7 +276,7 @@ /datum/sprite_accessory/genital/breasts/none icon_state = "none" - name = "None" + name = SPRITE_ACCESSORY_NONE factual = FALSE color_src = null diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm index 42eaa1f1b55..6d79683627c 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm @@ -7,7 +7,7 @@ organ_type = /obj/item/organ/external/head_accessory /datum/sprite_accessory/head_accessory/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" color_src = null factual = FALSE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm index 2212b1bd203..30646cf26e4 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm @@ -26,6 +26,9 @@ return FALSE +/datum/sprite_accessory/horns/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" /datum/sprite_accessory/horns/angler default_color = DEFAULT_SECONDARY diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm index 8b71ed81001..4d0584d8636 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm @@ -11,7 +11,7 @@ organ_type = /obj/item/organ/external/synth_screen /datum/sprite_accessory/screen/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = null /datum/sprite_accessory/screen/blank @@ -168,7 +168,7 @@ return TRUE /datum/sprite_accessory/antenna/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "None" recommended_species = null diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm index 6ebbda008df..9d0102a7ece 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm @@ -24,5 +24,5 @@ return TRUE /datum/sprite_accessory/moth_antennae/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm index 503906c39cc..479c176c026 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm @@ -7,7 +7,7 @@ organ_type = /obj/item/organ/external/neck_accessory /datum/sprite_accessory/neck_accessory/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" color_src = null factual = FALSE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm index 73521086076..9ce1e68f1d3 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm @@ -14,7 +14,7 @@ return FALSE /datum/sprite_accessory/skrell_hair/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" /datum/sprite_accessory/skrell_hair/long diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm index db698f0d979..3b52b14f6f3 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm @@ -53,7 +53,7 @@ /datum/sprite_accessory/snouts/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" flags_for_organ = NONE factual = FALSE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm index 032b86bdd5b..fc36274bfec 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -28,7 +28,7 @@ return TRUE /datum/sprite_accessory/tails/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" recommended_species = list(SPECIES_SYNTH, SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_HUMANOID, SPECIES_GHOUL) color_src = null diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm index 069eaf6f698..37ce34a7a5f 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm @@ -61,7 +61,7 @@ return FALSE /datum/sprite_accessory/taur/none - name = "None" + name = SPRITE_ACCESSORY_NONE dimension_x = 32 center = FALSE factual = FALSE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm index 03a68cb6925..53deb332370 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm @@ -57,7 +57,7 @@ return TRUE /datum/sprite_accessory/wings/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" factual = FALSE @@ -301,7 +301,7 @@ relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/wings/moth/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" /datum/sprite_accessory/wings/moth/atlas diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm index 1309d2fb5d7..ee26228f7b6 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm @@ -8,7 +8,7 @@ organ_type = /obj/item/organ/external/xenodorsal /datum/sprite_accessory/xenodorsal/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" /datum/sprite_accessory/xenodorsal/standard @@ -51,7 +51,7 @@ organ_type = /obj/item/organ/external/xenohead /datum/sprite_accessory/xenohead/none - name = "None" + name = SPRITE_ACCESSORY_NONE icon_state = "none" /datum/sprite_accessory/xenohead/standard diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm index d450093819b..a0899ed37e4 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm @@ -82,7 +82,7 @@ return features /datum/species/mammal/get_random_body_markings(list/passed_features) - var/name = "None" + var/name = SPRITE_ACCESSORY_NONE var/list/candidates = GLOB.body_marking_sets.Copy() for(var/candi in candidates) var/datum/body_marking_set/setter = GLOB.body_marking_sets[candi] diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/moth.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/moth.dm index 9fa8d667c74..be428a6a6f3 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/moth.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/moth.dm @@ -19,7 +19,7 @@ return features /datum/species/moth/get_random_body_markings(list/passed_features) - var/name = "None" + var/name = SPRITE_ACCESSORY_NONE var/list/candidates = GLOB.body_marking_sets.Copy() for(var/candi in candidates) var/datum/body_marking_set/setter = GLOB.body_marking_sets[candi] diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm index 95a7bd1d0c4..4ce1e2ff72f 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm @@ -50,6 +50,7 @@ mutantpart_info = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list("#FFAA00")) /obj/item/organ/external/tail/monkey + wag_flags = WAG_ABLE // waggable monkey tails mutantpart_info = list(MUTANT_INDEX_NAME = "Monkey", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) /obj/item/organ/external/tail/lizard