Monkestation · JohnFulpWillard · Oct 8, 2024 · Oct 8, 2024 · Oct 8, 2024 · Oct 8, 2024
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
@@ -40,7 +40,7 @@
 #define DNA_UNI_IDENTITY_BLOCKS 7
 
 /// This number needs to equal the total number of DNA blocks
-#define DNA_FEATURE_BLOCKS 20
+#define DNA_FEATURE_BLOCKS 21
 
 #define DNA_MUTANT_COLOR_BLOCK 1
 #define DNA_ETHEREAL_COLOR_BLOCK 2
@@ -58,10 +58,11 @@
 #define DNA_MUSHROOM_CAPS_BLOCK 14
 #define DNA_POD_HAIR_BLOCK 15
 #define DNA_MUTANT_COLOR_SECONDARY 16
-#define DNA_ARM_WINGS_BLOCK 17 // NON-MODULE CHANGE
-#define DNA_AVIAN_EARS_BLOCK 18 // NON-MODULE CHANGE
-#define DNA_AVIAN_TAIL_BLOCK 19 // NON-MODULE CHANGE
-#define DNA_FEATHER_COLOR_BLOCK 20 // NON-MODULE CHANGE
+#define DNA_MONKEY_TAIL_BLOCK 17
+#define DNA_ARM_WINGS_BLOCK 18 // NON-MODULE CHANGE
+#define DNA_AVIAN_EARS_BLOCK 19 // NON-MODULE CHANGE
+#define DNA_AVIAN_TAIL_BLOCK 20 // NON-MODULE CHANGE
+#define DNA_FEATHER_COLOR_BLOCK 21 // NON-MODULE CHANGE
 
 #define DNA_SEQUENCE_LENGTH 4
 #define DNA_MUTATION_BLOCKS 8

diff --git a/code/__DEFINES/clothing_paths.dm b/code/__DEFINES/clothing_paths.dm
@@ -1,14 +1,3 @@
-#define SIMIAN_UNIFORM_ICON 'monkestation/icons/mob/clothing/species/simian/uniform.dmi'
-#define SIMIAN_SUIT_ICON 'monkestation/icons/mob/clothing/species/simian/suit.dmi'
-#define SIMIAN_BACK_ICON 'monkestation/icons/mob/clothing/species/simian/back.dmi'
-#define SIMIAN_BELT_ICON 'monkestation/icons/mob/clothing/species/simian/belts.dmi'
-#define SIMIAN_GLASSES_ICON 'monkestation/icons/mob/clothing/species/simian/glasses.dmi'
-#define SIMIAN_GLOVES_ICON 'monkestation/icons/mob/clothing/species/simian/gloves.dmi'
-#define SIMIAN_NECK_ICON 'monkestation/icons/mob/clothing/species/simian/neck.dmi'
-#define SIMIAN_SHOES_ICON 'monkestation/icons/mob/clothing/species/simian/shoes.dmi'
-
-
-
 #define LOADOUT_ITEM_BELT "belt"
 #define LOADOUT_ITEM_EARS "ears"
 #define LOADOUT_ITEM_GLASSES "glasses"

diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
@@ -128,17 +128,29 @@
 #define ALT_STYLE 1
 #define DIGITIGRADE_STYLE 2
 
+///Inventory slots that can be blacklisted by a species from being equipped into
+DEFINE_BITFIELD(no_equip_flags, list(
+	"EXOSUIT" = ITEM_SLOT_OCLOTHING,
+	"JUMPSUIT" = ITEM_SLOT_ICLOTHING,
+	"GLOVES" = ITEM_SLOT_GLOVES,
+	"GLASSES" = ITEM_SLOT_EYES,
+	"EARPIECES" = ITEM_SLOT_EARS,
+	"MASKS" = ITEM_SLOT_MASK,
+	"HATS" = ITEM_SLOT_HEAD,
+	"SHOES" = ITEM_SLOT_FEET,
+	"BACKPACKS" = ITEM_SLOT_BACK,
+	"TIES" = ITEM_SLOT_NECK,
+))
+
 //Flags (actual flags, fucker ^) for /obj/item/var/supports_variations_flags
 ///No alternative sprites based on bodytype
 #define CLOTHING_NO_VARIATION (1<<0)
 ///Has a sprite for digitigrade legs specifically.
 #define CLOTHING_DIGITIGRADE_VARIATION (1<<1)
 ///The sprite works fine for digitigrade legs as-is.
 #define CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON (1<<2)
-///has a sprite for monkeys
-#define CLOTHING_MONKEY_VARIATION (1<<3)
 ///Has a sprite for snouted heads specifically.
-#define CLOTHING_SNOUTED_VARIATION (1<<4)
+#define CLOTHING_SNOUTED_VARIATION (1<<3)
 
 //flags for covering body parts
 #define GLASSESCOVERSEYES (1<<0)

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
 #define islizard(A) (is_species(A, /datum/species/lizard))
 #define isashwalker(A) (is_species(A, /datum/species/lizard/ashwalker))
 #define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
-#define issimian(A) (is_species(A, /datum/species/simian)) //Monkestation Addition
+#define issimian(A) (is_species(A, /datum/species/monkey/simian)) //Monkestation Addition
 #define ispodperson(A) (is_species(A, /datum/species/pod))
 #define isflyperson(A) (is_species(A, /datum/species/fly))
 #define isjellyperson(A) (is_species(A, /datum/species/jelly))

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -113,8 +113,6 @@
 #define SPECIES_LIZARD_SILVER "silverscale"
 #define SPECIES_NIGHTMARE "nightmare"
 #define SPECIES_MONKEY "monkey"
-#define SPECIES_MONKEY_FREAK "monkey_freak"
-#define SPECIES_MONKEY_HUMAN_LEGGED "monkey_human_legged"
 #define SPECIES_MOTH "moth"
 #define SPECIES_MUSHROOM "mush"
 #define SPECIES_PLASMAMAN "plasmaman"
@@ -649,17 +647,22 @@
 // - They do not start at 0 for futureproofing
 // - They skip numbers for futureproofing as well
 // Otherwise they are completely arbitrary
-#define HUMAN_HEIGHT_DWARF 2
-#define HUMAN_HEIGHT_SHORTEST 4
-#define HUMAN_HEIGHT_SHORT 6
-#define HUMAN_HEIGHT_MEDIUM 8
-#define HUMAN_HEIGHT_TALL 10
-#define HUMAN_HEIGHT_TALLEST 12
+#define MONKEY_HEIGHT_DWARF 2
+#define MONKEY_HEIGHT_MEDIUM 4
+#define HUMAN_HEIGHT_DWARF 6
+#define HUMAN_HEIGHT_SHORTEST 8
+#define HUMAN_HEIGHT_SHORT 10
+#define HUMAN_HEIGHT_MEDIUM 12
+#define HUMAN_HEIGHT_TALL 14
+#define HUMAN_HEIGHT_TALLER 16
+#define HUMAN_HEIGHT_TALLEST 18
 
 /// Assoc list of all heights, cast to strings, to """"tuples"""""
 /// The first """tuple""" index is the upper body offset
 /// The second """tuple""" index is the lower body offset
 GLOBAL_LIST_INIT(human_heights_to_offsets, list(
+	"[MONKEY_HEIGHT_DWARF]" = list(-9, -3),
+	"[MONKEY_HEIGHT_MEDIUM]" = list(-7, -4),
 	"[HUMAN_HEIGHT_DWARF]" = list(-5, -4),
 	"[HUMAN_HEIGHT_SHORTEST]" = list(-2, -1),
 	"[HUMAN_HEIGHT_SHORT]" = list(-1, -1),

diff --git a/code/__DEFINES/research/anomalies.dm b/code/__DEFINES/research/anomalies.dm
@@ -20,18 +20,11 @@
 GLOBAL_LIST_INIT(bioscrambler_parts_blacklist, typecacheof(list(
 	/obj/item/bodypart/chest/larva,
 	/obj/item/bodypart/head/larva,
-	// Re-add the ones below this line when the bug with offset is fixed
-	/obj/item/bodypart/leg/left/monkey,
-	/obj/item/bodypart/leg/right/monkey,
-	/obj/item/bodypart/leg/left/tallboy,
-	/obj/item/bodypart/leg/right/tallboy,
 )))
 
 /// Blacklist of limb IDs which should not appear when bioscrambled, mostly because they looks awful and buggy.
 GLOBAL_LIST_INIT(bioscrambler_limb_id_blacklist, list(
 	BODYPART_ID_PSYKER,
-	SPECIES_SIMIAN,
-	SPECIES_MONKEY,
 	SPECIES_GOBLIN,
 	SPECIES_TERATOMA,
 ))

diff --git a/code/__DEFINES/species_clothing_paths.dm b/code/__DEFINES/species_clothing_paths.dm
@@ -6,10 +6,6 @@
 ///The dmi for humanoid oversuits
 #define DEFAULT_SUIT_FILE 'icons/mob/clothing/suits/default.dmi'
 
-//MONKEY PATHS
-///The dmi for monkey uniforms
-#define MONKEY_UNIFORM_FILE 'icons/mob/species/monkey/uniform.dmi'
-
 //DIGITIGRADE PATHS
 ///The dmi containing digitigrade uniforms
 #define DIGITIGRADE_UNIFORM_FILE 'monkestation/icons/mob/species/misc/uniform_digi.dmi'

diff --git a/code/__DEFINES/traits/monkestation/declarations.dm b/code/__DEFINES/traits/monkestation/declarations.dm
@@ -83,7 +83,6 @@
 #define TRAIT_HIDDEN_CLOWN		"clown_disbelief"
 #define TRAIT_HIDDEN_IMAGE		"generic-hidden-image"
 #define TRAIT_JAILBIRD			"jailbird"
-#define TRAIT_KLEPTOMANIAC		"kleptomaniac"
 #define TRAIT_LOUD_ASS			"loud_ass"
 #define TRAIT_MINING_CALLOUTS	"miner_callouts"
 #define TRAIT_PARANOIA			"paranoia"

diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
@@ -40,7 +40,7 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list) //Monkestation Addition
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list) //Monkestation Addition
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list) //Monkestation Addition
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey) //Monkestation Addition
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/anime_head, GLOB.anime_top_list) //Monkestation Addition
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/anime_middle, GLOB.anime_middle_list) //Monkestation Addition
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/anime_bottom, GLOB.anime_bottom_list) //Monkestation Addition

diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
@@ -69,6 +69,8 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/snouts, GLOB.snouts_list)
 	if(!length(GLOB.horns_list))
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/horns, GLOB.horns_list)
+	if(!length(GLOB.tails_list_monkey))
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey)
 	if(!length(GLOB.ears_list))
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, GLOB.horns_list)
 	if(!length(GLOB.frills_list))
@@ -108,8 +110,6 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
 	if(!length(GLOB.ipc_chassis_list))
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
-	if(!length(GLOB.tails_list_monkey))
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey)
 	if(!length(GLOB.anime_top_list))
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/anime_head, GLOB.anime_top_list)
 	if(!length(GLOB.anime_middle_list))
@@ -163,7 +163,7 @@
 		"ipc_screen" = pick(GLOB.ipc_screens_list), //Monkestation Addition
 		"ipc_antenna" = pick(GLOB.ipc_antennas_list), //Monkestation Addition
 		"ipc_chassis" = pick(GLOB.ipc_chassis_list), //Monkestation Addition
-		"tail_monkey" = "Chimp", //Monkestation Addition
+		"tail_monkey" = pick(GLOB.tails_list_monkey),
 		"pod_hair" = pick(GLOB.pod_hair_list),
 		"anime_top" = pick(GLOB.anime_top_list), //Monkestation Addition
 		"anime_middle" = pick(GLOB.anime_middle_list), //Monkestation Addition

diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
@@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(caps_list)
 GLOBAL_LIST_EMPTY(pod_hair_list)
 GLOBAL_LIST_EMPTY(ethereal_horns_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(ethereal_tail_list) //Monkestation Addition
-GLOBAL_LIST_EMPTY(tails_list_monkey) //Monkestation Addition
+GLOBAL_LIST_EMPTY(tails_list_monkey)
 GLOBAL_LIST_EMPTY(anime_top_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(anime_middle_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(anime_bottom_list) //Monkestation Addition
@@ -66,7 +66,6 @@ GLOBAL_LIST_INIT(color_list_ethereal, list(
 	"Cyan Blue" = "#00ffff",
 	"Dark Blue" = "#6666ff",
 	"Dark Fuschia" = "#C70064", //Monkestation Edit: #CC0066 TO #C70064
-
 	"Dark Green" = "#37835b",
 	"Dark Red" = "#9c3030",
 	"Dull Yellow" = "#fbdf56",

diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -289,7 +289,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_JAILBIRD" = TRAIT_JAILBIRD,
 		"TRAIT_JOLLY" = TRAIT_JOLLY,
 		"TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH,
-		"TRAIT_KLEPTOMANIAC" = TRAIT_KLEPTOMANIAC,
 		"TRAIT_KNOCKEDOUT" = TRAIT_KNOCKEDOUT,
 		"TRAIT_KNOW_ENGI_WIRES" = TRAIT_KNOW_ENGI_WIRES,
 		"TRAIT_KNOW_ROBO_WIRES" = TRAIT_KNOW_ROBO_WIRES,

diff --git a/code/_globalvars/~monkestation/lists/flavor_misc.dm b/code/_globalvars/~monkestation/lists/flavor_misc.dm
@@ -4,5 +4,5 @@ GLOBAL_LIST_INIT(body_heights, list(
 	"Short" = HUMAN_HEIGHT_SHORT,
 	"Normal" = HUMAN_HEIGHT_MEDIUM,
 	"Tall" = HUMAN_HEIGHT_TALL,
-	"Tallest" = HUMAN_HEIGHT_TALLEST
+	"Tallest" = HUMAN_HEIGHT_TALLEST,
 ))
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
@@ -314,6 +314,16 @@
 	filter_data[name] = copied_parameters
 	update_filters()
 
+///A version of add_filter that takes a list of filters to add rather than being individual, to limit calls to update_filters().
+/datum/proc/add_filters(list/list/filters)
+	LAZYINITLIST(filter_data)
+	for(var/list/individual_filter as anything in filters)
+		var/list/params = individual_filter["params"]
+		var/list/copied_parameters = params.Copy()
+		copied_parameters["priority"] = individual_filter["priority"]
+		filter_data[individual_filter["name"]] = copied_parameters
+	update_filters()
+
 /// Reapplies all the filters.
 /datum/proc/update_filters()
 	ASSERT(isatom(src) || isimage(src))

diff --git a/code/datums/dna.dm b/code/datums/dna.dm
@@ -204,6 +204,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 		L[DNA_TAIL_BLOCK] = construct_block(GLOB.tails_list_human.Find(features["tail_cat"]), GLOB.tails_list_human.len)
 	if(features["tail_lizard"])
 		L[DNA_LIZARD_TAIL_BLOCK] = construct_block(GLOB.tails_list_lizard.Find(features["tail_lizard"]), GLOB.tails_list_lizard.len)
+	if(features["tail_monkey"])
+		L[DNA_MONKEY_TAIL_BLOCK] = construct_block(GLOB.tails_list_monkey.Find(features["tail_monkey"]), GLOB.tails_list_monkey.len)
 	if(features["snout"])
 		L[DNA_SNOUT_BLOCK] = construct_block(GLOB.snouts_list.Find(features["snout"]), GLOB.snouts_list.len)
 	if(features["horns"])
@@ -345,6 +347,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 			set_uni_feature_block(blocknumber, construct_block(GLOB.frills_list.Find(features["frills"]), GLOB.frills_list.len))
 		if(DNA_SPINES_BLOCK)
 			set_uni_feature_block(blocknumber, construct_block(GLOB.spines_list.Find(features["spines"]), GLOB.spines_list.len))
+		if(DNA_MONKEY_TAIL_BLOCK)
+			set_uni_feature_block(blocknumber, construct_block(GLOB.tails_list_monkey.Find(features["tail_monkey"]), GLOB.tails_list_monkey.len))
 		if(DNA_EARS_BLOCK)
 			set_uni_feature_block(blocknumber, construct_block(GLOB.ears_list.Find(features["ears"]), GLOB.ears_list.len))
 		if(DNA_MOTH_WINGS_BLOCK)
@@ -622,6 +626,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 		dna.features["tail_cat"] = GLOB.tails_list_human[deconstruct_block(get_uni_feature_block(features, DNA_TAIL_BLOCK), GLOB.tails_list_human.len)]
 	if(dna.features["tail_lizard"])
 		dna.features["tail_lizard"] = GLOB.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), GLOB.tails_list_lizard.len)]
+	if(dna.features["tail_monkey"])
+		dna.features["tail_monkey"] = GLOB.tails_list_monkey[deconstruct_block(get_uni_feature_block(features, DNA_MONKEY_TAIL_BLOCK), GLOB.tails_list_monkey.len)]
 	if(dna.features["ears"])
 		dna.features["ears"] = GLOB.ears_list[deconstruct_block(get_uni_feature_block(features, DNA_EARS_BLOCK), GLOB.ears_list.len)]
 	if(dna.features["moth_wings"])

diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
@@ -489,7 +489,7 @@
 			if(QDELETED(human_mob))
 				return
 			if(prob(1))//low chance of the alternative reality returning to monkey
-				var/obj/item/organ/external/tail/simian/monkey_tail = new ()
+				var/obj/item/organ/external/tail/monkey/monkey_tail = new()
 				monkey_tail.Insert(human_mob, drop_if_replaced = FALSE)
 			var/datum/species/human_species = human_mob.dna?.species
 			if(human_species)

diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
@@ -231,10 +231,10 @@
 			if(isliving(M))
 
 				if(iscarbon(M)) //Carbon stuff
-					if(ismonkey(M))
-						M_job = "Monkey"
-					else if(ishuman(M))
+					if(ishuman(M) && M.job)
 						M_job = M.job
+					else if(ismonkey(M))
+						M_job = "Monkey"
 					else if(isalien(M)) //aliens
 						if(islarva(M))
 							M_job = "Alien larva"

diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm b/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
@@ -35,9 +35,8 @@
 			var/datum/action/cooldown/spell/pointed/untie_shoes/newer_spell = new(victim)
 			newer_spell.Grant(victim)
 			continue
-		if (!ismonkey(victim)) // Monkeys cannot yet wear clothes
-			dress_as_magic_clown(victim)
-			ADD_TRAIT(victim, TRAIT_CLUMSY, MAGIC_TRAIT) //monkestation edit: HONK HONK!
+		dress_as_magic_clown(victim)
+		ADD_TRAIT(victim, TRAIT_CLUMSY, MAGIC_TRAIT) //monkestation edit: HONK HONK!
 		if (prob(15))
 			create_vendetta(victim.mind, invoker.mind)
 

diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -86,21 +86,6 @@
 	. = ..()
 	disconnect_from_area(area_to_unregister)
 
-///adds a gas or list of gases to our filter_types. used so that the scrubber can check if its supposed to be processing after each change
-/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/add_filters(filter_or_filters)
-	if(!islist(filter_or_filters))
-		filter_or_filters = list(filter_or_filters)
-
-	for(var/gas_to_filter in filter_or_filters)
-		var/translated_gas = istext(gas_to_filter) ? gas_id2path(gas_to_filter) : gas_to_filter
-
-		if(ispath(translated_gas, /datum/gas))
-			filter_types |= translated_gas
-			continue
-
-	atmos_conditions_changed()
-	return TRUE
-
 ///remove a gas or list of gases from our filter_types.used so that the scrubber can check if its supposed to be processing after each change
 /obj/machinery/atmospherics/components/unary/vent_scrubber/proc/remove_filters(filter_or_filters)
 	if(!islist(filter_or_filters))

diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm
@@ -70,6 +70,7 @@
 	category = PREFERENCE_CATEGORY_FEATURES
 	main_feature_name = "Frills"
 	should_generate_icons = TRUE
+	relevant_external_organ = /obj/item/organ/external/frills
 
 /datum/preference/choiced/lizard_frills/init_possible_values()
 	return generate_lizard_side_shots(GLOB.frills_list, "frills")
@@ -83,6 +84,7 @@
 	category = PREFERENCE_CATEGORY_FEATURES
 	main_feature_name = "Horns"
 	should_generate_icons = TRUE
+	relevant_external_organ = /obj/item/organ/external/horns
 
 /datum/preference/choiced/lizard_horns/init_possible_values()
 	return generate_lizard_side_shots(GLOB.horns_list, "horns")
@@ -113,6 +115,7 @@
 	category = PREFERENCE_CATEGORY_FEATURES
 	main_feature_name = "Snout"
 	should_generate_icons = TRUE
+	relevant_external_organ = /obj/item/organ/external/snout
 
 /datum/preference/choiced/lizard_snout/init_possible_values()
 	return generate_lizard_side_shots(GLOB.snouts_list, "snout", include_snout = FALSE)

diff --git a/code/modules/client/preferences/species_features/moth.dm b/code/modules/client/preferences/species_features/moth.dm
@@ -4,6 +4,7 @@
 	category = PREFERENCE_CATEGORY_FEATURES
 	main_feature_name = "Antennae"
 	should_generate_icons = TRUE
+	relevant_external_organ = /obj/item/organ/external/antennae
 
 /datum/preference/choiced/moth_antennae/init_possible_values()
 	var/list/values = list()
@@ -88,6 +89,7 @@
 	category = PREFERENCE_CATEGORY_FEATURES
 	main_feature_name = "Moth wings"
 	should_generate_icons = TRUE
+	relevant_external_organ = /obj/item/organ/external/wings/moth
 
 /datum/preference/choiced/moth_wings/init_possible_values()
 	return possible_values_for_sprite_accessory_list_for_body_part(

diff --git a/code/modules/client/preferences/species_features/pod.dm b/code/modules/client/preferences/species_features/pod.dm
@@ -4,6 +4,7 @@
 	category = PREFERENCE_CATEGORY_FEATURES
 	main_feature_name = "Hairstyle"
 	should_generate_icons = TRUE
+	relevant_external_organ = /obj/item/organ/external/pod_hair
 
 /datum/preference/choiced/pod_hair/init_possible_values()
 	var/list/values = list()

diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm
@@ -30,7 +30,7 @@
 	desc = "It's a very smart uniform with a special pocket for tip."
 	icon_state = "waiter"
 	inhand_icon_state = "waiter"
-	supports_variations_flags = CLOTHING_MONKEY_VARIATION|CLOTHING_DIGITIGRADE_VARIATION
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
 
 /obj/item/clothing/under/suit/blacktwopiece
 	name = "black two piece suit"