diff --git a/aurorastation.dme b/aurorastation.dme index c9eb9850f93..0d54d224216 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1377,6 +1377,7 @@ #include "code\modules\clothing\factions\gadpathur.dm" #include "code\modules\clothing\factions\goldendeep.dm" #include "code\modules\clothing\factions\himeo.dm" +#include "code\modules\clothing\factions\idris.dm" #include "code\modules\clothing\factions\konyang.dm" #include "code\modules\clothing\factions\vysoka.dm" #include "code\modules\clothing\glasses\glasses.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 4137a63c9b5..657f0718842 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -23,6 +23,12 @@ path = /obj/item/clothing/accessory/armband/idris faction = "Idris Incorporated" +/datum/gear/faction/idris_windbreaker + display_name = "idris jacket" + path = /obj/item/clothing/suit/storage/toggle/idris + slot = slot_wear_suit + faction = "Idris Incorporated" + /datum/gear/faction/zavodskoi_beret display_name = "black zavodskoi beret" path = /obj/item/clothing/head/beret/security/zavodskoi diff --git a/code/modules/clothing/factions/idris.dm b/code/modules/clothing/factions/idris.dm new file mode 100644 index 00000000000..5960cf82733 --- /dev/null +++ b/code/modules/clothing/factions/idris.dm @@ -0,0 +1,53 @@ +//iru coats + +/obj/item/clothing/suit/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" + 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/armor/vest/idris/trenchcoat/black + 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" + +/obj/item/clothing/suit/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" + +/obj/item/clothing/suit/armor/vest/idris/duster/black + 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" + +/obj/item/clothing/suit/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" + +//windbreaker + +/obj/item/clothing/suit/storage/toggle/idris + name = "\improper Idris Incorporated jacket" + desc = "A comfortable windbreaker for Idris Incorporated investigations staff styled after the coats of Idris reclamation units. Many of the Idris patches and badges on the coat are holographic." + icon = 'icons/clothing/suits/coats/idris_windbreaker.dmi' + icon_state = "idris_windbreaker" + item_state = "idris_windbreaker" + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index f7eae55b202..8a109443abe 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -576,46 +576,6 @@ pockets.max_w_class = ITEMSIZE_SMALL pockets.max_storage_space = 8 -/obj/item/clothing/suit/armor/vest/idris - name = "black Idris Unit coat" - desc = "A coat worn by the Idris units, notorious across space." - icon_state = "iru_coat" - item_state = "iru_coat" - cold_protection = 0 - min_cold_protection_temperature = 0 - heat_protection = 0 - max_heat_protection_temperature = 0 - -/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/armor/vest/idris/trenchcoat/black - 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" - -/obj/item/clothing/suit/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" - -/obj/item/clothing/suit/armor/vest/idris/duster/black - 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" - -/obj/item/clothing/suit/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" - /obj/item/clothing/suit/storage/vest/sol name = "sol heavy armor vest" desc = "A high-quality armor vest in a deep green. It is surprisingly flexible and light, even with the added webbing and armor plating." diff --git a/html/changelogs/Ferner-201228-sprites_idriswindbreaker.yml b/html/changelogs/Ferner-201228-sprites_idriswindbreaker.yml new file mode 100644 index 00000000000..ecccde9391e --- /dev/null +++ b/html/changelogs/Ferner-201228-sprites_idriswindbreaker.yml @@ -0,0 +1,4 @@ +author: Ferner, sekritsanter +delete-after: True +changes: + - rscadd: "Added a Idris windbreaker jacket to the faction loadout selection." \ 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 new file mode 100644 index 00000000000..3faa963efd9 Binary files /dev/null and b/icons/clothing/suits/coats/idris_iru_coats.dmi differ diff --git a/icons/clothing/suits/coats/idris_windbreaker.dmi b/icons/clothing/suits/coats/idris_windbreaker.dmi new file mode 100644 index 00000000000..62e922742ea Binary files /dev/null and b/icons/clothing/suits/coats/idris_windbreaker.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index ccf3a3e6418..82aa75c0eb2 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 2c130f624ff..f14148e1bc5 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ