diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 29c19a4c779..7a564e4bbb5 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -288,6 +288,8 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e worn_icon = SSgreyscale.GetColoredIconByType(greyscale_config_worn, greyscale_colors) if(greyscale_config_worn_digi) // Skyrat Edit worn_icon_digi = SSgreyscale.GetColoredIconByType(greyscale_config_worn_digi, greyscale_colors) + if(greyscale_config_worn_vox) // Skyrat Edit + worn_icon_vox = SSgreyscale.GetColoredIconByType(greyscale_config_worn_vox, greyscale_colors) if(greyscale_config_inhand_left) lefthand_file = SSgreyscale.GetColoredIconByType(greyscale_config_inhand_left, greyscale_colors) if(greyscale_config_inhand_right) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index e86978381c5..e72b78893e3 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -188,7 +188,7 @@ There are several things that need to be remembered: apply_overlay(ID_LAYER) //apply_overlay(ID_CARD_LAYER) //SKYRAT EDIT REMOVAL - Ugly ID - +/* /mob/living/carbon/human/update_inv_gloves() remove_overlay(GLOVES_LAYER) @@ -220,7 +220,7 @@ There are several things that need to be remembered: gloves_overlay.pixel_y += dna.species.offset_features[OFFSET_GLOVES][2] overlays_standing[GLOVES_LAYER] = gloves_overlay apply_overlay(GLOVES_LAYER) - +*/ //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) /* diff --git a/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm b/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm index 7d03e451b18..a2dcd715fc2 100644 --- a/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm +++ b/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm @@ -227,9 +227,6 @@ /obj/item/clothing/under/color/jumpskirt mutant_variants = NONE -/obj/item/clothing/under/dress/skirt - mutant_variants = NONE - /obj/item/clothing/under/suit/black/skirt mutant_variants = NONE diff --git a/modular_skyrat/master_files/icons/mob/body_markings/vox_secondary.dmi b/modular_skyrat/master_files/icons/mob/body_markings/vox_secondary.dmi index 4bfa940ce6b..4ae5193ee00 100644 Binary files a/modular_skyrat/master_files/icons/mob/body_markings/vox_secondary.dmi and b/modular_skyrat/master_files/icons/mob/body_markings/vox_secondary.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi index a71e52e2abe..cda275c4cf7 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/feet_gags_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/head_vox.dmi b/modular_skyrat/master_files/icons/mob/clothing/head_vox.dmi index 39d6d780c39..f65eacbfe6a 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/head_vox.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head_vox.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask_vox.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask_vox.dmi index 9a24ac3c872..3e3a074c629 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/mask_vox.dmi and b/modular_skyrat/master_files/icons/mob/clothing/mask_vox.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/back.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/back.dmi new file mode 100644 index 00000000000..a0a8445964a Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/back.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi new file mode 100644 index 00000000000..1a82a42ce33 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/ears.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/ears.dmi new file mode 100644 index 00000000000..b09c349cae9 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/ears.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/eyes.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/eyes.dmi new file mode 100644 index 00000000000..8bf2772bff8 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/eyes.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/feet.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/feet.dmi new file mode 100644 index 00000000000..8cd54c133c0 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/feet.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/hands.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/hands.dmi new file mode 100644 index 00000000000..03bd4d34c0b Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/hands.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/head.dmi new file mode 100644 index 00000000000..227db786caa Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/head.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/helmet.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/helmet.dmi new file mode 100644 index 00000000000..968de6b8de8 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/helmet.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi new file mode 100644 index 00000000000..33cbcdb9bbc Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi new file mode 100644 index 00000000000..355ef30ecbf Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/species/vox_eyes.dmi b/modular_skyrat/master_files/icons/mob/species/vox_eyes.dmi index 3ee33736c5b..317c43ee718 100644 Binary files a/modular_skyrat/master_files/icons/mob/species/vox_eyes.dmi and b/modular_skyrat/master_files/icons/mob/species/vox_eyes.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/species/vox_parts_greyscale.dmi b/modular_skyrat/master_files/icons/mob/species/vox_parts_greyscale.dmi index 88b1e6018ec..a48a508df5d 100644 Binary files a/modular_skyrat/master_files/icons/mob/species/vox_parts_greyscale.dmi and b/modular_skyrat/master_files/icons/mob/species/vox_parts_greyscale.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_facial_hair.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_facial_hair.dmi index b9405b95eb3..8a01d645b55 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_facial_hair.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_facial_hair.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_hair.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_hair.dmi index bd8b36726b3..06df80b4097 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_hair.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_hair.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_snouts.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_snouts.dmi index 9ceadcb3f34..227bc431749 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_snouts.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/vox_snouts.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/clothing.dm b/modular_skyrat/modules/customization/modules/clothing/clothing.dm index 85afd4b89c6..0398b334734 100644 --- a/modular_skyrat/modules/customization/modules/clothing/clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/clothing.dm @@ -5,6 +5,10 @@ var/icon/worn_icon_digi ///The config type to use for greyscaled worn sprites for digitigrade characters. Both this and greyscale_colors must be assigned to work. var/greyscale_config_worn_digi + /// Icon file for mob worn overlays, if the user is a vox. + var/icon/worn_icon_vox + /// 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 /obj/item/clothing var/worn_icon_taur_snake @@ -22,19 +26,22 @@ mutant_variants = STYLE_VOX /obj/item/clothing/under - mutant_variants = STYLE_DIGITIGRADE + mutant_variants = STYLE_DIGITIGRADE|STYLE_VOX /obj/item/clothing/suit - mutant_variants = STYLE_DIGITIGRADE|STYLE_TAUR_ALL + mutant_variants = STYLE_DIGITIGRADE|STYLE_TAUR_ALL|STYLE_VOX + +/obj/item/clothing/gloves + mutant_variants = STYLE_VOX /obj/item/clothing/shoes - mutant_variants = STYLE_DIGITIGRADE + mutant_variants = STYLE_DIGITIGRADE|STYLE_VOX /obj/item/clothing/suit/armor - mutant_variants = NONE + mutant_variants = STYLE_VOX /obj/item/clothing/under/color/jumpskirt - mutant_variants = NONE + mutant_variants = STYLE_VOX /obj/item/clothing/under/rank/engineering/chief_engineer/skirt mutant_variants = NONE @@ -55,7 +62,7 @@ mutant_variants = NONE /obj/item/clothing/under/dress - mutant_variants = NONE + mutant_variants = STYLE_VOX /obj/item/clothing/under/rank/security/officer/skirt mutant_variants = NONE diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm index aae3d648b92..8f18ac6997b 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm @@ -29,7 +29,9 @@ else if(w_uniform.mutant_variants & S.alt_taur_mode) applied_style = S.alt_taur_mode if(!applied_style) - if((DIGITIGRADE in dna.species.species_traits) && (w_uniform.mutant_variants & STYLE_DIGITIGRADE)) + if((w_uniform.mutant_variants & STYLE_VOX) && dna.species.id == "vox") + applied_style = STYLE_VOX + else if((DIGITIGRADE in dna.species.species_traits) && (w_uniform.mutant_variants & STYLE_DIGITIGRADE)) applied_style = STYLE_DIGITIGRADE var/x_override @@ -42,6 +44,8 @@ icon_file = w_uniform.worn_icon_taur_hoof || 'modular_skyrat/master_files/icons/mob/clothing/uniform_taur_hoof.dmi' if(STYLE_TAUR_PAW) icon_file = w_uniform.worn_icon_taur_paw || 'modular_skyrat/master_files/icons/mob/clothing/uniform_taur_paw.dmi' + if(STYLE_VOX) + icon_file = w_uniform.worn_icon_vox || 'modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi' if(applied_style & STYLE_TAUR_ALL) x_override = 64 @@ -90,7 +94,9 @@ else if(wear_suit.mutant_variants & S.alt_taur_mode) applied_style = S.alt_taur_mode if(!applied_style) - if((DIGITIGRADE in dna.species.species_traits) && (wear_suit.mutant_variants & STYLE_DIGITIGRADE)) + if((wear_suit.mutant_variants & STYLE_VOX) && dna.species.id == "vox") + applied_style = STYLE_VOX + else if((DIGITIGRADE in dna.species.species_traits) && (wear_suit.mutant_variants & STYLE_DIGITIGRADE)) applied_style = STYLE_DIGITIGRADE var/x_override @@ -103,6 +109,8 @@ icon_file = wear_suit.worn_icon_taur_hoof || 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_hoof.dmi' if(STYLE_TAUR_PAW) icon_file = wear_suit.worn_icon_taur_paw || 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + if(STYLE_VOX) + icon_file = wear_suit.worn_icon_vox || 'modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi' if(applied_style & STYLE_TAUR_ALL) x_override = 64 @@ -141,8 +149,11 @@ update_observer_view(shoes,1) var/icon_file = shoes.worn_icon var/applied_styles = NONE - if((DIGITIGRADE in dna.species.species_traits) && (shoes.mutant_variants & STYLE_DIGITIGRADE)) - applied_styles |= STYLE_DIGITIGRADE + if((shoes.mutant_variants & STYLE_VOX) && dna.species.id == "vox") + applied_styles = STYLE_VOX + icon_file = shoes.worn_icon_vox || 'modular_skyrat/master_files/icons/mob/clothing/species/vox/feet.dmi' + else if((DIGITIGRADE in dna.species.species_traits) && (shoes.mutant_variants & STYLE_DIGITIGRADE)) + applied_styles = STYLE_DIGITIGRADE icon_file = shoes.worn_icon_digi || 'modular_skyrat/master_files/icons/mob/clothing/feet_digi.dmi' overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/clothing/feet.dmi', override_icon = icon_file, mutant_styles = applied_styles) @@ -154,6 +165,45 @@ apply_overlay(SHOES_LAYER) +/mob/living/carbon/human/update_inv_gloves() + remove_overlay(GLOVES_LAYER) + + if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1] + inv.update_appearance() + + if(!gloves && blood_in_hands && (num_hands > 0) && !(NOBLOODOVERLAY in dna.species.species_traits)) + var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER) + if(num_hands < 2) + if(has_left_hand(FALSE)) + bloody_overlay.icon_state = "bloodyhands_left" + else if(has_right_hand(FALSE)) + bloody_overlay.icon_state = "bloodyhands_right" + + overlays_standing[GLOVES_LAYER] = bloody_overlay + + var/mutable_appearance/gloves_overlay = overlays_standing[GLOVES_LAYER] + if(gloves) + gloves.screen_loc = ui_gloves + if(client && hud_used?.hud_shown) + if(hud_used.inventory_shown) + client.screen += gloves + update_observer_view(gloves,1) + + var/icon_file = gloves.worn_icon + var/applied_styles = NONE + if((gloves.mutant_variants & STYLE_VOX) && dna.species.id == "vox") + applied_styles = STYLE_VOX + icon_file = gloves.worn_icon_vox || 'modular_skyrat/master_files/icons/mob/clothing/species/vox/hands.dmi' + + overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(default_layer = GLOVES_LAYER, default_icon_file = 'icons/mob/clothing/hands.dmi', override_icon = icon_file, mutant_styles = applied_styles) + gloves_overlay = overlays_standing[GLOVES_LAYER] + if(OFFSET_GLOVES in dna.species.offset_features) + gloves_overlay.pixel_x += dna.species.offset_features[OFFSET_GLOVES][1] + gloves_overlay.pixel_y += dna.species.offset_features[OFFSET_GLOVES][2] + overlays_standing[GLOVES_LAYER] = gloves_overlay + apply_overlay(GLOVES_LAYER) + /obj/item/proc/build_worn_icon(default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, override_state = null, override_icon = null, override_x_center = null, override_y_center = null, mutant_styles = NONE) //Find a valid icon_state from variables+arguments @@ -262,7 +312,7 @@ var/applied_style = NONE if(dna.species.id == SPECIES_VOX) applied_style |= STYLE_VOX - icon_file = 'modular_skyrat/master_files/icons/mob/clothing/eyes_vox.dmi' + icon_file = glasses.worn_icon_vox || 'modular_skyrat/master_files/icons/mob/clothing/species/vox/eyes.dmi' overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(default_layer = GLASSES_LAYER, default_icon_file = 'icons/mob/clothing/eyes.dmi', override_icon = icon_file, mutant_styles = applied_style) var/mutable_appearance/glasses_overlay = overlays_standing[GLASSES_LAYER] diff --git a/modular_skyrat/modules/nanotrasen_rep/code/clothing.dm b/modular_skyrat/modules/nanotrasen_rep/code/clothing.dm index 7e3416f57a8..4f759aa4403 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/clothing.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/clothing.dm @@ -50,7 +50,7 @@ /obj/item/clothing/head/nanotrasen_representative/beret name = "nanotrasen representative's beret" - desc = "A beret made from durathread, it has an insignia on the front denoting the rank of a Nanotrasen Representative." + desc = "A beret made from durathread, it has an insignia on the front denoting the rank of a Nanotrasen Representative." greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#3F3C40#155326" diff --git a/modular_skyrat/modules/vox_sprites/code/datums/greyscale/config_types/greyscale_configs.dm b/modular_skyrat/modules/vox_sprites/code/datums/greyscale/config_types/greyscale_configs.dm new file mode 100644 index 00000000000..8a591258a03 --- /dev/null +++ b/modular_skyrat/modules/vox_sprites/code/datums/greyscale/config_types/greyscale_configs.dm @@ -0,0 +1,27 @@ +/datum/greyscale_config/jumpsuit_worn/vox + name = "Worn Jumpsuit - Vox" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + +/datum/greyscale_config/jumpsuit_prison_worn/vox + name = "Worn Prison Jumpsuit - Vox" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + +/datum/greyscale_config/sneakers_worn/vox + name = "Worn Sneakers - Vox" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + +/datum/greyscale_config/sneakers_orange_worn/vox + name = "Worn Orange Sneakers - Vox" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + +/datum/greyscale_config/beret/worn/vox + name = "Beret Worn - Vox" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + +/datum/greyscale_config/beret_badge/worn/vox + name = "Beret With Badge Worn - Vox" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' + +/datum/greyscale_config/beret_badge_fancy/worn/vox + name = "Beret With Fancy Badge Worn - Vox" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi' diff --git a/modular_skyrat/modules/vox_sprites/code/modules/clothing/head/head.dm b/modular_skyrat/modules/vox_sprites/code/modules/clothing/head/head.dm new file mode 100644 index 00000000000..3436d92e5ee --- /dev/null +++ b/modular_skyrat/modules/vox_sprites/code/modules/clothing/head/head.dm @@ -0,0 +1,74 @@ +/obj/item/clothing/head/collectable/beret + greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox + +/obj/item/clothing/head/collectable/flatcap + greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox + +/obj/item/clothing/head/frenchberet + greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox + +/obj/item/clothing/head/flatcap + greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox + +/obj/item/clothing/head/caphat/beret + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret + greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox + +/obj/item/clothing/head/hos/beret + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/sec + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/science + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/durathread + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/centcom_formal + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/sec/navywarden + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge_fancy/worn/vox + +/obj/item/clothing/head/beret/medical + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/engi + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/atmos + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/cargo/qm + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/hopcap/beret + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/blueshield + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/flatcap + greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox + +/obj/item/clothing/head/frenchberet + greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox + +/obj/item/clothing/head/sec/navywarden/syndicate + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/nanotrasen_representative/beret + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/sec/peacekeeper/armadyne + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge_fancy/worn/vox + +/obj/item/clothing/head/beret/sec/peacekeeper + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox + +/obj/item/clothing/head/beret/sec/navywarden/peacekeeper + greyscale_config_worn_vox = /datum/greyscale_config/beret_badge_fancy/worn/vox diff --git a/modular_skyrat/modules/vox_sprites/code/modules/clothing/shoes/sneakers.dm b/modular_skyrat/modules/vox_sprites/code/modules/clothing/shoes/sneakers.dm new file mode 100644 index 00000000000..fe959de8c37 --- /dev/null +++ b/modular_skyrat/modules/vox_sprites/code/modules/clothing/shoes/sneakers.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/shoes/sneakers + greyscale_config_worn_vox = /datum/greyscale_config/sneakers_worn_vox + +/obj/item/clothing/shoes/sneakers/orange + greyscale_config_worn_vox = /datum/greyscale_config/sneakers_orange_worn_vox diff --git a/modular_skyrat/modules/vox_sprites/code/modules/clothing/under/color.dm b/modular_skyrat/modules/vox_sprites/code/modules/clothing/under/color.dm new file mode 100644 index 00000000000..12252fa426f --- /dev/null +++ b/modular_skyrat/modules/vox_sprites/code/modules/clothing/under/color.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/under/color + greyscale_config_worn_vox = /datum/greyscale_config/jumpsuit_worn/vox diff --git a/modular_skyrat/modules/vox_sprites/code/modules/clothing/under/jobs/security.dm b/modular_skyrat/modules/vox_sprites/code/modules/clothing/under/jobs/security.dm new file mode 100644 index 00000000000..da93a53a43f --- /dev/null +++ b/modular_skyrat/modules/vox_sprites/code/modules/clothing/under/jobs/security.dm @@ -0,0 +1,2 @@ +/obj/item/clothing/under/rank/prisoner + greyscale_config_worn_vox = /datum/greyscale_config/jumpsuit_prison_worn/vox diff --git a/modular_skyrat/modules/vox_sprites/readme.md b/modular_skyrat/modules/vox_sprites/readme.md new file mode 100644 index 00000000000..e8fca7bb831 --- /dev/null +++ b/modular_skyrat/modules/vox_sprites/readme.md @@ -0,0 +1,53 @@ +https://github.com/Skyrat-SS13/Skyrat-tg/pull/7522 + +## Title: Vox sprite fixes, updates, and additions + +MODULE ID: VOX_SPRITES + +### Description: + +Ports the Vox species and clothing sprites from Paradise plus some new GAGS-compatible ones, and adds code to support them. + +### TG Proc/File Changes: + +- APPEND: code/game/objects/items.dm > /obj/item/update_greyscale() +- APPEND: code/modules/mob/living/carbon/human/human_update_icons.dm > /mob/living/carbon/human/update_inv_gloves() + +### Defines: + +- N/A + +### Master file additions + +Species sprites: +- modular_skyrat/master_files/icons/mob/body_markings/vox_secondary.dmi #CHANGE +- modular_skyrat/master_files/icons/mob/species/vox_eyes.dmi #CHANGE +- modular_skyrat/master_files/icons/mob/species/vox_parts_greyscale.dmi #CHANGE +- modular_skyrat/master_files/icons/mob/sprite_accessory/vox_facial_hair.dmi #CHANGE +- modular_skyrat/master_files/icons/mob/sprite_accessory/vox_hair.dmi #CHANGE +- modular_skyrat/master_files/icons/mob/sprite_accessory/vox_snouts.dmi #CHANGE + +Clothing sprites: +- modular_skyrat/master_files/icons/mob/clothing/head_vox.dmi #CHANGE +- modular_skyrat/master_files/icons/mob/clothing/mask_vox.dmi #CHANGE +- modular_skyrat/master_files/icons/mob/clothing/species/vox/back.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/color_gags_vox.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/ears.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/eyes.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/feet.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/hands.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/head.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/helmet.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi #ADD +- modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi #ADD + +### Included files that are not contained in this module: + +- N/A + +### Credits: + +Vox species and clothing sprites - Paradise Station + +PR Code - SabreML +PR Sprite implementation & GAGS compatibility - CandleJaxx