diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index f5ed1280008..3fa18d86b11 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -9,9 +9,18 @@ path = /obj/item/clothing/mask/trinary_mask /datum/gear/religion/trinary/cape - display_name = "trinary perfection cape" + display_name = "trinary perfection cape selection" + description = "A selection of capes worn by adherents to the Trinary Perfection." path = /obj/item/clothing/accessory/poncho/trinary +/datum/gear/religion/trinary/cape/New() + ..() + var/trinarycape = list() + trinarycape["trinary perfection cape"] = /obj/item/clothing/accessory/poncho/trinary + trinarycape["trinary perfection shoulder cape"] = /obj/item/clothing/accessory/poncho/trinary/shouldercape + trinarycape["trinary perfection pellegrina"] = /obj/item/clothing/accessory/poncho/trinary/pellegrina + gear_tweaks += new/datum/gear_tweak/path(trinarycape) + /datum/gear/religion/trinary/badge display_name = "trinary perfection brooch" path = /obj/item/clothing/accessory/badge/trinary diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm index e6f8ceee433..8071933c66d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm @@ -100,7 +100,7 @@ /datum/gear/suit/idris display_name = "Idris Unit coats" - path = /obj/item/clothing/suit/armor/vest/idris + path = /obj/item/clothing/suit/storage/toggle/armor/vest/idris whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) sort_category = "Xenowear - IPC" allowed_roles = list("Security Officer", "Warden", "Head of Security", "Investigator", "Security Cadet") @@ -109,12 +109,18 @@ /datum/gear/suit/idris/New() ..() var/idris = list() - idris["Black Idris Unit coat"] = /obj/item/clothing/suit/armor/vest/idris - idris["Brown Idris Unit coat"] = /obj/item/clothing/suit/armor/vest/idris/brown - idris["Black Idris Unit trench coat"] = /obj/item/clothing/suit/armor/vest/idris/trenchcoat/black - idris["Brown Idris Unit trench coat"] = /obj/item/clothing/suit/armor/vest/idris/trenchcoat/brown - idris["Black Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/black - idris["Brown Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/brown + idris["black Idris Unit coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris + idris["white Idris Unit coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/white + idris["brown Idris Unit coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/brown + idris["black Idris Unit long coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat + idris["white Idris Unit long coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat/white + idris["brown Idris Unit long coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat/brown + idris["black Idris Unit trench coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat + idris["white Idris Unit trench coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat/white + idris["brown Idris Unit trench coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat/brown + idris["black Idris Unit duster coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster + idris["white Idris Unit duster coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster/white + idris["brown Idris Unit duster coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster/brown gear_tweaks += new/datum/gear_tweak/path(idris) /datum/gear/uniform/goldendeep diff --git a/code/modules/clothing/factions/idris.dm b/code/modules/clothing/factions/idris.dm index 5960cf82733..c9eec732aad 100644 --- a/code/modules/clothing/factions/idris.dm +++ b/code/modules/clothing/factions/idris.dm @@ -1,46 +1,86 @@ //iru coats -/obj/item/clothing/suit/armor/vest/idris +/obj/item/clothing/suit/storage/toggle/armor/vest/idris name = "black Idris Unit coat" desc = "A coat worn by the Idris units, notorious across space." icon = 'icons/clothing/suits/coats/idris_iru_coats.dmi' - icon_state = "iru_coat" - item_state = "iru_coat" + icon_state = "idris_coat" + item_state = "idris_coat" + body_parts_covered = UPPER_TORSO cold_protection = 0 min_cold_protection_temperature = 0 heat_protection = 0 max_heat_protection_temperature = 0 contained_sprite = TRUE -/obj/item/clothing/suit/armor/vest/idris/brown - name = "brown Idris Unit coat" - desc = "A coat worn by the Idris units, notorious across space. This one is brown." - icon_state = "iru_coat_brown" - item_state = "iru_coat_brown" +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/white + name = "white Idris Unit coat" + desc = "A coat worn by the Idris units, notorious across space. This one is white." + icon_state = "idris_coat_white" + item_state = "idris_coat_white" -/obj/item/clothing/suit/armor/vest/idris/trenchcoat/black +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/brown + name = "brown Idris Unit coat" + desc = "A coat worn by the Idris units, notorious across space. This one is white." + icon_state = "idris_coat_brown" + item_state = "idris_coat_brown" + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat + name = "black Idris Unit long coat" + desc = "A long coat worn by the Idris units, notorious across space. This one is black." + icon_state = "idris_longcoat" + item_state = "idris_longcoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat/white + name = "white Idris Unit long coat" + desc = "A long coat worn by the Idris units, notorious across space. This one is white." + icon_state = "idris_longcoat_white" + item_state = "idris_longcoat_white" + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat/brown + name = "brown Idris Unit long coat" + desc = "A long coat worn by the Idris units, notorious across space. This one is brown." + icon_state = "idris_longcoat_brown" + item_state = "idris_longcoat_brown" + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat name = "black Idris Unit trench coat" desc = "A trench coat worn by the Idris units, notorious across space. This one is black." - icon_state = "iru_trench_black" - item_state = "iru_trench_black" + icon_state = "idris_trenchcoat" + item_state = "idris_trenchcoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/suit/armor/vest/idris/trenchcoat/brown +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat/white + name = "white Idris Unit trench coat" + desc = "A trench coat worn by the Idris units, notorious across space. This one is white." + icon_state = "idris_trenchcoat_white" + item_state = "idris_trenchcoat_white" + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat/brown name = "brown Idris Unit trench coat" desc = "A trench coat worn by the Idris units, notorious across space. This one is brown." - icon_state = "iru_trench_brown" - item_state = "iru_trench_brown" + icon_state = "idris_trenchcoat_brown" + item_state = "idris_trenchcoat_brown" -/obj/item/clothing/suit/armor/vest/idris/duster/black +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster name = "black Idris Unit duster coat" desc = "A duster coat worn by the Idris units, notorious across space. This one is black." - icon_state = "iru_duster_black" - item_state = "iru_duster_black" + icon_state = "idris_duster" + item_state = "idris_duster" + body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/suit/armor/vest/idris/duster/brown +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster/white + name = "white Idris Unit duster coat" + desc = "A duster coat worn by the Idris units, notorious across space. This one is white." + icon_state = "idris_duster_white" + item_state = "idris_duster_white" + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster/brown name = "brown Idris Unit duster coat" desc = "A duster coat worn by the Idris units, notorious across space. This one is brown." - icon_state = "iru_duster_brown" - item_state = "iru_duster_brown" + icon_state = "idris_duster_brown" + item_state = "idris_duster_brown" //windbreaker diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 7ffcdd0ddf8..6371d4f8bc5 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -553,6 +553,20 @@ item_state = "trinary_cape" overlay_state = "trinary_cape" +/obj/item/clothing/accessory/poncho/trinary/pellegrina + name = "trinary perfection pellegrina" + desc = "A brilliant red and brown cape, commonly worn by those who serve the Trinary Perfection. This one is signifcantly shorter." + icon_state = "trinary_cape" + item_state = "trinary_cape" + overlay_state = "trinary_pellegrina" + +/obj/item/clothing/accessory/poncho/trinary/shouldercape + name = "trinary perfection shoulder cape" + desc = "A brilliant red and brown cape, commonly worn by those who serve the Trinary Perfection. This one is worn over one shoulder." + icon_state = "trinary_cape" + item_state = "trinary_cape" + overlay_state = "trinary_shouldercape" + //tau ceti legion ribbons /obj/item/clothing/accessory/legion name = "seniority ribbons" diff --git a/html/changelogs/nienna_irucoats.yml b/html/changelogs/nienna_irucoats.yml new file mode 100644 index 00000000000..cab2d185031 --- /dev/null +++ b/html/changelogs/nienna_irucoats.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: NiennaB, Dumbdumn5, Stryker, Ryverstyx +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Replaces the old IRU coat with a short coat and a long coat, available in black, brown and white." + - tweak: "Tweaks the existing IRU dusters and trenchcoats." + - rscadd: "Adds new Trinary Perfection capes by Ryverstyx." \ No newline at end of file diff --git a/icons/clothing/suits/coats/idris_iru_coats.dmi b/icons/clothing/suits/coats/idris_iru_coats.dmi index 3faa963efd9..c7a14c132a2 100644 Binary files a/icons/clothing/suits/coats/idris_iru_coats.dmi and b/icons/clothing/suits/coats/idris_iru_coats.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index c0a6d857278..da54d130e76 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ