From b1e315f09cb6c3e7c94d2c3a7049668bba203b65 Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Wed, 22 Nov 2023 15:12:17 -0500 Subject: [PATCH] Changes default_mutant_bodyparts list to be index based (#25174) * 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 --- code/__DEFINES/~skyrat_defines/DNA.dm | 4 +++ .../code/modules/client/preferences.dm | 11 ++++++++ .../modules/better_vox/code/vox_species.dm | 7 +++++ .../customization/__HELPERS/global_lists.dm | 15 +++++++++++ .../mob/living/carbon/human/species.dm | 26 +++++++++++++++++++ .../mob/living/carbon/human/species/akula.dm | 9 +++++++ .../living/carbon/human/species/aquatic.dm | 13 ++++++++++ .../mob/living/carbon/human/species/ghoul.dm | 10 +++++++ .../species/hemophage/hemophage_species.dm | 7 +++++ .../living/carbon/human/species/humanoid.dm | 14 ++++++++++ .../mob/living/carbon/human/species/insect.dm | 16 ++++++++++++ .../mob/living/carbon/human/species/lizard.dm | 18 +++++++++++++ .../mob/living/carbon/human/species/mammal.dm | 16 ++++++++++++ .../mob/living/carbon/human/species/monkey.dm | 7 +++++ .../mob/living/carbon/human/species/moth.dm | 14 ++++++++++ .../living/carbon/human/species/podweak.dm | 9 +++++++ .../carbon/human/species/roundstartslime.dm | 16 ++++++++++++ .../mob/living/carbon/human/species/skrell.dm | 8 ++++++ .../living/carbon/human/species/tajaran.dm | 10 +++++++ .../mob/living/carbon/human/species/unathi.dm | 13 ++++++++++ .../mob/living/carbon/human/species/vox.dm | 11 ++++++++ .../living/carbon/human/species/vulpkanin.dm | 10 +++++++ .../mob/living/carbon/human/species/xeno.dm | 12 +++++++++ .../modules/synths/code/species/synthetic.dm | 15 +++++++++++ .../modules/teshari/code/_teshari.dm | 10 +++++++ 25 files changed, 301 insertions(+) diff --git a/code/__DEFINES/~skyrat_defines/DNA.dm b/code/__DEFINES/~skyrat_defines/DNA.dm index 8e9c220c9e1..62426b29567 100644 --- a/code/__DEFINES/~skyrat_defines/DNA.dm +++ b/code/__DEFINES/~skyrat_defines/DNA.dm @@ -37,6 +37,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 bc97b467cd9..d465d04fa3c 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences.dm @@ -122,17 +122,28 @@ mutant_bodyparts -= key continue if(!GLOB.sprite_accessories[key][mutant_bodyparts[key][MUTANT_INDEX_NAME]]) // The individual accessory no longer exists +<<<<<<< HEAD mutant_bodyparts[key][MUTANT_INDEX_NAME] = pref_species.default_mutant_bodyparts[key] +======= + mutant_bodyparts[key][MUTANT_INDEX_NAME] = GLOB.default_mutant_bodyparts[pref_species.name[key][MUTANTPART_NAME]] +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) 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 +<<<<<<< HEAD if(target_bodyparts[key] == ACC_RANDOM) SA = random_accessory_of_key_for_species(key, pref_species) else SA = GLOB.sprite_accessories[key][target_bodyparts[key]] +======= + 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][MUTANTPART_NAME]] +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) 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 4d3f1b237c9..4327c45cd22 100644 --- a/modular_skyrat/modules/better_vox/code/vox_species.dm +++ b/modular_skyrat/modules/better_vox/code/vox_species.dm @@ -50,6 +50,13 @@ LOADOUT_ITEM_EARS = VOX_PRIMALIS_EARS_ICON, ) +<<<<<<< HEAD +======= +/datum/species/vox_primalis/get_default_mutant_bodyparts() + return list( + "tail" = list("Vox Primalis Tail", FALSE), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /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 a2dca2e39be..1f1cf2f5e9e 100644 --- a/modular_skyrat/modules/customization/__HELPERS/global_lists.dm +++ b/modular_skyrat/modules/customization/__HELPERS/global_lists.dm @@ -30,6 +30,21 @@ if(P.generic && !GLOB.generic_accessories[P.key]) GLOB.generic_accessories[P.key] = P.generic +<<<<<<< HEAD +======= +/proc/make_default_mutant_bodypart_references() + // Build the global list for default species' mutant_bodyparts + for(var/path in subtypesof(/datum/species)) + var/datum/species/species_type = path + var/datum/species/species_instance = new species_type + if(!isnull(species_instance.name)) + 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("None", FALSE)) + qdel(species_instance) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /proc/make_body_marking_references() // Here we build the global list for all body markings for(var/path in subtypesof(/datum/body_marking)) 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 357e827e744..661ef1165dc 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 @@ -48,11 +48,30 @@ GLOBAL_LIST_EMPTY(customizable_races) /datum/species/human/felinid mutant_bodyparts = list() +<<<<<<< HEAD default_mutant_bodyparts = list("tail" = "Cat", "ears" = "Cat") /datum/species/human mutant_bodyparts = list() default_mutant_bodyparts = list("ears" = "None", "tail" = "None", "wings" = "None") +======= + +/datum/species/human/felinid/get_default_mutant_bodyparts() + return list( + "tail" = list("Cat", FALSE), + "ears" = list("Cat", FALSE), + ) + +/datum/species/human + mutant_bodyparts = list() + +/datum/species/human/get_default_mutant_bodyparts() + return list( + "ears" = list("None", FALSE), + "tail" = list("None", FALSE), + "wings" = list("None", FALSE), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/mush mutant_bodyparts = list() @@ -85,10 +104,17 @@ GLOBAL_LIST_EMPTY(customizable_races) bodyparts_to_add.Remove(genital) for(var/key in bodyparts_to_add) var/datum/sprite_accessory/SP +<<<<<<< HEAD if(bodyparts_to_add[key] == ACC_RANDOM) SP = random_accessory_of_key_for_species(key, src) else SP = GLOB.sprite_accessories[key][bodyparts_to_add[key]] +======= + 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][MUTANTPART_NAME]] +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) 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 19492ef4456..406729dbd02 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 @@ -47,6 +47,15 @@ /// This variable stores the timer datum which appears if the mob becomes wet var/dry_up_timer = TIMER_ID_NULL +<<<<<<< HEAD +======= +/datum/species/akula/get_default_mutant_bodyparts() + return list( + "tail" = list("Akula", TRUE), + "legs" = list("Normal Legs", FALSE), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/akula/get_species_description() return placeholder_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 80aa57ca8ca..d2bdce67dfd 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 @@ -31,6 +31,19 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant/aquatic, ) +<<<<<<< HEAD +======= +/datum/species/aquatic/get_default_mutant_bodyparts() + return list( + "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), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /obj/item/organ/internal/tongue/aquatic liked_foodtypes = SEAFOOD | MEAT | FRUIT | GORE disliked_foodtypes = CLOTH | GROSS 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 0b615d6bfc1..fc6f899849f 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 @@ -36,6 +36,16 @@ //i dont have to worry about sprites due to limbs_icon, thank god //also the head needs to be normal for hair to work +<<<<<<< HEAD +======= +/datum/species/ghoul/get_default_mutant_bodyparts() + return list( + "tail" = list("None", FALSE), + "ears" = list("None", FALSE), + "legs" = list("Normal Legs", FALSE), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /proc/proof_ghoul_features(list/inFeatures) // Missing Defaults in DNA? Randomize! if(inFeatures["ghoulcolor"] == null || inFeatures["ghoulcolor"] == "") 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 6f721354cd5..c842b2ad179 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 @@ -31,6 +31,13 @@ skinned_type = /obj/item/stack/sheet/animalhide/human veteran_only = TRUE +<<<<<<< HEAD +======= +/datum/species/hemophage/get_default_mutant_bodyparts() + return list( + "legs" = list("Normal Legs", FALSE), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/hemophage/check_roundstart_eligible() if(check_holidays(HALLOWEEN)) 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 41f3715e8ca..3f5c56e6ceb 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 @@ -22,6 +22,20 @@ payday_modifier = 1.0 examine_limb_id = SPECIES_HUMAN +<<<<<<< HEAD +======= +/datum/species/humanoid/get_default_mutant_bodyparts() + return list( + "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), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/humanoid/get_species_description() return "This is a template species for your own creations!" 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 50f2cbec142..39de6904ea0 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 @@ -34,6 +34,22 @@ ) eyes_icon = 'modular_skyrat/modules/organs/icons/insect_eyes.dmi' +<<<<<<< HEAD +======= +/datum/species/insect/get_default_mutant_bodyparts() + return list( + "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), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/insect/get_species_description() return placeholder_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 dd938a43e21..f0a77fcae76 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 @@ -14,7 +14,25 @@ ) payday_modifier = 1.0 +<<<<<<< HEAD /datum/species/lizard/randomize_features(mob/living/carbon/human/human_mob) +======= +/datum/species/lizard/get_default_mutant_bodyparts() + return list( + "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() + var/list/features = ..() +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) var/main_color = "#[random_color()]" var/second_color var/third_color 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 801695b4274..e8eeb6cf3fb 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 @@ -33,6 +33,22 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant, ) +<<<<<<< HEAD +======= +/datum/species/mammal/get_default_mutant_bodyparts() + return list( + "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), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /obj/item/organ/internal/tongue/mammal liked_foodtypes = GRAIN | MEAT 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 2b46cb02c21..a0be65737c1 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,5 +1,12 @@ +<<<<<<< HEAD /datum/species/monkey default_mutant_bodyparts = list("tail" = "Monkey") +======= +/datum/species/monkey/get_default_mutant_bodyparts() + return list( + "tail" = list("Monkey", FALSE), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/monkey/prepare_human_for_preview(mob/living/carbon/human/monke) regenerate_organs(monke, src, visual_only = TRUE) 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 6628060ee92..3a5ec87780e 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 @@ -12,8 +12,22 @@ TRAIT_MUTANT_COLORS, ) +<<<<<<< HEAD /datum/species/moth/randomize_features(mob/living/carbon/human/human_mob) human_mob.dna.features["mcolor"] = "#E5CD99" +======= +/datum/species/moth/get_default_mutant_bodyparts() + return list( + "fluff" = list("Plain", FALSE), + "wings" = list("Moth (Plain)", TRUE), + "moth_antennae" = list("Plain", TRUE), + ) + +/datum/species/moth/randomize_features() + var/list/features = ..() + features["mcolor"] = "#E5CD99" + return features +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/moth/get_random_body_markings(list/passed_features) var/name = "None" 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 90a4e4298a7..e6e4edde40f 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 @@ -7,9 +7,18 @@ TRAIT_LITERATE, ) mutant_bodyparts = list() +<<<<<<< HEAD default_mutant_bodyparts = list( "pod_hair" = ACC_RANDOM, "legs" = "Normal Legs" +======= + payday_modifier = 1.0 + +/datum/species/pod/get_default_mutant_bodyparts() + return list( + "pod_hair" = list("Ivy", TRUE), + "legs" = list("Normal Legs", FALSE), +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) ) payday_modifier = 1.0 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 422c1fd12cd..996c56eda38 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 @@ -15,6 +15,22 @@ hair_alpha = 160 //a notch brighter so it blends better. facial_hair_alpha = 160 +<<<<<<< HEAD +======= +/datum/species/jelly/get_default_mutant_bodyparts() + return list( + "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), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/jelly/get_species_description() return placeholder_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 47cd5be08c0..85e423d0150 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 @@ -34,6 +34,14 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant/skrell, ) +<<<<<<< HEAD +======= +/datum/species/skrell/get_default_mutant_bodyparts() + return list( + "skrell_hair" = list("Male", TRUE), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/skrell/get_species_description() return placeholder_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 e5739b23624..d738ccd71ca 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 @@ -30,6 +30,16 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant, ) +<<<<<<< HEAD +======= +/datum/species/tajaran/get_default_mutant_bodyparts() + return list( + "tail" = list("Cat (Big)", TRUE), + "snout" = list("Cat, normal", TRUE), + "ears" = list("Cat, normal", TRUE), + "legs" = list("Normal Legs", FALSE), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /obj/item/organ/internal/tongue/cat/tajaran liked_foodtypes = GRAIN | MEAT 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 c744097639a..9d2e0004ace 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 @@ -33,6 +33,19 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/lizard, ) +<<<<<<< HEAD +======= +/datum/species/unathi/get_default_mutant_bodyparts() + return list( + "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), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /obj/item/organ/internal/tongue/unathi liked_foodtypes = GORE | MEAT | SEAFOOD | NUTS 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 059019f249e..d6a6f35c96e 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 @@ -51,6 +51,17 @@ LOADOUT_ITEM_EARS = VOX_EARS_ICON ) +<<<<<<< HEAD +======= +/datum/species/vox/get_default_mutant_bodyparts() + return list( + "tail" = list("Vox Tail", FALSE), + "legs" = list(DIGITIGRADE_LEGS,FALSE), + "snout" = list("Vox Snout", FALSE), + "spines" = list("Vox Bands", TRUE), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/vox/pre_equip_species_outfit(datum/job/job, mob/living/carbon/human/equipping, visuals_only) . = ..() if(job?.vox_outfit) 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 62e001c5f74..b018fb52c6b 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 @@ -29,6 +29,16 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant, ) +<<<<<<< HEAD +======= +/datum/species/vulpkanin/get_default_mutant_bodyparts() + return list( + "tail" = list("Fox", TRUE), + "snout" = list("Mammal, Long", TRUE), + "ears" = list("Fox", TRUE), + "legs" = list("Normal Legs", FALSE), + ) +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /obj/item/organ/internal/tongue/vulpkanin liked_foodtypes = RAW | MEAT 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 b4dbe252503..37fcc7f8b91 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 @@ -34,6 +34,18 @@ meat = /obj/item/food/meat/slab/xeno skinned_type = /obj/item/stack/sheet/animalhide/xeno +<<<<<<< HEAD +======= +/datum/species/xeno/get_default_mutant_bodyparts() + return list( + "tail" = list("Xenomorph Tail", FALSE), + "xenodorsal" = list("Standard", TRUE), + "xenohead" = list("Standard", TRUE), + "legs" = list(DIGITIGRADE_LEGS,FALSE), + "taur" = list("None", FALSE), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /datum/species/xeno/get_species_description() return placeholder_description diff --git a/modular_skyrat/modules/synths/code/species/synthetic.dm b/modular_skyrat/modules/synths/code/species/synthetic.dm index 124985d73da..76f3a0ab81b 100644 --- a/modular_skyrat/modules/synths/code/species/synthetic.dm +++ b/modular_skyrat/modules/synths/code/species/synthetic.dm @@ -63,6 +63,21 @@ /// This is the screen that is given to the user after they get revived. On death, their screen is temporarily set to BSOD before it turns off, hence the need for this var. var/saved_screen = "Blank" +<<<<<<< HEAD +======= +/datum/species/synthetic/get_default_mutant_bodyparts() + return list( + "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), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /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 84dc35e59c2..07b8907094f 100644 --- a/modular_skyrat/modules/teshari/code/_teshari.dm +++ b/modular_skyrat/modules/teshari/code/_teshari.dm @@ -53,6 +53,16 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant/teshari, ) +<<<<<<< HEAD +======= +/datum/species/teshari/get_default_mutant_bodyparts() + return list( + "tail" = list("Teshari (Default)", TRUE), + "ears" = list("Teshari Regular", TRUE), + "legs" = list("Normal Legs", FALSE), + ) + +>>>>>>> ec0245b89 (Changes default_mutant_bodyparts list to be index based (#25174)) /obj/item/organ/internal/tongue/teshari liked_foodtypes = MEAT