cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5829 from Seris02/noprometheanprotean

Browse Source 
stops proteans from selecting promethean
This commit is contained in:
Razgriz
2023-03-01 02:44:35 -07:00
committed by GitHub
parent 89f9657ac7 f95ae5a000
commit 65637c3fc9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
View File

@@ -306,7 +306,7 @@
to_chat(src,"<span class='warning'>You must be awake and standing to perform this action!</span>") to_chat(src,"<span class='warning'>You must be awake and standing to perform this action!</span>")
return 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) if(new_species)
species?.base_species = new_species // Really though you better have a 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 regenerate_icons() //Expensive, but we need to recrunch all the icons we're wearing

5
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
View File

@@ -152,7 +152,8 @@
return S.get_icobase(H, get_deform) return S.get_icobase(H, get_deform)
/datum/species/protean/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H) /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) /datum/species/protean/get_tail(var/mob/living/carbon/human/H)
if(!H || base_species == name) return ..() if(!H || base_species == name) return ..()
@@ -418,4 +419,4 @@ CHOMP Removal end*/
. = ..() . = ..()
. += validstring . += validstring
. += registring . += registring
#undef METAL_PER_TICK #undef METAL_PER_TICK