diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 05abed603c..0b1121b22b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -402,6 +402,30 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON +/obj/item/clothing/suit/jacket/flannel + name = "black flannel jacket" + desc = "Comfy and supposedly flammable." + icon_state = "flannel" + item_state = "flannel" + +/obj/item/clothing/suit/jacket/flannel/red + name = "red flannel jacket" + desc = "Comfy and supposedly flammable." + icon_state = "flannel_red" + item_state = "flannel_red" + +/obj/item/clothing/suit/jacket/flannel/aqua + name = "aqua flannel jacket" + desc = "Comfy and supposedly flammable." + icon_state = "flannel_aqua" + item_state = "flannel_aqua" + +/obj/item/clothing/suit/jacket/flannel/brown + name = "brown flannel jacket" + desc = "Comfy and supposedly flammable." + icon_state = "flannel_brown" + item_state = "flannel_brown" + /obj/item/clothing/suit/jacket/leather name = "leather jacket" desc = "Pompadour not included." @@ -760,6 +784,17 @@ desc = "A green winter coat hood." icon_state = "winterhood_hydro" +/obj/item/clothing/suit/hooded/wintercoat/bar + name = "bartender winter coat" + desc = "A fancy winter coat with a waistcoat and flamboyant bowtie stuck onto it. The zipper tab is actually the bowtie." + icon_state = "coatbar" + item_state = "coatbar" + hoodtype = /obj/item/clothing/head/hooded/winterhood/bar + +/obj/item/clothing/head/hooded/winterhood/bar + desc = "A fancy winter coat hood." + icon_state = "winterhood_bar" + /obj/item/clothing/suit/hooded/wintercoat/cosmic name = "cosmic winter coat" desc = "A starry winter coat that even glows softly." diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 2691906af4..7005a0b02f 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -14,6 +14,10 @@ /obj/item/clothing/head/beret/blue = 3, /obj/item/clothing/glasses/monocle = 3, /obj/item/clothing/suit/jacket = 4, + /obj/item/clothing/suit/jacket/flannel = 4, + /obj/item/clothing/suit/jacket/flannel/red = 4, + /obj/item/clothing/suit/jacket/flannel/aqua = 4, + /obj/item/clothing/suit/jacket/flannel/brown = 4, /obj/item/clothing/suit/jacket/puffer/vest = 4, /obj/item/clothing/suit/jacket/puffer = 4, /obj/item/clothing/suit/hooded/cloak/david = 4, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 8552d52b04..26beccaac0 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -248,6 +248,7 @@ vend_reply = "Thank you for using the BarDrobe!" products = list(/obj/item/clothing/head/that = 3, /obj/item/radio/headset/headset_srv = 3, + /obj/item/clothing/suit/hooded/wintercoat/bar = 3, /obj/item/clothing/under/suit/sl = 3, /obj/item/clothing/under/rank/civilian/bartender = 3, /obj/item/clothing/under/rank/civilian/bartender/skirt = 2, diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index a2a8fcede6..a6e75123bb 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 9d97ae36b5..7a690bb29f 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index b982d450e4..90f1fba315 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index fed81adfcc..258eb0dc35 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index fecf2a4dce..57c5772f48 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -24,6 +24,26 @@ category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket +/datum/gear/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack + name = "Black flannel jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/jacket/flannel + +/datum/gear/jacketflannelred + name = "Red flannel jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/jacket/flannel/red + +/datum/gear/jacketflannelaqua + name = "Aqua flannel jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/jacket/flannel/aqua + +/datum/gear/jacketflannelbrown + name = "Brown flannel jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/jacket/flannel/brown + /datum/gear/jacketleather name = "Leather jacket" category = SLOT_WEAR_SUIT @@ -127,6 +147,12 @@ path = /obj/item/clothing/suit/hooded/wintercoat/hydro restricted_roles = list("Head of Personnel", "Botanist") // Reserve it to Botanists and their boss, the Head of Personnel +/datum/gear/coat/bar + name = "Bar winter coat" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/wintercoat/bar + restricted_roles = list("Bartender") // Reserve it to Bartenders and not the Head of Personnel because he doesnt deserve to look as fancy as them + /datum/gear/coat/cargo name = "Cargo winter coat" category = SLOT_WEAR_SUIT