diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 8ce55ca8e4..7bfa22ad43 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -55,7 +55,7 @@ var/datum/antagonist/raider/raiders /obj/item/clothing/suit/pirate, /obj/item/clothing/suit/hgpirate, /obj/item/clothing/suit/storage/toggle/bomber, - /obj/item/clothing/suit/storage/leather_jacket, + /obj/item/clothing/suit/storage/toggle/leather_jacket, /obj/item/clothing/suit/storage/toggle/brown_jacket, /obj/item/clothing/suit/storage/toggle/hoodie, /obj/item/clothing/suit/storage/toggle/hoodie/black, diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index e8915efd2d..2cb7da998e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -28,24 +28,40 @@ /datum/gear/suit/leather_jacket display_name = "leather jacket, black" - path = /obj/item/clothing/suit/storage/leather_jacket + path = /obj/item/clothing/suit/storage/toggle/leather_jacket + +/datum/gear/suit/leather_jacket_sleeveless + display_name = "leather vest, black" + path = /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless /datum/gear/suit/leather_jacket_alt display_name = "leather jacket 2, black" - path = /obj/item/clothing/suit/storage/leather_jacket/alt + path = /obj/item/clothing/suit/storage/leather_jacket_alt /datum/gear/suit/leather_jacket_nt display_name = "leather jacket, corporate, black" - path = /obj/item/clothing/suit/storage/leather_jacket/nanotrasen + path = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen + +/datum/gear/suit/leather_jacket_nt/sleeveless + display_name = "leather vest, corporate, black" + path = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless /datum/gear/suit/brown_jacket display_name = "leather jacket, brown" path = /obj/item/clothing/suit/storage/toggle/brown_jacket +/datum/gear/suit/brown_jacket_sleeveless + display_name = "leather vest, brown" + path = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless + /datum/gear/suit/brown_jacket_nt display_name = "leather jacket, corporate, brown" path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen +/datum/gear/suit/brown_jacket_nt/sleeveless + display_name = "leather vest, corporate, brown" + path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless + /datum/gear/suit/mil display_name = "military jacket" path = /obj/item/clothing/suit/storage/miljacket @@ -324,4 +340,20 @@ /datum/gear/suit/flannel/brown display_name = "brown flannel" - path = /obj/item/clothing/suit/storage/flannel/brown \ No newline at end of file + path = /obj/item/clothing/suit/storage/flannel/brown + +/datum/gear/suit/denim_jacket + display_name = "denim jacket" + path = /obj/item/clothing/suit/storage/toggle/denim_jacket + +/datum/gear/suit/denim_jacket/corporate + display_name = "denim jacket, corporate" + path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen + +/datum/gear/suit/denim_vest + display_name = "denim vest" + path = /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless + +/datum/gear/suit/denim_vest/corporate + display_name = "denim vest, corporate" + path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 2b47f25e77..6d3eecde3c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -330,20 +330,44 @@ min_cold_protection_temperature = T0C - 20 siemens_coefficient = 0.7 -/obj/item/clothing/suit/storage/leather_jacket +/obj/item/clothing/suit/storage/toggle/leather_jacket name = "leather jacket" desc = "A black leather coat." icon_state = "leather_jacket" + icon_open = "leather_jacket_open" allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/storage/leather_jacket/alt - icon_state = "leather_jacket_alt" +/obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless + name = "leather vest" + desc = "A black leather vest." + icon_state = "leather_jacket_sleeveless" + icon_open = "leather_jacket_sleeveless_open" + icon_closed = "leather_jacket_sleeveless" + body_parts_covered = UPPER_TORSO item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") -/obj/item/clothing/suit/storage/leather_jacket/nanotrasen +/obj/item/clothing/suit/storage/leather_jacket_alt + name = "leather vest" + desc = "A black leather vest." + icon_state = "leather_jacket_alt" + item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen desc = "A black leather coat. A corporate logo is proudly displayed on the back." icon_state = "leather_jacket_nt" + icon_closed = "leather_jacket_nt" + icon_open = "leather_jacket_nt_open" + item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") + +/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless + name = "leather vest" + desc = "A black leather vest. A corporate logo is proudly displayed on the back." + icon_state = "leather_jacket_nt_sleeveless" + icon_open = "leather_jacket_nt_sleeveless_open" + icon_closed = "leather_jacket_nt_sleeveless" + body_parts_covered = UPPER_TORSO item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") //This one has buttons for some reason @@ -357,6 +381,15 @@ allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) body_parts_covered = UPPER_TORSO|ARMS +/obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless + name = "brown vest" + desc = "A brown leather vest." + icon_state = "brown_jacket_sleeveless" + icon_open = "brown_jacket_sleeveless_open" + icon_closed = "brown_jacket_sleeveless" + body_parts_covered = UPPER_TORSO + item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen desc = "A brown leather coat. A corporate logo is proudly displayed on the back." icon_state = "brown_jacket_nt" @@ -364,6 +397,50 @@ icon_open = "brown_jacket_nt_open" icon_closed = "brown_jacket_nt" +/obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless + name = "brown vest" + desc = "A brown leather vest. A corporate logo is proudly displayed on the back." + icon_state = "brown_jacket_nt_sleeveless" + icon_open = "brown_jacket_nt_open" + icon_closed = "brown_jacket_nt_sleeveless" + body_parts_covered = UPPER_TORSO + item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") + +/obj/item/clothing/suit/storage/toggle/denim_jacket + name = "denim jacket" + desc = "A denim coat." + icon_state = "denim_jacket" + item_state_slots = list(slot_r_hand_str = "denim_jacket", slot_l_hand_str = "denim_jacket") + icon_open = "denim_jacket_open" + icon_closed = "denim_jacket" + allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless + name = "denim vest" + desc = "A denim vest." + icon_state = "denim_jacket_sleeveless" + icon_open = "denim_jacket_sleeveless_open" + icon_closed = "denim_jacket_sleeveless" + body_parts_covered = UPPER_TORSO + item_state_slots = list(slot_r_hand_str = "denim_jacket", slot_l_hand_str = "denim_jacket") + +/obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen + desc = "A denim coat. A corporate logo is proudly displayed on the back." + icon_state = "denim_jacket_nt" + item_state_slots = list(slot_r_hand_str = "denim_jacket", slot_l_hand_str = "denim_jacket") + icon_open = "denim_jacket_nt_open" + icon_closed = "denim_jacket_nt" + +/obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless + name = "denim vest" + desc = "A denim vest. A corporate logo is proudly displayed on the back." + icon_state = "denim_jacket_nt_sleeveless" + icon_open = "denim_jacket_nt_open" + icon_closed = "denim_jacket_nt_sleeveless" + body_parts_covered = UPPER_TORSO + item_state_slots = list(slot_r_hand_str = "denim_jacket", slot_l_hand_str = "denim_jacket") + /obj/item/clothing/suit/storage/toggle/hoodie name = "grey hoodie" desc = "A warm, grey sweatshirt." diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi index 0790c3d974..b91ad1f571 100644 Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi index ab0fb0a5d4..64bfc7b490 100644 Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 59a77aa29e..024c6e36f2 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 adcde9fe3c..5d36d8283c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ