diff --git a/mods/loadout_items/code/lists/suits.dm b/mods/loadout_items/code/lists/suits.dm index 4b731fdff5625..1bc90079ff331 100644 --- a/mods/loadout_items/code/lists/suits.dm +++ b/mods/loadout_items/code/lists/suits.dm @@ -12,4 +12,36 @@ fancy_jackets += /obj/item/clothing/suit/storage/brand_rjacket fancy_jackets += /obj/item/clothing/suit/storage/hooded/faln_jacket fancy_jackets += /obj/item/clothing/suit/storage/leon_jacket + fancy_jackets += /obj/item/clothing/suit/storage/toggle/longjacket + fancy_jackets += /obj/item/clothing/suit/storage/tgbomber gear_tweaks += new/datum/gear_tweak/path/specified_types_list(fancy_jackets) + +/datum/gear/suit/old_pullover + display_name = "old pullover sweater" + path = /obj/item/clothing/suit/storage/old_pullover + +/datum/gear/suit/fancy_coats + display_name = "coats selection" + path = /obj/item/clothing/suit + +/datum/gear/suit/fancy_coats/New() + ..() + var/fancy_coats = list() + fancy_coats += /obj/item/clothing/suit/storage/long_coat + fancy_coats += /obj/item/clothing/suit/storage/gentlecoat + fancy_coats += /obj/item/clothing/suit/storage/tailcoat + fancy_coats += /obj/item/clothing/suit/storage/jensencoat + gear_tweaks += new/datum/gear_tweak/path/specified_types_list(fancy_coats) + +/datum/gear/suit/kimono + display_name = "kimono selection" + path = /obj/item/clothing/suit/storage/kimono + +/datum/gear/suit/kimono/New() + ..() + var/kim = list() + kim += /obj/item/clothing/suit/storage/kimono + kim += /obj/item/clothing/suit/storage/kimono/blue + kim += /obj/item/clothing/suit/storage/kimono/red_short + kim += /obj/item/clothing/suit/storage/kimono/black + gear_tweaks += new/datum/gear_tweak/path/specified_types_list(kim) diff --git a/mods/loadout_items/code/suits.dm b/mods/loadout_items/code/suits.dm index dd5575078b474..46145eb2cad28 100644 --- a/mods/loadout_items/code/suits.dm +++ b/mods/loadout_items/code/suits.dm @@ -1,3 +1,5 @@ +// Fancy Jackets (referenses to films, games, etc) + /obj/item/clothing/suit/storage/drive_jacket name = "drive jacket" desc = "Stylish jacket for a real hero. Just like me." @@ -23,6 +25,25 @@ icon_state = "leon_jacket" item_state = "leon_jacket" +/obj/item/clothing/suit/storage/toggle/longjacket + name = "long jacket" + desc = "A long gray jacket" + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "longjacket_o" + //icon_open = "longjacket_o" + //icon_closed = "longjacket_c" + +/obj/item/clothing/suit/storage/tgbomber + name = "modern bomber jacket" + desc = "A leather bomber jacket." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "bomberjacket" + body_parts_covered = UPPER_TORSO|ARMS + cold_protection = UPPER_TORSO|ARMS + min_cold_protection_temperature = T0C - 20 + /obj/item/clothing/suit/storage/brand_jacket name = "blue brand jacket" desc = "What a fiery coloration." @@ -65,3 +86,82 @@ icon_state = "papaleroy_faln_jacket_hood" body_parts_covered = HEAD flags_inv = HIDEEARS | BLOCKHAIR + +//Pullower + +/obj/item/clothing/suit/storage/old_pullover + name = "old pullover" + desc = "old style pullover" + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "pullover" + item_state = "pullover" + +// Coats + +/obj/item/clothing/suit/storage/long_coat + name = "long coat" + desc = "Just a blank fabric black longcoat. It's surprisingly light." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "long_coat" + item_state = "long_coat" + +/obj/item/clothing/suit/storage/gentlecoat + name = "gentlecoat" + desc = "A tweed tailcoat purposed for some wannabe gentleman." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "gentlecoat" + item_state = "gentlecoat" + +/obj/item/clothing/suit/storage/tailcoat + name = "tailcoat" + desc = "A very delicate tailcoat, it imbues its wearer with vibe of snobbery and excessive self-importance." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "papaleroy_tailcoat" + item_state = "papaleroy_tailcoat" + +/obj/item/clothing/suit/storage/jensencoat + name = "short trenchcoat" + desc = "You may've never asked for this." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "jensencoat" + item_state = "jensencoat" + +// Kimonio + +/obj/item/clothing/suit/storage/kimono + name = "kimono" + desc = "Traditional Japanese garb, purposed for wearing by women." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "kimono" + item_state = "kimono" + body_parts_covered = UPPER_TORSO + +/obj/item/clothing/suit/storage/kimono/blue + name = "blue kimono" + desc = "Traditional Japanese garb, purposed for wearing by women." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "blue_kimono" + item_state = "blue_kimono" + +/obj/item/clothing/suit/storage/kimono/red_short + name = "red short kimono" + desc = "Traditional Japanese garb, purposed for wearing by women. This one is shortened for some extra style points." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "red_short_kimono" + item_state = "red_short_kimono" + +/obj/item/clothing/suit/storage/kimono/black + name = "black kimono" + desc = "Traditional Japanese garb, purposed for wearing by women." + icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' + item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') + icon_state = "black_kimono" + item_state = "black_kimono" diff --git a/packs/infinity/clothing/suits/suits.dm b/packs/infinity/clothing/suits/suits.dm index d719cce2f5d7d..66c8ce2a25991 100644 --- a/packs/infinity/clothing/suits/suits.dm +++ b/packs/infinity/clothing/suits/suits.dm @@ -18,15 +18,6 @@ //icon_open = "black_jacket_o" //icon_closed = "black_jacket_c" -/obj/item/clothing/suit/storage/toggle/longjacket - name = "long jacket" - desc = "A long gray jacket" - icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' - item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') - icon_state = "longjacket_o" - //icon_open = "longjacket_o" - //icon_closed = "longjacket_c" - /obj/item/clothing/suit/officerdnavyjacket name = "officer navy jacket" desc = "The utility jacket of the SCG Fleet, made from an insulated materials." @@ -44,16 +35,6 @@ siemens_coefficient = 0.6 allowed = list(/obj/item/gun/energy,/obj/item/device/radio,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/gun/magnetic) -/obj/item/clothing/suit/storage/tgbomber - name = "modern bomber jacket" - desc = "A leather bomber jacket." - icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi' - item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi') - icon_state = "bomberjacket" - body_parts_covered = UPPER_TORSO|ARMS - cold_protection = UPPER_TORSO|ARMS - min_cold_protection_temperature = T0C - 20 - /obj/item/clothing/suit/storage/janjacket name = "janitor jacket" desc = "A janitor's jacket. Gives unbelivable protection versus depression about your job."