From 82c0b71580ad5f46b968378f2d9f5448dab2cc71 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Fri, 24 Nov 2023 12:58:27 +0300 Subject: [PATCH] Changes default_mutant_bodyparts list to be index based (#779) * Changes default_mutant_bodyparts list be index based * Update genitals.dm * Update synthetic.dm * Update podweak.dm * Sorry teshari * Makes the indexes named * Change name Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/~skyrat_defines/DNA.dm | 4 ++++ .../code/modules/client/preferences.dm | 6 +++--- .../modules/better_vox/code/vox_species.dm | 2 +- .../customization/__HELPERS/global_lists.dm | 2 +- .../mob/living/carbon/human/species.dm | 14 ++++++------- .../mob/living/carbon/human/species/akula.dm | 4 ++-- .../living/carbon/human/species/aquatic.dm | 12 +++++------ .../mob/living/carbon/human/species/ghoul.dm | 6 +++--- .../species/hemophage/hemophage_species.dm | 2 +- .../living/carbon/human/species/humanoid.dm | 14 ++++++------- .../mob/living/carbon/human/species/insect.dm | 18 ++++++++--------- .../mob/living/carbon/human/species/lizard.dm | 18 ++++++++--------- .../mob/living/carbon/human/species/mammal.dm | 20 +++++++++---------- .../mob/living/carbon/human/species/monkey.dm | 2 +- .../mob/living/carbon/human/species/moth.dm | 6 +++--- .../living/carbon/human/species/podweak.dm | 4 ++-- .../carbon/human/species/roundstartslime.dm | 18 ++++++++--------- .../mob/living/carbon/human/species/skrell.dm | 2 +- .../living/carbon/human/species/tajaran.dm | 8 ++++---- .../mob/living/carbon/human/species/unathi.dm | 14 ++++++------- .../mob/living/carbon/human/species/vox.dm | 8 ++++---- .../living/carbon/human/species/vulpkanin.dm | 8 ++++---- .../mob/living/carbon/human/species/xeno.dm | 10 +++++----- .../modules/synths/code/species/synthetic.dm | 16 +++++++-------- .../modules/teshari/code/_teshari.dm | 6 +++--- 25 files changed, 114 insertions(+), 110 deletions(-) diff --git a/code/__DEFINES/~skyrat_defines/DNA.dm b/code/__DEFINES/~skyrat_defines/DNA.dm index 6ac4d165ee6..d36755a0f34 100644 --- a/code/__DEFINES/~skyrat_defines/DNA.dm +++ b/code/__DEFINES/~skyrat_defines/DNA.dm @@ -38,6 +38,10 @@ #define MUTANT_INDEX_COLOR_LIST "color" #define MUTANT_INDEX_EMISSIVE_LIST "emissive" +// Defines for default mutant bodyparts indexes +#define MUTANTPART_NAME 1 +#define MUTANTPART_CAN_RANDOMIZE 2 + // Defines for markings indexes #define MARKING_INDEX_COLOR 1 #define MARKING_INDEX_EMISSIVE 2 diff --git a/modular_skyrat/master_files/code/modules/client/preferences.dm b/modular_skyrat/master_files/code/modules/client/preferences.dm index 2532bc4c308..52a70bd907c 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences.dm @@ -123,17 +123,17 @@ mutant_bodyparts -= key continue if(!GLOB.sprite_accessories[key][mutant_bodyparts[key][MUTANT_INDEX_NAME]]) // The individual accessory no longer exists - mutant_bodyparts[key][MUTANT_INDEX_NAME] = GLOB.default_mutant_bodyparts[pref_species.name[key][MUTANT_INDEX_NAME]] + mutant_bodyparts[key][MUTANT_INDEX_NAME] = GLOB.default_mutant_bodyparts[pref_species.name[key][MUTANTPART_NAME]] validate_color_keys_for_part(key) // Validate the color count of each accessory that wasnt removed // Add any missing accessories for(var/key in target_bodyparts) if(!mutant_bodyparts[key]) var/datum/sprite_accessory/SA - if(target_bodyparts[key][MUTANT_INDEX_CAN_RANDOMIZE]) + if(target_bodyparts[key][MUTANTPART_CAN_RANDOMIZE]) SA = random_accessory_of_key_for_species(key, pref_species) else - SA = GLOB.sprite_accessories[key][target_bodyparts[key][MUTANT_INDEX_NAME]] + SA = GLOB.sprite_accessories[key][target_bodyparts[key][MUTANTPART_NAME]] var/final_list = list() final_list[MUTANT_INDEX_NAME] = SA.name final_list[MUTANT_INDEX_COLOR_LIST] = SA.get_default_color(features, pref_species) diff --git a/modular_skyrat/modules/better_vox/code/vox_species.dm b/modular_skyrat/modules/better_vox/code/vox_species.dm index 8fdd3506cc0..a8c2d4c0e2e 100644 --- a/modular_skyrat/modules/better_vox/code/vox_species.dm +++ b/modular_skyrat/modules/better_vox/code/vox_species.dm @@ -49,7 +49,7 @@ /datum/species/vox_primalis/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Vox Primalis Tail", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Vox Primalis Tail", FALSE), ) /datum/species/vox_primalis/pre_equip_species_outfit(datum/job/job, mob/living/carbon/human/equipping, visuals_only) diff --git a/modular_skyrat/modules/customization/__HELPERS/global_lists.dm b/modular_skyrat/modules/customization/__HELPERS/global_lists.dm index cc2c6c9e3e8..d203c1ea805 100644 --- a/modular_skyrat/modules/customization/__HELPERS/global_lists.dm +++ b/modular_skyrat/modules/customization/__HELPERS/global_lists.dm @@ -40,7 +40,7 @@ GLOB.default_mutant_bodyparts[species_instance.name] = species_instance.get_default_mutant_bodyparts() if(species_instance.can_have_genitals) for(var/genital in GLOB.possible_genitals) - GLOB.default_mutant_bodyparts[species_instance.name] += list((genital) = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE)) + GLOB.default_mutant_bodyparts[species_instance.name] += list((genital) = list("None", FALSE)) qdel(species_instance) /proc/make_body_marking_references() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm index 08d83bd7313..9568aec0bd0 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm @@ -45,8 +45,8 @@ GLOBAL_LIST_EMPTY(customizable_races) /datum/species/human/felinid/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Cat", FALSE), + "ears" = list("Cat", FALSE), ) /datum/species/human @@ -54,9 +54,9 @@ GLOBAL_LIST_EMPTY(customizable_races) /datum/species/human/get_default_mutant_bodyparts() return list( - "ears" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "tail" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "ears" = list("None", FALSE), + "tail" = list("None", FALSE), + "wings" = list("None", FALSE), ) /datum/species/mush @@ -105,10 +105,10 @@ GLOBAL_LIST_EMPTY(customizable_races) if(LAZYLEN(existing_mutant_bodyparts) && existing_mutant_bodyparts[key]) continue var/datum/sprite_accessory/SP - if(default_bodypart_data[key][MUTANT_INDEX_CAN_RANDOMIZE]) + if(default_bodypart_data[key][MUTANTPART_CAN_RANDOMIZE]) SP = random_accessory_of_key_for_species(key, src) else - SP = GLOB.sprite_accessories[key][bodyparts_to_add[key][MUTANT_INDEX_NAME]] + SP = GLOB.sprite_accessories[key][bodyparts_to_add[key][MUTANTPART_NAME]] if(!SP) CRASH("Cant find accessory of [key] key, [bodyparts_to_add[key]] name, for species [id]") var/list/color_list = SP.get_default_color(features, src) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm index 95733d3df2b..7a9181b75a9 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm @@ -45,8 +45,8 @@ /datum/species/akula/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Akula", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Akula", TRUE), + "legs" = list("Normal Legs", FALSE), ) /datum/species/akula/get_species_description() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm index 2fa8525ff48..29df861b8bf 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm @@ -25,12 +25,12 @@ /datum/species/aquatic/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Shark", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "snout" = list(MUTANT_INDEX_NAME = "Shark", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "horns" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "Hammerhead", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Shark", TRUE), + "snout" = list("Shark", TRUE), + "horns" = list("None", FALSE), + "ears" = list("Hammerhead", TRUE), + "legs" = list("Normal Legs", FALSE), + "wings" = list("None", FALSE), ) /obj/item/organ/internal/tongue/aquatic diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm index f0b2c18d297..a1574f895a4 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm @@ -33,9 +33,9 @@ /datum/species/ghoul/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("None", FALSE), + "ears" = list("None", FALSE), + "legs" = list("Normal Legs", FALSE), ) /proc/proof_ghoul_features(list/inFeatures) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm index a74eb02b7fd..35ad767efab 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm @@ -30,7 +30,7 @@ /datum/species/hemophage/get_default_mutant_bodyparts() return list( - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "legs" = list("Normal Legs", FALSE), ) /datum/species/hemophage/check_roundstart_eligible() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm index 33d15682332..0bdecf35227 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm @@ -15,13 +15,13 @@ /datum/species/humanoid/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "snout" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "taur" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "horns" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("None", FALSE), + "snout" = list("None", FALSE), + "ears" = list("None", FALSE), + "legs" = list("Normal Legs", FALSE), + "wings" = list("None", FALSE), + "taur" = list("None", FALSE), + "horns" = list("None", FALSE), ) /datum/species/humanoid/get_species_description() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm index 880ecec4ca4..97b21607c27 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm @@ -25,15 +25,15 @@ /datum/species/insect/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "snout" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "horns" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "taur" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "fluff" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "Bee", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "moth_antennae" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("None", FALSE), + "snout" = list("None", FALSE), + "horns" = list("None", FALSE), + "ears" = list("None", FALSE), + "legs" = list("Normal Legs", FALSE), + "taur" = list("None", FALSE), + "fluff" = list("None", FALSE), + "wings" = list("Bee", FALSE), + "moth_antennae" = list("None", FALSE), ) /datum/species/insect/get_species_description() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm index 82ea0cf9c31..55f20d16e6b 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm @@ -5,15 +5,15 @@ /datum/species/lizard/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Smooth", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "snout" = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "spines" = list(MUTANT_INDEX_NAME = "Long + Membrane", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "frills" = list(MUTANT_INDEX_NAME = "Short", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "horns" = list(MUTANT_INDEX_NAME = "Curled", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "body_markings" = list(MUTANT_INDEX_NAME = "Light Belly", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = DIGITIGRADE_LEGS, MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "taur" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Smooth", TRUE), + "snout" = list("Sharp + Light", TRUE), + "spines" = list("Long + Membrane", TRUE), + "frills" = list("Short", TRUE), + "horns" = list("Curled", TRUE), + "body_markings" = list("Light Belly", TRUE), + "legs" = list(DIGITIGRADE_LEGS,FALSE), + "taur" = list("None", FALSE), + "wings" = list("None", FALSE), ) /datum/species/lizard/randomize_features() 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 7bf7d0014d6..d450093819b 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 @@ -23,16 +23,16 @@ /datum/species/mammal/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Husky", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "snout" = list(MUTANT_INDEX_NAME = "Husky", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "horns" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "Husky", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "taur" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "fluff" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "head_acc" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "neck_acc" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Husky", TRUE), + "snout" = list("Husky", TRUE), + "horns" = list("None", FALSE), + "ears" = list("Husky", TRUE), + "legs" = list("Normal Legs", TRUE), + "taur" = list("None", FALSE), + "fluff" = list("None", FALSE), + "wings" = list("None", FALSE), + "head_acc" = list("None", FALSE), + "neck_acc" = list("None", FALSE), ) /obj/item/organ/internal/tongue/mammal diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/monkey.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/monkey.dm index fdcb5630d31..76126e02192 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/monkey.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/monkey.dm @@ -1,6 +1,6 @@ /datum/species/monkey/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Monkey", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Monkey", FALSE), ) /datum/species/monkey/prepare_human_for_preview(mob/living/carbon/human/monke) 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 04a452712a4..562ba54398d 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 @@ -9,9 +9,9 @@ /datum/species/moth/get_default_mutant_bodyparts() return list( - "fluff" = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "Moth (Plain)", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "moth_antennae" = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), + "fluff" = list("Plain", FALSE), + "wings" = list("Moth (Plain)", TRUE), + "moth_antennae" = list("Plain", TRUE), ) /datum/species/moth/randomize_features() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm index 73b66a22c57..6e4615f99a5 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm @@ -11,8 +11,8 @@ /datum/species/pod/get_default_mutant_bodyparts() return list( - "pod_hair" = list(MUTANT_INDEX_NAME = "Ivy", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "pod_hair" = list("Ivy", TRUE), + "legs" = list("Normal Legs", FALSE), ) /datum/species/pod/podweak diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index eec5fb6e5c7..5490654ef96 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -6,15 +6,15 @@ /datum/species/jelly/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "snout" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "taur" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "wings" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "horns" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "spines" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "frills" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("None", FALSE), + "snout" = list("None", FALSE), + "ears" = list("None", FALSE), + "legs" = list("Normal Legs", FALSE), + "taur" = list("None", FALSE), + "wings" = list("None", FALSE), + "horns" = list("None", FALSE), + "spines" = list("None", FALSE), + "frills" = list("None", FALSE), ) /datum/species/jelly/get_species_description() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm index b489e6a1c74..c92c46a1406 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm @@ -35,7 +35,7 @@ /datum/species/skrell/get_default_mutant_bodyparts() return list( - "skrell_hair" = list(MUTANT_INDEX_NAME = "Male", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), + "skrell_hair" = list("Male", TRUE), ) /datum/species/skrell/get_species_description() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm index e26208ec567..7f9cfb7664b 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm @@ -26,10 +26,10 @@ /datum/species/tajaran/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Cat (Big)", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "snout" = list(MUTANT_INDEX_NAME = "Cat, normal", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "ears" = list(MUTANT_INDEX_NAME = "Cat, normal", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Cat (Big)", TRUE), + "snout" = list("Cat, normal", TRUE), + "ears" = list("Cat, normal", TRUE), + "legs" = list("Normal Legs", FALSE), ) /obj/item/organ/internal/tongue/cat/tajaran diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm index e2638e06e3e..ccbb0dd1416 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm @@ -26,13 +26,13 @@ /datum/species/unathi/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Smooth", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "snout" = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "spines" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "frills" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "horns" = list(MUTANT_INDEX_NAME = "Curled", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "body_markings" = list(MUTANT_INDEX_NAME = "Smooth Belly", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Smooth", TRUE), + "snout" = list("Sharp + Light", TRUE), + "spines" = list("None", FALSE), + "frills" = list("None", FALSE), + "horns" = list("Curled", TRUE), + "body_markings" = list("Smooth Belly", TRUE), + "legs" = list("Normal Legs", FALSE), ) /obj/item/organ/internal/tongue/unathi diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm index ecf2d84f623..60c0eee37cd 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm @@ -47,10 +47,10 @@ /datum/species/vox/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Vox Tail", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "legs" = list(MUTANT_INDEX_NAME = DIGITIGRADE_LEGS, MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "snout" = list(MUTANT_INDEX_NAME = "Vox Snout", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "spines" = list(MUTANT_INDEX_NAME = "Vox Bands", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), + "tail" = list("Vox Tail", FALSE), + "legs" = list(DIGITIGRADE_LEGS,FALSE), + "snout" = list("Vox Snout", FALSE), + "spines" = list("Vox Bands", TRUE), ) /datum/species/vox/pre_equip_species_outfit(datum/job/job, mob/living/carbon/human/equipping, visuals_only) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm index 410d5200eed..48b2b3d327b 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm @@ -25,10 +25,10 @@ /datum/species/vulpkanin/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Fox", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "snout" = list(MUTANT_INDEX_NAME = "Mammal, Long", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "ears" = list(MUTANT_INDEX_NAME = "Fox", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Fox", TRUE), + "snout" = list("Mammal, Long", TRUE), + "ears" = list("Fox", TRUE), + "legs" = list("Normal Legs", FALSE), ) /obj/item/organ/internal/tongue/vulpkanin diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm index cb73afdc4e1..4b2052bd083 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm @@ -29,11 +29,11 @@ /datum/species/xeno/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Xenomorph Tail", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "xenodorsal" = list(MUTANT_INDEX_NAME = "Standard", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "xenohead" = list(MUTANT_INDEX_NAME = "Standard", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = DIGITIGRADE_LEGS, MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "taur" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Xenomorph Tail", FALSE), + "xenodorsal" = list("Standard", TRUE), + "xenohead" = list("Standard", TRUE), + "legs" = list(DIGITIGRADE_LEGS,FALSE), + "taur" = list("None", FALSE), ) /datum/species/xeno/get_species_description() diff --git a/modular_skyrat/modules/synths/code/species/synthetic.dm b/modular_skyrat/modules/synths/code/species/synthetic.dm index e3167ab4a4f..9a362621327 100644 --- a/modular_skyrat/modules/synths/code/species/synthetic.dm +++ b/modular_skyrat/modules/synths/code/species/synthetic.dm @@ -54,14 +54,14 @@ /datum/species/synthetic/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "ears" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - "snout" = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - MUTANT_SYNTH_ANTENNA = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - MUTANT_SYNTH_SCREEN = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - MUTANT_SYNTH_CHASSIS = list(MUTANT_INDEX_NAME = "Default Chassis", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), - MUTANT_SYNTH_HEAD = list(MUTANT_INDEX_NAME = "Default Head", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("None", FALSE), + "ears" = list("None", FALSE), + "legs" = list("Normal Legs", FALSE), + "snout" = list("None", FALSE), + MUTANT_SYNTH_ANTENNA = list("None", FALSE), + MUTANT_SYNTH_SCREEN = list("None", FALSE), + MUTANT_SYNTH_CHASSIS = list("Default Chassis", FALSE), + MUTANT_SYNTH_HEAD = list("Default Head", FALSE), ) /datum/species/synthetic/spec_life(mob/living/carbon/human/human) diff --git a/modular_skyrat/modules/teshari/code/_teshari.dm b/modular_skyrat/modules/teshari/code/_teshari.dm index ed1663d6f9a..1b09214e5f7 100644 --- a/modular_skyrat/modules/teshari/code/_teshari.dm +++ b/modular_skyrat/modules/teshari/code/_teshari.dm @@ -50,9 +50,9 @@ /datum/species/teshari/get_default_mutant_bodyparts() return list( - "tail" = list(MUTANT_INDEX_NAME = "Teshari (Default)", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "ears" = list(MUTANT_INDEX_NAME = "Teshari Regular", MUTANT_INDEX_CAN_RANDOMIZE = TRUE), - "legs" = list(MUTANT_INDEX_NAME = "Normal Legs", MUTANT_INDEX_CAN_RANDOMIZE = FALSE), + "tail" = list("Teshari (Default)", TRUE), + "ears" = list("Teshari Regular", TRUE), + "legs" = list("Normal Legs", FALSE), )