diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm index eebbb59f376..7bbf8cfd090 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm @@ -88,6 +88,7 @@ path = /obj/item/clothing/accessory/badge/passcard/scarab whitelisted = list(SPECIES_HUMAN_OFFWORLD) sort_category = "Xenowear - Human" + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION origin_restriction = list(/singleton/origin_item/origin/coa_spacer) /datum/gear/accessory/offworlder_mantle diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index fbf347080fd..a4e493f9b34 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -781,11 +781,12 @@ update_clothing_icon() /obj/item/clothing/mask/proc/adjust_sprites() - if(hanging) - icon_state = "[icon_state]down" - else - icon_state = initial(icon_state) - item_state = initial(icon_state) + if(hanging) + icon_state = "[icon_state]down" + item_state = "[item_state]down" + else + icon_state = initial(icon_state) + item_state = initial(item_state) /obj/item/clothing/mask/proc/lower_message(mob/user) user.visible_message("[user] pulls \the [src] down to hang around their neck.", SPAN_NOTICE("You pull \the [src] down to hang around your neck.")) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 85c1e840115..cc7b4988506 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -277,8 +277,12 @@ /obj/item/clothing/gloves/offworlder name = "starmitts" desc = "Thick arm warmers and mittens that reach past the elbow." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "starmittens" item_state = "starmittens" + build_from_parts = TRUE + worn_overlay = "over" /obj/item/clothing/gloves/ballistic name = "ballistic gauntlet" diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index c88e24f6553..c49546f378a 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -23,14 +23,16 @@ /obj/item/clothing/mask/breath/offworlder name = "overmask" desc = "A large breath mask with cushioning." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "breathcover" - item_state = "cloth" + item_state = "breathcover" /obj/item/clothing/mask/breath/offworlder/jagmask name = "jagmask" desc = "A two-piece, jagged filtering mask meant to conform to one's face comfortably." icon_state = "jagmask" - item_state = "muzzle" + item_state = "jagmask" /obj/item/clothing/mask/breath/skrell name = "skrellian gill cover" diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 79a227d749b..2a396132c1c 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -198,9 +198,11 @@ name = "scarab scarf" desc = "Usually a treasured item, these spider-silk scarves are seen passed down by generations of Scarabs." desc_extended = "Scarves like these are passed down from family members in the Scarab fleets as a coming of age ritual, typically given to children to mark them as worthy of setting off on their own." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "pioneer_scarf" - item_flags = FLEXIBLEMATERIAL item_state = "pioneer_scarf" + item_flags = FLEXIBLEMATERIAL w_class = ITEMSIZE_SMALL body_parts_covered = FACE @@ -208,6 +210,6 @@ name = "starveil" desc = "A thin holographic veil meant to cover the face, intended to block out light." icon_state = "starveil" - item_state = "muzzle" + item_state = "starveil" down_body_parts_covered = null adjustable = TRUE diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index dcef6997a61..154a3ae6f3f 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -799,6 +799,8 @@ /obj/item/clothing/accessory/offworlder name = "venter assembly" desc = "A series of complex tubing meant to dissipate heat from the skin passively." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "venter" item_state = "venter" slot = ACCESSORY_SLOT_CAPE diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index db9d3acc6dd..6449334f62f 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -48,6 +48,8 @@ /obj/item/clothing/accessory/armband/offworlder name = "science exo-stellar ribbon" desc = "Durable cloth meant to be worn over or attached to the chest pieces of the ESS modules. This one is purple." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "ribbon_sci" slot = ACCESSORY_SLOT_CAPE flippable = 0 diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 2d9810b4ad8..5b8476dff5c 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -440,8 +440,12 @@ desc = "A dagger issued as a writ of passage to Scarabs abroad." desc_extended = "By Scarab traditions, one should show their weapon to non-Scarabs upon first meeting. This dagger, sheathed in hakhma chitin, is often given to noncombatants, the Released, or the young, so they \ may meet with outsiders with at least a blade between them. Despite this, the blade is sealed tightly within the scabbard." - icon_state = "passcard_scarab" - item_state = "passcard_scarab" + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + icon_state = "passblade_scarab" + item_state = "passblade_scarab" + worn_overlay = "over" + contained_sprite = TRUE + build_from_parts = TRUE slot_flags = SLOT_HOLSTER w_class = ITEMSIZE_SMALL diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index a4b6685bd07..bfd4df981c1 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -50,39 +50,57 @@ /obj/item/clothing/accessory/storage/webbing name = "webbing" desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden." + icon = 'icons/obj/item/clothing/accessory/webbing.dmi' + contained_sprite = TRUE icon_state = "webbing" + item_state = "webbing" /obj/item/clothing/accessory/storage/webbing/grayscale icon_state = "webbing_g" + item_state = "webbing_g" /obj/item/clothing/accessory/storage/black_vest name = "black webbing vest" desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in hands." + icon = 'icons/obj/item/clothing/accessory/webbing.dmi' + contained_sprite = TRUE icon_state = "vest_black" + item_state = "vest_black" slots = 5 /obj/item/clothing/accessory/storage/brown_vest name = "brown webbing vest" desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands." + icon = 'icons/obj/item/clothing/accessory/webbing.dmi' + contained_sprite = TRUE icon_state = "vest_brown" + item_state = "vest_brown" slots = 5 /obj/item/clothing/accessory/storage/white_vest name = "white webbing vest" desc = "Durable white synthcotton vest with lots of pockets to carry essentials." + icon = 'icons/obj/item/clothing/accessory/webbing.dmi' + contained_sprite = TRUE icon_state = "vest_white" + item_state = "vest_white" slots = 5 /obj/item/clothing/accessory/storage/webbingharness name = "webbing harness" desc = "Durable mess of synthcotton belts and buckles. Has some pouches, but not a lot." + icon = 'icons/obj/item/clothing/accessory/webbing.dmi' + contained_sprite = TRUE icon_state = "vest_harness" + item_state = "vest_harness" /obj/item/clothing/accessory/storage/webbingharness/alt icon_state = "vest_harness_alt" + item_state = "vest_harness_alt" /obj/item/clothing/accessory/storage/webbingharness/pouches icon_state = "vest_harness_pouches" + item_state = "vest_harness_pouches" /obj/item/clothing/accessory/storage/webbingharness/pouches/ert desc = "Durable mess of synthcotton belts and buckles. To better satiate the need for storage and stability." @@ -90,12 +108,15 @@ /obj/item/clothing/accessory/storage/webbingharness/grayscale icon_state = "vest_harness_g" + item_state = "vest_harness_g" /obj/item/clothing/accessory/storage/webbingharness/alt/grayscale icon_state = "vest_harness_alt_g" + item_state = "vest_harness_alt_g" /obj/item/clothing/accessory/storage/webbingharness/pouches/grayscale icon_state = "vest_harness_pouches_g" + item_state = "vest_harness_pouches_g" /obj/item/clothing/accessory/storage/overalls name = "overalls" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 51bce44f866..1340bc85d38 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -335,7 +335,10 @@ /obj/item/clothing/under/dress/offworlder name = "\improper CR dress" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear, made of strong woven spider-silk. This variant seems to be tailored to resemble a dress, revealing much more skin." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "crdress" + item_state = "crdress" worn_state = "crdress" /obj/item/clothing/under/hosformalmale @@ -540,7 +543,10 @@ /obj/item/clothing/under/offworlder name = "\improper CR suit" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "crsuit" + item_state = "crsuit" worn_state = "crsuit" /obj/item/clothing/under/tactical diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 408a36aae7e..4e727d4f545 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -94,6 +94,8 @@ /obj/item/clothing/under/skirt/offworlder name = "\improper CR skirt" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." + icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' + contained_sprite = TRUE icon_state = "crskirt" item_state = "crskirt" worn_state = "crskirt" diff --git a/html/changelogs/kyres-offworlder_love.yml b/html/changelogs/kyres-offworlder_love.yml new file mode 100644 index 00000000000..488c5974db5 --- /dev/null +++ b/html/changelogs/kyres-offworlder_love.yml @@ -0,0 +1,10 @@ +author: kyres1 + +delete-after: True + +changes: + - tweak: "Recolored all of the offworlder-unique items to better utilize custom colors." + - tweak: "Recolors colorable webbing and storage sprites to better utilize custom colors." + - tweak: "Resprited Scarab passblades, the Exo-Stellar Skeleton for offworlders, and the CR apparel." + - tweak: "Moved webbing and all offworlder-related items into contained folders." + - bugfix: "Fixed a bug where contained mask sprites wouldn't swap between adjusted states properly." diff --git a/icons/clothing/rig/offworlder.dmi b/icons/clothing/rig/offworlder.dmi index b2975d91b43..05a86989484 100644 Binary files a/icons/clothing/rig/offworlder.dmi and b/icons/clothing/rig/offworlder.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 9b4fc46d5f0..863deaeabf7 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/items/clothing/lefthand_gloves.dmi b/icons/mob/items/clothing/lefthand_gloves.dmi index 11a31c4edb7..721c6331f08 100644 Binary files a/icons/mob/items/clothing/lefthand_gloves.dmi and b/icons/mob/items/clothing/lefthand_gloves.dmi differ diff --git a/icons/mob/items/clothing/righthand_gloves.dmi b/icons/mob/items/clothing/righthand_gloves.dmi index 21d2958f121..877fb3cadb2 100644 Binary files a/icons/mob/items/clothing/righthand_gloves.dmi and b/icons/mob/items/clothing/righthand_gloves.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 195da0233ab..24301e5bbce 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index c36733dcf6f..5a432ce7785 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 1e5b133aa39..770f19de867 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 5601d56f4ca..ac527eac000 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 4cb5a46fb10..342b285fa18 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/clothing/skirts.dmi index 4f053170317..f4cd64e9e48 100644 Binary files a/icons/obj/clothing/skirts.dmi and b/icons/obj/clothing/skirts.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 59c99712c91..a7ec96596d4 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/item/clothing/accessory/offworlder.dmi b/icons/obj/item/clothing/accessory/offworlder.dmi new file mode 100644 index 00000000000..1cd5810c3bd Binary files /dev/null and b/icons/obj/item/clothing/accessory/offworlder.dmi differ diff --git a/icons/obj/item/clothing/accessory/webbing.dmi b/icons/obj/item/clothing/accessory/webbing.dmi new file mode 100644 index 00000000000..8aafbb2ad63 Binary files /dev/null and b/icons/obj/item/clothing/accessory/webbing.dmi differ