diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a47d55bfcb..0b705f7797 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -487,6 +487,13 @@ item_state = "militaryjacket" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio) +/obj/item/clothing/suit/jacket/urbanjacket + name = "urban jacket" + desc = "A canvas jacket styled with a fur neck piece, stylish." + icon_state = "urbanjacket" + item_state = "urbanjacket" + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio) + /obj/item/clothing/suit/jacket/letterman name = "letterman jacket" desc = "A classic brown letterman jacket. Looks pretty hot and heavy." diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 87e6e94b6b..b9f55e695a 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -91,6 +91,12 @@ icon_state = "tan_suit" item_state = "tan_suit" +/obj/item/clothing/under/suit/charismatic_suit + name = "charismatic suit" + desc = "Luck is for losers, baby." + icon_state = "charismatic_suit" + item_state = "charismatic_suit" + /obj/item/clothing/under/suit/white name = "white suit" desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 8d19d46530..09881da469 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -31,7 +31,10 @@ /obj/item/clothing/under/suit/burgundy = 3, /obj/item/clothing/under/suit/charcoal = 3, /obj/item/clothing/under/suit/white = 3, + /obj/item/clothing/under/suit/tan = 3, + /obj/item/clothing/under/suit/charismatic_suit = 3, /obj/item/clothing/under/costume/kilt = 3, + /obj/item/clothing/suit/suspenders = 3, /obj/item/clothing/under/misc/overalls = 3, /obj/item/clothing/under/suit/sl = 3, /obj/item/clothing/accessory/sweater = 3, @@ -70,6 +73,7 @@ /obj/item/clothing/accessory/suitjacket/burgundy = 2, /obj/item/clothing/accessory/suitjacket/checkered = 2, /obj/item/clothing/suit/jacket/miljacket = 5, + /obj/item/clothing/suit/jacket/urbanjacket = 5, /obj/item/clothing/under/suit/white_on_white/skirt = 2, /obj/item/clothing/under/rank/captain/suit/skirt = 2, /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2, diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index ae7117d53b..9b9a74e19a 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 7bd7de82c7..f1ef3bf1fa 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index ba9f94e67a..11d736462d 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 17e52b60c9..b8f399b4a8 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index f7ef891104..3f1b94b437 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -159,6 +159,11 @@ path = /obj/item/clothing/suit/jacket/miljacket subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS +/datum/gear/suit/urbanjacket + name = "Urban Jacket" + path = /obj/item/clothing/suit/jacket/urbanjacket + subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS + /datum/gear/suit/ianshirt name = "Ian Shirt" path = /obj/item/clothing/suit/ianshirt diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 303783e1c5..4638c34285 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -32,6 +32,10 @@ name = "Tan suit" path = /obj/item/clothing/under/suit/tan +/datum/gear/uniform/suit/charismatic_suit + name = "Charismatic suit" + path = /obj/item/clothing/under/suit/charismatic_suit + /datum/gear/uniform/suit/white name = "White suit" path = /obj/item/clothing/under/suit/white