diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 93102a2400..3ae9f2bf59 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -75,16 +75,16 @@ path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless /datum/gear/suit/mil - display_name = "military jacket" + display_name = "military jacket selection" path = /obj/item/clothing/suit/storage/miljacket - -/datum/gear/suit/mil/alt - display_name = "military jacket, alt" - path = /obj/item/clothing/suit/storage/miljacket/alt - -/datum/gear/suit/mil/green - display_name = "military jacket, green" - path = /obj/item/clothing/suit/storage/miljacket/green + +/datum/gear/suit/mil/New() + ..() + var/list/mil_jackets = list() + for(var/military_style in typesof(/obj/item/clothing/suit/storage/miljacket)) + var/obj/item/clothing/suit/storage/miljacket/miljacket = military_style + mil_jackets[initial(miljacket.name)] = miljacket + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(mil_jackets)) /datum/gear/suit/greyjacket display_name = "grey jacket" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 250a9549e2..32e5e19743 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -410,19 +410,59 @@ obj/item/clothing/suit/kamishimo flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/miljacket/alt - name = "military jacket" - desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." + name = "military jacket, alternate" + desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. This one has some extra badges on it." icon_state = "militaryjacket_badge" item_state_slots = list(slot_r_hand_str = "suit_olive", slot_l_hand_str = "suit_olive") flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/miljacket/green - name = "military jacket" - desc = "A dark green canvas jacket. Feels sturdy, yet comfortable." + name = "green military jacket" + desc = "A dark but rather high-saturation green canvas jacket. Feels sturdy, yet comfortable." icon_state = "militaryjacket_green" item_state_slots = list(slot_r_hand_str = "suit_olive", slot_l_hand_str = "suit_olive") flags_inv = HIDEHOLSTER +/obj/item/clothing/suit/storage/miljacket/tan + name = "tan military jacket" + desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. Now in sandy tans for desert fans." + icon_state = "militaryjacket_tan" + item_state_slots = list(slot_r_hand_str = "suit_orange", slot_l_hand_str = "suit_orange") + flags_inv = HIDEHOLSTER + index = 1 + +/obj/item/clothing/suit/storage/miljacket/grey + name = "grey military jacket" + desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. This one's in urban grey." + icon_state = "militaryjacket_grey" + item_state_slots = list(slot_r_hand_str = "suit_grey", slot_l_hand_str = "suit_grey") + flags_inv = HIDEHOLSTER + index = 1 + +/obj/item/clothing/suit/storage/miljacket/navy + name = "navy military jacket" + desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. Dark navy, this one is." + icon_state = "militaryjacket_navy" + item_state_slots = list(slot_r_hand_str = "suit_navy", slot_l_hand_str = "suit_navy") + flags_inv = HIDEHOLSTER + index = 1 + +/obj/item/clothing/suit/storage/miljacket/black + name = "black military jacket" + desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. Now in tactical black." + icon_state = "militaryjacket_black" + item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black") + flags_inv = HIDEHOLSTER + index = 1 + +/obj/item/clothing/suit/storage/miljacket/white + name = "white military jacket" + desc = "A white canvas jacket. Don't wear this for walks in the snow, it won't keep you warm - it'll just make it harder to find your frozen corpse." + icon_state = "militaryjacket_white" + item_state_slots = list(slot_r_hand_str = "med_dep_jacket", slot_l_hand_str = "med_dep_jacket") + flags_inv = HIDEHOLSTER + index = 1 + /obj/item/clothing/suit/storage/toggle/bomber name = "bomber jacket" desc = "A thick, well-worn WW2 leather bomber jacket." diff --git a/icons/mob/suit_1.dmi b/icons/mob/suit_1.dmi index 7c2c53f8ff..7d52018483 100644 Binary files a/icons/mob/suit_1.dmi and b/icons/mob/suit_1.dmi differ diff --git a/icons/obj/clothing/suits_1.dmi b/icons/obj/clothing/suits_1.dmi index f734907c89..7a75bbba5b 100644 Binary files a/icons/obj/clothing/suits_1.dmi and b/icons/obj/clothing/suits_1.dmi differ