diff --git a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm index 58188a7284a..7d0d5be9263 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm @@ -111,16 +111,16 @@ var/list/idris = list() 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["teal Idris Unit coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/teal 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["teal Idris Unit long coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat/teal 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["teal Idris Unit trench coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat/teal 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 + idris["teal Idris Unit duster coat"] = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster/teal 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 f2a7c3b0cc4..b94d7ac922f 100644 --- a/code/modules/clothing/factions/idris.dm +++ b/code/modules/clothing/factions/idris.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/item/clothing/suit/storage/toggle/idris_iru_coats.dmi' icon_state = "idris_coat" item_state = "idris_coat" + var/initial_icon_state allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight) body_parts_covered = UPPER_TORSO cold_protection = 0 @@ -26,68 +27,107 @@ icon_state = "idris_coat_white" item_state = "idris_coat_white" -/obj/item/clothing/suit/storage/toggle/armor/vest/idris/brown - name = "brown Idris Unit coat" +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/teal + name = "teal 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" + icon_state = "idris_coat_teal" + item_state = "idris_coat_teal" /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" + initial_icon_state = "idris_longcoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) + var/image/I = ..() + if(slot == slot_wear_suit_str) + var/image/coat_backing = image(mob_icon, null, "[icon_state]_backing", H ? H.layer - 0.01 : MOB_LAYER - 0.01) + I.AddOverlays(coat_backing) + return I + /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" + initial_icon_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/longcoat/teal + name = "teal Idris Unit long coat" + desc = "A long coat worn by the Idris units, notorious across space. This one is teal." + icon_state = "idris_longcoat_teal" + item_state = "idris_longcoat_teal" + initial_icon_state = "idris_longcoat_teal" /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 = "idris_trenchcoat" item_state = "idris_trenchcoat" + initial_icon_state = "idris_trenchcoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) + var/image/I = ..() + if(!opened) + return I + else + if(slot == slot_wear_suit_str) + var/image/coat_backing = image(mob_icon, null, "[initial_icon_state]_backing", H ? H.layer - 0.01 : MOB_LAYER - 0.01) + I.AddOverlays(coat_backing) + return I + /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" + initial_icon_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 = "idris_trenchcoat_brown" - item_state = "idris_trenchcoat_brown" +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/trenchcoat/teal + name = "teal Idris Unit trench coat" + desc = "A trench coat worn by the Idris units, notorious across space. This one is teal." + icon_state = "idris_trenchcoat_teal" + item_state = "idris_trenchcoat_teal" + initial_icon_state = "idris_trenchcoat_teal" /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 = "idris_duster" item_state = "idris_duster" + initial_icon_state = "idris_duster" body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) + var/image/I = ..() + if(!opened) + return I + else + if(slot == slot_wear_suit_str) + var/image/coat_backing = image(mob_icon, null, "[initial_icon_state]_backing", H ? H.layer - 0.01 : MOB_LAYER - 0.01) + I.AddOverlays(coat_backing) + return I + /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" + initial_icon_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 = "idris_duster_brown" - item_state = "idris_duster_brown" +/obj/item/clothing/suit/storage/toggle/armor/vest/idris/duster/teal + name = "teal Idris Unit duster coat" + desc = "A duster coat worn by the Idris units, notorious across space. This one is teal." + icon_state = "idris_duster_teal" + item_state = "idris_duster_teal" + initial_icon_state = "idris_duster_teal" //windbreaker diff --git a/html/changelogs/ElorgRHG-idris-unit-ing.yml b/html/changelogs/ElorgRHG-idris-unit-ing.yml new file mode 100644 index 00000000000..7a4ecbf37ab --- /dev/null +++ b/html/changelogs/ElorgRHG-idris-unit-ing.yml @@ -0,0 +1,13 @@ +# Your name. +author: ElorgRHG + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Resprited Idris Unit coats. Brown Idris Unit coats are now teal." diff --git a/icons/obj/item/clothing/suit/storage/toggle/idris_iru_coats.dmi b/icons/obj/item/clothing/suit/storage/toggle/idris_iru_coats.dmi index 5065db12ef8..8ab04eacea8 100644 Binary files a/icons/obj/item/clothing/suit/storage/toggle/idris_iru_coats.dmi and b/icons/obj/item/clothing/suit/storage/toggle/idris_iru_coats.dmi differ