diff --git a/code/modules/clothing/shoes/jobs.dm b/code/modules/clothing/shoes/jobs.dm index 5618fa581e3..c1c2f4e39aa 100644 --- a/code/modules/clothing/shoes/jobs.dm +++ b/code/modules/clothing/shoes/jobs.dm @@ -9,6 +9,7 @@ species_restricted = null drop_sound = 'sound/items/drop/rubber.ogg' pickup_sound = 'sound/items/pickup/rubber.ogg' + sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi') /obj/item/clothing/shoes/jackboots name = "black boots" @@ -42,8 +43,7 @@ desc = "Modified pair of boots, particularly friendly to those species whose toes hold claws." icon_state = "jackboots_toeless" species_restricted = null - sprite_sheets = list( - BODYTYPE_TAJARA = 'icons/mob/species/tajaran/shoes.dmi') + sprite_sheets = list(BODYTYPE_TAJARA = 'icons/mob/species/tajaran/shoes.dmi') /obj/item/clothing/shoes/jackboots/toeless/knee name = "knee-high toeless black boots" @@ -80,8 +80,7 @@ desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws." icon_state = "workboots_toeless" species_restricted = null - sprite_sheets = list( - BODYTYPE_TAJARA = 'icons/mob/species/tajaran/shoes.dmi') + sprite_sheets = list(BODYTYPE_TAJARA = 'icons/mob/species/tajaran/shoes.dmi') /obj/item/clothing/shoes/workboots/grey name = "grey workboots" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index e9771178c3b..89b7031f134 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -68,7 +68,8 @@ name = "sandals" icon_state = "sandals" species_restricted = null - body_parts_covered = 0 + body_parts_covered = FALSE + sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi') /obj/item/clothing/shoes/sandal/marisa desc = "A pair of magic, black shoes." @@ -82,12 +83,14 @@ desc = "A pair of foam flip flops. For those not afraid to show a little ankle." icon_state = "thongsandal" item_state = "thongsandal" + sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi') obj/item/clothing/shoes/sandal/clogs name = "plastic clogs" desc = "A pair of plastic clog shoes." icon_state = "clogs" item_state = "clogs" + sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi') /obj/item/clothing/shoes/clown_shoes desc = "The prankster's standard-issue clowning shoes. Damn they're huge!" @@ -287,9 +290,9 @@ obj/item/clothing/shoes/sandal/clogs icon_state = "carpslippers" species_restricted = null silent = TRUE - cold_protection = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE + sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi') /obj/item/clothing/shoes/iac name = "IAC shoes" diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm index 8cb497293ee..405a3bd61cf 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm @@ -26,6 +26,10 @@ age_max = 80 + damage_overlays = 'icons/mob/human_races/masks/dam_tajara.dmi' + damage_mask = 'icons/mob/human_races/masks/dam_mask_tajara.dmi' + blood_mask = 'icons/mob/human_races/masks/blood_tajara.dmi' + num_alternate_languages = 2 secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_YA_SSA) name_language = LANGUAGE_SIIK_MAAS diff --git a/html/changelogs/wickedcybs_shoetweak.yml b/html/changelogs/wickedcybs_shoetweak.yml new file mode 100644 index 00000000000..51e507342cc --- /dev/null +++ b/html/changelogs/wickedcybs_shoetweak.yml @@ -0,0 +1,7 @@ +author: WickedCybs + +delete-after: True + +changes: + - tweak: "Practically all footwear that taj could wear have been adjusted to better fit them. Same for voidsuits, hardsuit boot segments. This is hopefully the last time I ever have to adjust something like this. Minor issues like exposed body parts were fixed along the way for some items." + - tweak: "Taj have their own blood overlays and damage overlays now to make it easier to reflect certain things on the unique parts of their sprite now." diff --git a/icons/mob/human_races/masks/blood_tajara.dmi b/icons/mob/human_races/masks/blood_tajara.dmi new file mode 100644 index 00000000000..380ba1c07be Binary files /dev/null and b/icons/mob/human_races/masks/blood_tajara.dmi differ diff --git a/icons/mob/human_races/masks/dam_mask_tajara.dmi b/icons/mob/human_races/masks/dam_mask_tajara.dmi new file mode 100644 index 00000000000..c846d657174 Binary files /dev/null and b/icons/mob/human_races/masks/dam_mask_tajara.dmi differ diff --git a/icons/mob/human_races/masks/dam_tajara.dmi b/icons/mob/human_races/masks/dam_tajara.dmi new file mode 100644 index 00000000000..c4bed6bd13f Binary files /dev/null and b/icons/mob/human_races/masks/dam_tajara.dmi differ diff --git a/icons/mob/species/tajaran/gloves.dmi b/icons/mob/species/tajaran/gloves.dmi index c21d66a95b6..3728837f19f 100644 Binary files a/icons/mob/species/tajaran/gloves.dmi and b/icons/mob/species/tajaran/gloves.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 5ec86298684..52de92a1ea2 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/shoes.dmi b/icons/mob/species/tajaran/shoes.dmi index 63634085222..184cfc13cd9 100644 Binary files a/icons/mob/species/tajaran/shoes.dmi and b/icons/mob/species/tajaran/shoes.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index 0943918ac5c..ad403275dcd 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index bdc3e0ba4ab..f0373a5ab87 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/obj/clothing/species/tajaran/suits.dmi index a52f41e3f14..ab3a1184f8b 100644 Binary files a/icons/obj/clothing/species/tajaran/suits.dmi and b/icons/obj/clothing/species/tajaran/suits.dmi differ