diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5f21cf2f975..b13d7d1a184 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -360,6 +360,8 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons worn_icon_digi = SSgreyscale.GetColoredIconByType(greyscale_config_worn_digi, greyscale_colors) if(greyscale_config_worn_vox) worn_icon_vox = SSgreyscale.GetColoredIconByType(greyscale_config_worn_vox, greyscale_colors) + if(greyscale_config_worn_better_vox) + worn_icon_better_vox = SSgreyscale.GetColoredIconByType(greyscale_config_worn_better_vox, greyscale_colors) if(greyscale_config_worn_teshari) worn_icon_teshari = SSgreyscale.GetColoredIconByType(greyscale_config_worn_teshari, greyscale_colors) if(greyscale_config_worn_taur_snake) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png index ef07c104ce8..6664a8b84c2 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png differ diff --git a/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm b/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm index f212447aa47..445fef86dd1 100644 --- a/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm +++ b/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm @@ -14,6 +14,8 @@ var/greyscale_config_worn_teshari /// The config type to use for greyscaled worn sprites for vox characters. Both this and greyscale_colors must be assigned to work. var/greyscale_config_worn_vox + /// The config type to use for greyscaled worn sprites for vox primalis characters. Both this and greyscale_colors must be assigned to work. + var/greyscale_config_worn_better_vox var/worn_icon_taur_snake var/worn_icon_taur_paw diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index c60e438a220..7df8a6fcf15 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -351,6 +351,18 @@ name = "Worn Jumpsuit - Vox" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' +/datum/greyscale_config/jumpsuit_prison_worn/vox + name = "Worn Prison Jumpsuit - Vox" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' + +/datum/greyscale_config/jumpsuit_worn/better_vox + name = "Worn Jumpsuit - Better Vox" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi' + +/datum/greyscale_config/jumpsuit_prison_worn/better_vox + name = "Worn Prison Jumpsuit - Better Vox" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi' + /datum/greyscale_config/jumpsuit_worn/taur/snake name = "Worn Jumpsuit - Naga" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_snake.dmi' @@ -359,10 +371,6 @@ name = "Worn Prison Jumpsuit - Naga" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_snake.dmi' -/datum/greyscale_config/jumpsuit_prison_worn/vox - name = "Worn Prison Jumpsuit - Vox" - icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' - /datum/greyscale_config/jumpsuit_worn/teshari name = "Worn Jumpsuit - Teshari" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_teshari.dmi' diff --git a/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi b/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi new file mode 100644 index 00000000000..219995affaf Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi differ diff --git a/modular_skyrat/modules/better_vox/code/vox_clothing.dm b/modular_skyrat/modules/better_vox/code/vox_clothing.dm new file mode 100644 index 00000000000..f0b5fab80f2 --- /dev/null +++ b/modular_skyrat/modules/better_vox/code/vox_clothing.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/under/color + greyscale_config_worn_better_vox = /datum/greyscale_config/jumpsuit_worn/better_vox + +/obj/item/clothing/under/rank/prisoner + greyscale_config_worn_better_vox = /datum/greyscale_config/jumpsuit_prison_worn/better_vox diff --git a/tgstation.dme b/tgstation.dme index fb63ea10942..eee1ab5228e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5036,6 +5036,7 @@ #include "modular_skyrat\modules\barsigns\code\barsigns.dm" #include "modular_skyrat\modules\better_vox\code\vox_bodycolor.dm" #include "modular_skyrat\modules\better_vox\code\vox_bodyparts.dm" +#include "modular_skyrat\modules\better_vox\code\vox_clothing.dm" #include "modular_skyrat\modules\better_vox\code\vox_species.dm" #include "modular_skyrat\modules\better_vox\code\vox_sprite_accessories.dm" #include "modular_skyrat\modules\biohazard_blob\code\_biohazard_blob_defines.dm"