Adding grayscale sprites for Moff + bugfix

modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm

@@ -338,7 +338,7 @@
 
 /datum/sprite_accessory/wings/moth/featherful // Is actually 'feathery' on upstream
 	name = "Moth (Featherful)"
-	icon_state = "featherful"
+	icon_state = "feathery"
 
 /datum/sprite_accessory/wings/moth/firewatch
 	name = "Moth (Firewatch)"

modular_nova/modules/customization/modules/surgery/organs/moth_antennae.dm

@@ -1,3 +1,12 @@
 /obj/item/organ/antennae
 	mutantpart_key = FEATURE_MOTH_ANTENNAE
 	mutantpart_info = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF"))
+
+/datum/bodypart_overlay/mutant/antennae
+	color_source = ORGAN_COLOR_OVERRIDE
+
+/datum/bodypart_overlay/mutant/antennae/get_global_feature_list()
+	return SSaccessories.sprite_accessories[FEATURE_MOTH_ANTENNAE]
+
+/datum/bodypart_overlay/mutant/antennae/override_color(rgb_value)
+	return draw_color

tff_modular/modules/moth_greyscale/sprite_accesories/moth_antennae.dm

@@ -0,0 +1,71 @@
+/datum/sprite_accessory/moth_antennae/greyscale
+	icon = 'tff_modular/modules/moth_greyscale/sprites/moth_antennae.dmi'
+	color_src = USE_MATRIXED_COLORS
+
+/datum/sprite_accessory/moth_antennae/greyscale/browngrey
+	name = "Brown (Greyscale)"
+	icon_state = "browngrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/mothragrey
+	name = "Mothra (Greyscale)"
+	icon_state = "mothragrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/plaingrey
+	name = "Plain (Greyscale)"
+	icon_state = "plaingrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/firewatchgrey
+	name = "Firewatch (Greyscale)"
+	icon_state = "firewatchgrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/regalgrey
+	name = "Regal (Greyscale)"
+	icon_state = "regalgrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/poisongrey
+	name = "Poison (Greyscale)"
+	icon_state = "poisongrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/featherygrey
+	name = "Feathery (Greyscale)"
+	icon_state = "featherygrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/rosygrey
+	name = "Rosy (Greyscale)"
+	icon_state = "rosygrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/junglegrey
+	name = "Jungle (Greyscale)"
+	icon_state = "junglegrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/moffragrey
+	name = "Moffra (Greyscale)"
+	icon_state = "moffragrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/oakwormgrey
+	name = "Oakworm (Greyscale)"
+	icon_state = "oakwormgrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/plasmafiregrey
+	name = "Plasmafire (Greyscale)"
+	icon_state = "plasmafiregrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/plasmafiregrey
+	name = "Plasmafire (Greyscale)"
+	icon_state = "plasmafiregrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/royalgrey
+	name = "Royal (Greyscale)"
+	icon_state = "royalgrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/loversgrey
+	name = "Lovers (Greyscale)"
+	icon_state = "loversgrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/whiteflygrey
+	name = "Whitefly (Greyscale)"
+	icon_state = "whiteflygrey"
+
+/datum/sprite_accessory/moth_antennae/greyscale/witchwinggrey
+	name = "Witchwing (Greyscale)"
+	icon_state = "witchwinggrey"

tff_modular/modules/moth_greyscale/sprite_accesories/wings.dm

@@ -0,0 +1,105 @@
+/datum/sprite_accessory/wings/moth/bluespace
+	name = "Moth (Bluespace)"
+	icon = 'tff_modular/modules/moth_greyscale/sprites/moth_wings.dmi'
+	icon_state = "bluespace"
+
+/datum/sprite_accessory/wings/moth/strawberry
+	name = "Moth (Strawberry)"
+	icon = 'tff_modular/modules/moth_greyscale/sprites/moth_wings.dmi'
+	icon_state = "strawberry"
+
+/datum/sprite_accessory/wings/moth/clockwork
+	name = "Moth (Clockwork)"
+	icon = 'tff_modular/modules/moth_greyscale/sprites/moth_wings.dmi'
+	icon_state = "clockwork"
+
+/datum/sprite_accessory/wings/moth/greyscale
+	feature_key_override = FEATURE_WINGS //Без этого грейскейлы не работают || I don't know why it doesn't work without it
+	icon = 'tff_modular/modules/moth_greyscale/sprites/moth_wings.dmi'
+	dimension_x = 32
+	dimension_y = 32
+	color_src = USE_MATRIXED_COLORS
+
+/datum/sprite_accessory/wings/moth/greyscale/citheroniagrey
+	name = "Moth (Citheronia Greyscale)"
+	icon_state = "citheroniagrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/whiteflygrey
+	name = "Moth (Whitefly Greyscale)"
+	icon_state = "whiteflygrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/browngrey
+	name = "Moth (Brown Greyscale)"
+	icon_state = "browngrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/deathheadgrey
+	name = "Moth (Deathshead Greyscale)"
+	icon_state = "deathheadgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/atlasgrey
+	name = "Moth (Atlas Greyscale)"
+	icon_state = "atlasgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/poisongrey
+	name = "Moth (Poison Greyscale)"
+	icon_state = "poisongrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/raggedgrey
+	name = "Moth (Ragged Greyscale)"
+	icon_state = "raggedgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/featherygrey
+	name = "Moth (Feathery Greyscale)"
+	icon_state = "featherygrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/firewatchgrey
+	name = "Moth (Firewatch Greyscale)"
+	icon_state = "firewatchgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/loversgrey
+	name = "Moth (Lovers Greyscale)"
+	icon_state = "loversgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/junglegrey
+	name = "Moth (Jungle Greyscale)"
+	icon_state = "junglegrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/rosygrey
+	name = "Moth (Rosy Greyscale)"
+	icon_state = "rosygrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/moffragrey
+	name = "Moth (Moffra Greyscale)"
+	icon_state = "moffragrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/oakwormgrey
+	name = "Moth (Oakworm Greyscale)"
+	icon_state = "oakwormgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/plasmafiregrey
+	name = "Moth (Plasmafire Greyscale)"
+	icon_state = "plasmafiregrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/monarchgrey
+	name = "Moth (Monarch Greyscale)"
+	icon_state = "monarchgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/royalgrey
+	name = "Moth (Royal Greyscale)"
+	icon_state = "royalgrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/plaingrey
+	name = "Moth (Plain Greyscale)"
+	icon_state = "plaingrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/lunagrey
+	name = "Moth (Luna Greyscale)"
+	icon_state = "lunagrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/whiteflygrey
+	name = "Moth (Whitefly Greyscale)"
+	icon_state = "whiteflygrey"
+
+/datum/sprite_accessory/wings/moth/greyscale/witchwinggrey
+	name = "Moth (Witchwing Greyscale)"
+	icon_state = "witchwinggrey"

tgstation.dme

@@ -9642,6 +9642,8 @@
 #include "tff_modular\modules\map_vote_fair\map_vote.dm"
 #include "tff_modular\modules\modular_automapper\automapper.dm"
 #include "tff_modular\modules\modular_automapper\replacer.dm"
+#include "tff_modular\modules\moth_greyscale\sprite_accesories\moth_antennae.dm"
+#include "tff_modular\modules\moth_greyscale\sprite_accesories\wings.dm"
 #include "tff_modular\modules\nabbers\code\_nabbers.dm"
 #include "tff_modular\modules\nabbers\code\nabber_bodyparts.dm"
 #include "tff_modular\modules\nabbers\code\nabber_bolaimmunity.dm"