Ребейз и некоторые исправления

ss220club · May 22, 2024 · ee3ee0a · ee3ee0a
1 parent 293b474
commit ee3ee0a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 30 deletions.
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
@@ -116,8 +116,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	target.dna.features["tail_lizard"] = get_consistent_feature_entry(SSaccessories.tails_list_lizard)
 	target.dna.features["tail_monkey"] = get_consistent_feature_entry(SSaccessories.tails_list_monkey)
 	target.dna.features["pod_hair"] = get_consistent_feature_entry(SSaccessories.pod_hair_list)
-	//target.dna.features["tail_vulpkanin"] = get_consistent_feature_entry(SSaccessories.tails_list_vulpkanin)
-    //target.dna.features["tail_markings"] = get_consistent_feature_entry(SSaccessories.vulpkanin_tail_markings_list)
 	target.dna.initialize_dna(create_mutation_blocks = FALSE, randomize_features = FALSE)
 	// UF and UI are nondeterministic, even though the features are the same some blocks will randomize slightly
 	// In practice this doesn't matter, but this is for the sake of 100%(ish) consistency

diff --git a/modular_bandastation/species/code/dna.dm b/modular_bandastation/species/code/dna.dm
@@ -47,11 +47,3 @@
 		dna.features["tail_markings"] = SSaccessories.vulpkanin_tail_markings_list[deconstruct_block(get_uni_feature_block(dna.unique_features, DNA_VULPKANIN_TAIL_MARKINGS), SSaccessories.vulpkanin_tail_markings_list.len)]
 	if(dna.features["vulpkanin_facial_hair"])
 		dna.features["vulpkanin_facial_hair"] = SSaccessories.vulpkanin_facial_hair_list[deconstruct_block(get_uni_feature_block(dna.unique_features, DNA_VULPKANIN_FACIAL_HAIR), SSaccessories.vulpkanin_facial_hair_list.len)]
-
-
-// /vulpkanin/populate_total_uf_len_by_block()
-// 	. = list()
-// 	var/total_block_len = 1
-// 	for(var/blocknumber in 1 to DNA_FEATURE_BLOCKS)
-// 		. += total_block_len
-// 		total_block_len += GET_UF_BLOCK_LEN(blocknumber)
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx
@@ -104,6 +104,28 @@ export const feature_lizard_tail: FeatureChoiced = {
   },
 };
 
+export const feature_mcolor: Feature<string> = {
+  name: 'Mutant color',
+  component: FeatureColorInput,
+};
+
+export const underwear_color: Feature<string> = {
+  name: 'Underwear color',
+  component: FeatureColorInput,
+};
+
+export const feature_vampire_status: Feature<string> = {
+  name: 'Vampire status',
+  component: FeatureDropdownInput,
+};
+
+export const heterochromatic: Feature<string> = {
+  name: 'Heterochromatic (Right Eye) color',
+  component: FeatureColorInput,
+};
+
+// BANDASTATION EDIT START
+
 export const feature_vulpkanin_tail: FeatureChoiced = {
   name: 'Tail',
   component: (
@@ -173,23 +195,3 @@ export const vulpkanin_tail_markings_color: Feature<string> = {
   name: 'Tail markings color',
   component: FeatureColorInput,
 };
-
-export const feature_mcolor: Feature<string> = {
-  name: 'Mutant color',
-  component: FeatureColorInput,
-};
-
-export const underwear_color: Feature<string> = {
-  name: 'Underwear color',
-  component: FeatureColorInput,
-};
-
-export const feature_vampire_status: Feature<string> = {
-  name: 'Vampire status',
-  component: FeatureDropdownInput,
-};
-
-export const heterochromatic: Feature<string> = {
-  name: 'Heterochromatic (Right Eye) color',
-  component: FeatureColorInput,
-};