From fba91c6afda525b447e72fc560db50192453be68 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Wed, 1 Mar 2023 09:17:04 +0800 Subject: [PATCH 1/2] stops proteans from selecting promethean --- .../carbon/human/species/station/protean/protean_powers.dm | 2 +- .../carbon/human/species/station/protean/protean_species.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm index 21f1bcb114..c8407a5828 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm @@ -306,7 +306,7 @@ to_chat(src,"You must be awake and standing to perform this action!") return - var/new_species = tgui_input_list(usr, "Please select a species to emulate.", "Shapeshifter Body", list(species?.vanity_base_fit)|GLOB.playable_species) + var/new_species = tgui_input_list(usr, "Please select a species to emulate.", "Shapeshifter Body", list(species?.vanity_base_fit)|species?.get_valid_shapeshifter_forms()) if(new_species) species?.base_species = new_species // Really though you better have a species regenerate_icons() //Expensive, but we need to recrunch all the icons we're wearing diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index 55667c2f42..2ef4644c82 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -152,7 +152,8 @@ return S.get_icobase(H, get_deform) /datum/species/protean/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H) - return GLOB.playable_species + var/static/list/protean_shapeshifting_forms = GLOB.playable_species.Copy() -= SPECIES_PROMETHEAN + return protean_shapeshifting_forms /datum/species/protean/get_tail(var/mob/living/carbon/human/H) if(!H || base_species == name) return ..() From f95ae5a000674e269988bd7a5aec04b2b4419283 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:52:27 +0800 Subject: [PATCH 2/2] why do I do this to myself --- .../carbon/human/species/station/protean/protean_species.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index 2ef4644c82..89ceae790c 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -152,7 +152,7 @@ return S.get_icobase(H, get_deform) /datum/species/protean/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H) - var/static/list/protean_shapeshifting_forms = GLOB.playable_species.Copy() -= SPECIES_PROMETHEAN + var/static/list/protean_shapeshifting_forms = GLOB.playable_species.Copy() - SPECIES_PROMETHEAN return protean_shapeshifting_forms /datum/species/protean/get_tail(var/mob/living/carbon/human/H) @@ -419,4 +419,4 @@ CHOMP Removal end*/ . = ..() . += validstring . += registring -#undef METAL_PER_TICK \ No newline at end of file +#undef METAL_PER_TICK