diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm
index a5d32547e35..8920c34ddd1 100644
--- a/code/game/antagonist/outsider/raider.dm
+++ b/code/game/antagonist/outsider/raider.dm
@@ -63,7 +63,7 @@ var/datum/antagonist/raider/raiders
/obj/item/clothing/suit/storage/toggle/hoodie,
/obj/item/clothing/suit/storage/toggle/hoodie/black,
/obj/item/clothing/suit/unathi/mantle,
- /obj/item/clothing/suit/poncho
+ /obj/item/clothing/accessory/poncho
)
var/list/raider_guns = list(
diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
index 92001e13e7c..8f2b224e4e1 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -137,3 +137,12 @@
scarfs["zebra scarf"] = /obj/item/clothing/accessory/scarf/zebra
gear_tweaks += new/datum/gear_tweak/path(scarfs)
+/datum/gear/accessory/chaps
+ display_name = "chaps, brown"
+ path = /obj/item/clothing/accessory/chaps
+
+/datum/gear/accessory/chaps/black
+ display_name = "chaps, black"
+ path = /obj/item/clothing/accessory/chaps/black
+
+
diff --git a/code/modules/client/preference_setup/loadout/loadout_ears.dm b/code/modules/client/preference_setup/loadout/loadout_ears.dm
index 11685305ca3..680b1778663 100644
--- a/code/modules/client/preference_setup/loadout/loadout_ears.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_ears.dm
@@ -8,7 +8,7 @@
/datum/gear/ears/bandanna
display_name = "neck bandanna selection"
path = /obj/item/clothing/ears/bandanna
-
+
/datum/gear/ears/bandanna/New()
..()
var/bandanna = list()
@@ -16,4 +16,7 @@
bandanna["blue bandanna"] = /obj/item/clothing/ears/bandanna/blue
bandanna["black bandanna"] = /obj/item/clothing/ears/bandanna/black
gear_tweaks += new/datum/gear_tweak/path(bandanna)
-
+
+/datum/gear/ears/headphones
+ display_name = "headphones"
+ path = /obj/item/clothing/ears/earmuffs/headphones
diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves.dm b/code/modules/client/preference_setup/loadout/loadout_gloves.dm
index b1b37a0f4b2..5fbc1467e9f 100644
--- a/code/modules/client/preference_setup/loadout/loadout_gloves.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_gloves.dm
@@ -47,4 +47,8 @@
ringtype["ring, glass"] = /obj/item/clothing/ring/material/glass
ringtype["ring, wood"] = /obj/item/clothing/ring/material/wood
ringtype["ring, plastic"] = /obj/item/clothing/ring/material/plastic
- gear_tweaks += new/datum/gear_tweak/path(ringtype)
\ No newline at end of file
+ gear_tweaks += new/datum/gear_tweak/path(ringtype)
+
+/datum/gear/gloves/fingerless
+ display_name = "fingerless gloves"
+ path = /obj/item/clothing/gloves/fingerless
diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm
index 2760d34625a..36e638b6372 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -182,4 +182,20 @@
/datum/gear/head/headbando/New()
..()
- gear_tweaks = list(gear_tweak_free_color_choice)
\ No newline at end of file
+ gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/head/beanie
+ display_name = "beanie"
+ path = /obj/item/clothing/head/beanie
+
+/datum/gear/head/beanie/New()
+ ..()
+ gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/head/loose_beanie
+ display_name = "loose beanie"
+ path = /obj/item/clothing/head/beanie_loose
+
+/datum/gear/head/loose_beanie/New()
+ ..()
+ gear_tweaks = list(gear_tweak_free_color_choice)
diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm
index f5af4e4bb84..b62e3ddd64d 100644
--- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm
@@ -82,4 +82,21 @@
/datum/gear/shoes/tongs/New()
..()
- gear_tweaks = list(gear_tweak_free_color_choice)
\ No newline at end of file
+ gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/shoes/hitops
+ display_name = "high-top selection"
+ description = "High-top sneakers, in a selection of colors."
+ path = /obj/item/clothing/shoes/hitops
+
+/datum/gear/shoes/hitops/New()
+ ..()
+ var/shoes = list()
+ shoes["high-tops, white"] = /obj/item/clothing/shoes/hitops
+ shoes["high-tops, red"] = /obj/item/clothing/shoes/hitops/red
+ shoes["high-tops, black"] = /obj/item/clothing/shoes/hitops/black
+ shoes["high-tops, blue"] = /obj/item/clothing/shoes/hitops/blue
+ shoes["high-tops, green"] = /obj/item/clothing/shoes/hitops/green
+ shoes["high-tops, purple"] = /obj/item/clothing/shoes/hitops/purple
+ shoes["high-tops, yellow"] = /obj/item/clothing/shoes/hitops/yellow
+ gear_tweaks += new/datum/gear_tweak/path(shoes)
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 3ca07276754..645db57af24 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -18,7 +18,6 @@
jackets["corporate brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
jackets["black jacket"] = /obj/item/clothing/suit/storage/leather_jacket
jackets["brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket
- jackets["track jacket"] = /obj/item/clothing/suit/storage/toggle/tracksuit
jackets["flannel jacket, green"] = /obj/item/clothing/suit/storage/toggle/flannel
jackets["flannel jacket, red"] = /obj/item/clothing/suit/storage/toggle/flannel/red
jackets["flannel jacket, blue"] = /obj/item/clothing/suit/storage/toggle/flannel/blue
@@ -80,19 +79,88 @@
/datum/gear/suit/poncho
display_name = "poncho selection"
- path = /obj/item/clothing/suit/poncho
+ path = /obj/item/clothing/accessory/poncho
cost = 1
/datum/gear/suit/poncho/New()
..()
var/poncho = list()
- poncho["poncho, tan"] = /obj/item/clothing/suit/poncho
- poncho["poncho, blue"] = /obj/item/clothing/suit/poncho/blue
- poncho["poncho, green"] = /obj/item/clothing/suit/poncho/green
- poncho["poncho, purple"] = /obj/item/clothing/suit/poncho/purple
- poncho["poncho, red"] = /obj/item/clothing/suit/poncho/red
+ poncho["poncho, tan"] = /obj/item/clothing/accessory/poncho
+ poncho["poncho, blue"] = /obj/item/clothing/accessory/poncho/blue
+ poncho["poncho, green"] = /obj/item/clothing/accessory/poncho/green
+ poncho["poncho, purple"] = /obj/item/clothing/accessory/poncho/purple
+ poncho["poncho, red"] = /obj/item/clothing/accessory/poncho/red
+ poncho["poncho, medical"] = /obj/item/clothing/accessory/poncho/roles/medical
+ poncho["poncho, engineering"] = /obj/item/clothing/accessory/poncho/roles/engineering
+ poncho["poncho, science"] = /obj/item/clothing/accessory/poncho/roles/science
+ poncho["poncho, cargo"] = /obj/item/clothing/accessory/poncho/roles/cargo
gear_tweaks += new/datum/gear_tweak/path(poncho)
+/datum/gear/suit/roles/poncho/cloak/cmo
+ display_name = "cloak, chief medical officer"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/cmo
+ allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/suit/roles/poncho/cloak/ce
+ display_name = "cloak, chief engineer"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/ce
+ allowed_roles = list("Chief Engineer")
+
+/datum/gear/suit/roles/poncho/cloak/rd
+ display_name = "cloak, research director"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/rd
+ allowed_roles = list("Research Director")
+
+/datum/gear/suit/roles/poncho/cloak/qm
+ display_name = "cloak, quartermaster"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/qm
+ allowed_roles = list("Quartermaster")
+
+/datum/gear/suit/roles/poncho/cloak/captain
+ display_name = "cloak, captain"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/captain
+ allowed_roles = list("Captain")
+
+/datum/gear/suit/roles/poncho/cloak/hop
+ display_name = "cloak, head of personnel"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/hop
+ allowed_roles = list("Head of Personnel")
+
+/datum/gear/suit/roles/poncho/cloak/cargo
+ display_name = "cloak, cargo"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
+ allowed_roles = list("Cargo Technician","Quartermaster")
+
+/datum/gear/suit/roles/poncho/cloak/mining
+ display_name = "cloak, mining"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/mining
+ allowed_roles = list("Quartermaster","Shaft Miner")
+
+/datum/gear/suit/roles/poncho/cloak/service
+ display_name = "cloak, service"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/service
+ allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian")
+
+/datum/gear/suit/roles/poncho/cloak/engineer
+ display_name = "cloak, engineer"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/engineer
+ allowed_roles = list("Station Engineer", "Chief Engineer", "Engineering Apprentice")
+
+/datum/gear/suit/roles/poncho/cloak/atmos
+ display_name = "cloak, atmos"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/atmos
+ allowed_roles = list("Chief Engineer","Atmospheric Technician")
+
+/datum/gear/suit/roles/poncho/cloak/research
+ display_name = "cloak, science"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/research
+ allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
+
+/datum/gear/suit/roles/poncho/cloak/medical
+ display_name = "cloak, medical"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/medical
+ allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
+
/datum/gear/suit/blue_lawyer_jacket
display_name = "suit jacket, blue"
path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
@@ -209,3 +277,76 @@
coat["dominia great coat, black"] = /obj/item/clothing/suit/storage/toggle/dominia/black
coat["dominia great coat, alternative black"] = /obj/item/clothing/suit/storage/toggle/dominia/black/alt
gear_tweaks += new/datum/gear_tweak/path(coat)
+
+/datum/gear/suit/military
+ display_name = "military jacket selection"
+ description = "A selection of military jackets, for the trained marksman in you."
+ path = /obj/item/clothing/suit/storage/miljacket
+
+/datum/gear/suit/military/New()
+ ..()
+ var/coat = list()
+ coat["military jacket"] = /obj/item/clothing/suit/storage/miljacket
+ coat["military jacket, alternative"] = /obj/item/clothing/suit/storage/miljacket/alt
+ coat["military jacket, green"] = /obj/item/clothing/suit/storage/miljacket/green
+ gear_tweaks += new/datum/gear_tweak/path(coat)
+
+/datum/gear/suit/miscellaneous/engi_dep_jacket
+ display_name = "department jacket, engineering"
+ path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
+
+/datum/gear/suit/miscellaneous/supply_dep_jacket
+ display_name = "department jacket, supply"
+ path = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
+
+/datum/gear/suit/miscellaneous/sci_dep_jacket
+ display_name = "department jacket, science"
+ path = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
+
+/datum/gear/suit/miscellaneous/med_dep_jacket
+ display_name = "department jacket, medical"
+ path = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
+
+/datum/gear/suit/miscellaneous/peacoat
+ display_name = "peacoat"
+ path = /obj/item/clothing/suit/storage/toggle/peacoat
+
+/datum/gear/suit/miscellaneous/peacoat/New()
+ ..()
+ gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/suit/varsity
+ display_name = "varsity jacket selection"
+ path = /obj/item/clothing/suit/varsity
+
+/datum/gear/suit/varsity/New()
+ ..()
+ var/list/varsities = list()
+ for(var/varsity_style in typesof(/obj/item/clothing/suit/varsity))
+ var/obj/item/clothing/suit/varsity/varsity = varsity_style
+ varsities[initial(varsity.name)] = varsity
+ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(varsities))
+
+/datum/gear/suit/track
+ display_name = "track jacket selection"
+ path = /obj/item/clothing/suit/storage/toggle/track
+
+/datum/gear/suit/track/New()
+ ..()
+ var/list/tracks = list()
+ for(var/track_style in typesof(/obj/item/clothing/suit/storage/toggle/track))
+ var/obj/item/clothing/suit/storage/toggle/track/track = track_style
+ tracks[initial(track.name)] = track
+ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tracks))
+
+/datum/gear/suit/puffer_coat
+ display_name = "puffer coat"
+ path = /obj/item/clothing/suit/jacket/puffer
+
+/datum/gear/suit/puffer_vest
+ display_name = "puffer vest"
+ path = /obj/item/clothing/suit/jacket/puffer/vest
+
+/datum/gear/suit/greenjacket
+ display_name = "green suit jacket"
+ path = /obj/item/clothing/suit/storage/toggle/greengov
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index d903500f7cb..69273755247 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -174,6 +174,10 @@
pants["tan pants"] = /obj/item/clothing/under/pants/tan
pants["khaki pants"] = /obj/item/clothing/under/pants/khaki
pants["track pants"] = /obj/item/clothing/under/pants/track
+ pants["blue track pants"] = /obj/item/clothing/under/pants/track/blue
+ pants["green track pants"] = /obj/item/clothing/under/pants/track/green
+ pants["white track pants"] = /obj/item/clothing/under/pants/track/white
+ pants["red track pants"] = /obj/item/clothing/under/pants/track/blue
pants["camo pants"] = /obj/item/clothing/under/pants/camo
pants["athletic shorts, black"] = /obj/item/clothing/under/shorts
pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red
@@ -210,4 +214,16 @@
suit["dominia suit"] = /obj/item/clothing/under/dominia
suit["dominia suit, black"] = /obj/item/clothing/under/dominia/black
suit["lyodsuit"] = /obj/item/clothing/under/dom_thermal
- gear_tweaks += new/datum/gear_tweak/path(suit)
\ No newline at end of file
+ gear_tweaks += new/datum/gear_tweak/path(suit)
+
+/datum/gear/uniform/miscellaneous/kimono
+ display_name = "kimono"
+ path = /obj/item/clothing/under/kimono
+
+/datum/gear/uniform/miscellaneous/kimono/New()
+ ..()
+ gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/uniform/miscellaneous/greensuit
+ display_name = "green formal uniform"
+ path = /obj/item/clothing/under/gov
\ No newline at end of file
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index adb9ab2ab67..5f6ffe2165e 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -315,6 +315,33 @@
item_state = "earmuffs"
slot_flags = SLOT_EARS | SLOT_TWOEARS
+/obj/item/clothing/ears/earmuffs/headphones
+ name = "headphones"
+ desc = "Unce unce unce unce."
+ var/headphones_on = 0
+ icon_state = "headphones_off"
+ item_state = "headphones"
+ slot_flags = SLOT_EARS | SLOT_TWOEARS
+
+/obj/item/clothing/ears/earmuffs/headphones/verb/togglemusic()
+ set name = "Toggle Headphone Music"
+ set category = "Object"
+ set src in usr
+ if(!istype(usr, /mob/living)) return
+ if(usr.stat) return
+
+ if(headphones_on)
+ icon_state = "headphones_off"
+ headphones_on = 0
+ usr << "You turn the music off."
+ else
+ icon_state = "headphones_on"
+ headphones_on = 1
+ usr << "You turn the music on."
+
+ update_clothing_icon()
+
+
///////////////////////////////////////////////////////////////////////
//Gloves
/obj/item/clothing/gloves
@@ -701,6 +728,8 @@
"Resomi" = 'icons/mob/species/resomi/suit.dmi'
)
+ valid_accessory_slots = list("over")
+
/obj/item/clothing/suit/update_clothing_icon()
if (ismob(src.loc))
var/mob/M = src.loc
@@ -739,7 +768,7 @@
//convenience var for defining the icon state for the overlay used when the clothing is worn.
//Also used by rolling/unrolling.
var/worn_state = null
- valid_accessory_slots = list("utility","armband","decor")
+ valid_accessory_slots = list("utility","armband","decor", "over")
restricted_accessory_slots = list("utility", "armband")
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 7853d0a300f..45a7c8b124d 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -195,3 +195,17 @@
name = "evening gloves"
desc = "A pair of gloves that reach past the elbow."
icon_state = "evening_gloves"
+
+/obj/item/clothing/gloves/fingerless
+ desc = "A pair of gloves that don't actually cover the fingers."
+ name = "fingerless gloves"
+ icon_state = "fingerlessgloves"
+ item_state = "fingerlessgloves"
+ fingerprint_chance = 100
+
+/obj/item/clothing/gloves/fingerless/attackby(obj/item/weapon/W, mob/user)
+ if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel))
+ user << "What do you plan to snip?" //Nope
+ return
+ ..()
+
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 483442f30cd..f12de0edb1e 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -381,4 +381,16 @@
/obj/item/clothing/head/fedora/grey
icon_state = "detective2"
- desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
\ No newline at end of file
+ desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
+
+/obj/item/clothing/head/beanie
+ name = "beanie"
+ desc = "A head-hugging brimless winter cap. This one is tight."
+ icon_state = "beanie"
+ item_state = "beanie"
+
+/obj/item/clothing/head/beanie_loose
+ name = "loose beanie"
+ desc = "A head-hugging brimless winter cap. This one is loose."
+ icon_state = "beanie_hang"
+ item_state = "beanie"
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index bd27ebaad3e..d9a2eb7c718 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -57,7 +57,7 @@
name = "orange shoes"
icon_state = "orange"
var/obj/item/weapon/handcuffs/chained = null
-
+
/obj/item/clothing/shoes/flats
desc = "A pair of black, low-heeled women's flats."
name = "black dress flats"
@@ -125,4 +125,48 @@
if (istype(H, /obj/item/weapon/handcuffs))
attach_cuffs(H, user)
+/obj/item/clothing/shoes/hitops
+ name = "white high-tops"
+ desc = "A pair of shoes that extends past the ankle. Based on a centuries-old, timeless design."
+ icon_state = "whitehi"
+ item_state = "whitehi"
+/obj/item/clothing/shoes/hitops/red
+ name = "red high-tops"
+ icon_state = "redhi"
+ item_state = "redhi"
+
+/obj/item/clothing/shoes/hitops/brown
+ name = "brown high-tops"
+ icon_state = "brownhi"
+ item_state = "brownhi"
+
+/obj/item/clothing/shoes/hitops/black
+ name = "black high-tops"
+ icon_state = "blackhi"
+ item_state = "blackhi"
+
+/obj/item/clothing/shoes/hitops/orange
+ name = "orange high-tops"
+ icon_state = "orangehi"
+ item_state = "orangehi"
+
+/obj/item/clothing/shoes/hitops/blue
+ name = "blue high-tops"
+ icon_state = "bluehi"
+ item_state = "bluehi"
+
+/obj/item/clothing/shoes/hitops/green
+ name = "green high-tops"
+ icon_state = "greenhi"
+ item_state = "greenhi"
+
+/obj/item/clothing/shoes/hitops/purple
+ name = "purple high-tops"
+ icon_state = "purplehi"
+ item_state = "purplehi"
+
+/obj/item/clothing/shoes/hitops/yellow
+ name = "yellow high-tops"
+ icon_state = "yellowhi"
+ item_state = "yellowhi"
\ No newline at end of file
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index dc9cc99bb81..b9ada2f7e3f 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -222,36 +222,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 2.0
-/obj/item/clothing/suit/poncho
- name = "poncho"
- desc = "A simple, comfortable poncho."
- icon_state = "classicponcho"
- item_state = "classicponcho"
-
-/obj/item/clothing/suit/poncho/green
- name = "green poncho"
- desc = "A simple, comfortable cloak without sleeves. This one is green."
- icon_state = "greenponcho"
- item_state = "greenponcho"
-
-/obj/item/clothing/suit/poncho/red
- name = "red poncho"
- desc = "A simple, comfortable cloak without sleeves. This one is red."
- icon_state = "redponcho"
- item_state = "redponcho"
-
-/obj/item/clothing/suit/poncho/purple
- name = "purple poncho"
- desc = "A simple, comfortable cloak without sleeves. This one is purple."
- icon_state = "purpleponcho"
- item_state = "purpleponcho"
-
-/obj/item/clothing/suit/poncho/blue
- name = "blue poncho"
- desc = "A simple, comfortable cloak without sleeves. This one is blue."
- icon_state = "blueponcho"
- item_state = "blueponcho"
-
/obj/item/clothing/suit/storage/toggle/bomber
name = "bomber jacket"
desc = "A thick, well-worn WW2 leather bomber jacket."
@@ -327,16 +297,6 @@
icon_open = "black_hoodie_open"
icon_closed = "black_hoodie"
-/obj/item/clothing/suit/storage/toggle/tracksuit
- name = "track jacket"
- desc = "An athletic black and white track jacket."
- icon = 'icons/obj/tracksuit.dmi'
- icon_state = "trackjacket"
- item_state = "trackjacket"
- icon_open = "trackjacket_open"
- icon_closed = "trackjacket"
- contained_sprite = 1
-
/obj/item/clothing/suit/storage/toggle/flannel
name = "green flannel shirt"
desc = "A flannel shirt, for all your space hipster needs."
@@ -429,4 +389,161 @@
icon_state = "dominian_noble5"
item_state = "dominian_noble5"
icon_open = "dominian_noble5_open"
- icon_closed = "dominian_noble5"
\ No newline at end of file
+ icon_closed = "dominian_noble5"
+
+/obj/item/clothing/suit/storage/toggle/greengov
+ name = "green formal jacket"
+ desc = "A sleek proper formal jacket with gold buttons."
+ icon_state = "suitjacket_green_open"
+ item_state = "suitjacket_green"
+ icon_open = "suitjacket_green_open"
+ icon_closed = "suitjacket_green"
+ body_parts_covered = UPPER_TORSO|ARMS
+
+/obj/item/clothing/suit/storage/toggle/track
+ name = "track jacket"
+ desc = "a track jacket, for the athletic."
+ icon = 'icons/obj/tracksuit.dmi'
+ icon_state = "trackjacket"
+ item_state = "trackjacket"
+ icon_open = "trackjacket_open"
+ icon_closed = "trackjacket"
+ 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)
+ contained_sprite = 1
+
+/obj/item/clothing/suit/storage/toggle/track/blue
+ name = "blue track jacket"
+ icon = 'icons/obj/tracksuit.dmi'
+ icon_state = "trackjacketblue"
+ item_state = "trackjacketblue"
+ icon_open = "trackjacketblue_open"
+ icon_closed = "trackjacketblue"
+ contained_sprite = 1
+
+/obj/item/clothing/suit/storage/toggle/track/green
+ name = "green track jacket"
+ icon = 'icons/obj/tracksuit.dmi'
+ icon_state = "trackjacketgreen"
+ item_state = "trackjacketgreen"
+ icon_open = "trackjacketgreen_open"
+ icon_closed = "trackjacketgreen"
+ contained_sprite = 1
+
+/obj/item/clothing/suit/storage/toggle/track/red
+ name = "red track jacket"
+ icon = 'icons/obj/tracksuit.dmi'
+ icon_state = "trackjacketred"
+ item_state = "trackjacketred"
+ icon_open = "trackjacketred_open"
+ icon_closed = "trackjacketred"
+ contained_sprite = 1
+
+/obj/item/clothing/suit/storage/toggle/track/white
+ name = "white track jacket"
+ icon = 'icons/obj/tracksuit.dmi'
+ icon_state = "trackjacketwhite"
+ item_state = "trackjacketwhite"
+ icon_open = "trackjacketwhite_open"
+ icon_closed = "trackjacketwhite"
+ contained_sprite = 1
+
+/obj/item/clothing/suit/varsity
+ name = "black varsity jacket"
+ desc = "A favorite of jocks everywhere from Sol to the Frontier."
+ icon_state = "varsity"
+ item_state = "varsity"
+ allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
+
+/obj/item/clothing/suit/varsity/red
+ name = "red varsity jacket"
+ icon_state = "varsity_red"
+ item_state = "varsity_red"
+
+/obj/item/clothing/suit/varsity/purple
+ name = "purple varsity jacket"
+ icon_state = "varsity_purple"
+ item_state = "varsity_purple"
+
+/obj/item/clothing/suit/varsity/green
+ name = "green varsity jacket"
+ icon_state = "varsity_green"
+ item_state = "varsity_green"
+
+/obj/item/clothing/suit/varsity/blue
+ name = "blue varsity jacket"
+ icon_state = "varsity_blue"
+ item_state = "varsity_blue"
+
+/obj/item/clothing/suit/varsity/brown
+ name = "brown varsity jacket"
+ icon_state = "varsity_brown"
+ item_state = "varsity_brown"
+
+/obj/item/clothing/suit/storage/miljacket
+ name = "military jacket"
+ desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
+ icon_state = "militaryjacket_nobadge"
+ item_state = "militaryjacket_nobadge"
+ allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
+
+/obj/item/clothing/suit/storage/miljacket/alt
+ name = "military jacket"
+ desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
+ icon_state = "militaryjacket_badge"
+ item_state = "militaryjacket_badge"
+
+/obj/item/clothing/suit/storage/miljacket/green
+ name = "military jacket"
+ desc = "A dark green canvas jacket. Feels sturdy, yet comfortable."
+ icon_state = "militaryjacket_green"
+ item_state = "militaryjacket_green"
+
+/obj/item/clothing/suit/jacket/puffer
+ name = "puffer jacket"
+ desc = "A thick jacket with a rubbery, water-resistant shell. Oddly enough, you don't feel any heat."
+ icon_state = "pufferjacket"
+ item_state = "pufferjacket"
+
+/obj/item/clothing/suit/jacket/puffer/vest
+ name = "puffer vest"
+ desc = "A thick vest with a rubbery, water-resistant shell."
+ icon_state = "puffervest"
+ item_state = "puffervest"
+
+/obj/item/clothing/suit/storage/toggle/peacoat
+ name = "peacoat"
+ desc = "A well-tailored, stylish peacoat."
+ icon_state = "peacoat"
+ item_state = "peacoat"
+ icon_open = "peacoat_open"
+ icon_closed = "peacoat"
+
+/*
+ * Department Jackets
+ */
+/obj/item/clothing/suit/storage/toggle/engi_dep_jacket
+ name = "department jacket, engineering"
+ desc = "A cozy jacket in engineering's colors. Show your department pride!"
+ icon_state = "engi_dep_jacket"
+ item_state = "engi_dep_jacket"
+
+/obj/item/clothing/suit/storage/toggle/supply_dep_jacket
+ name = "department jacket, supply"
+ desc = "A cozy jacket in supply's colors. Show your department pride!"
+ icon_state = "supply_dep_jacket"
+ item_state = "supply_dep_jacket"
+
+/obj/item/clothing/suit/storage/toggle/sci_dep_jacket
+ name = "department jacket, science"
+ desc = "A cozy jacket in science's colors. Show your department pride!"
+ icon_state = "sci_dep_jacket"
+ item_state = "sci_dep_jacket"
+
+/obj/item/clothing/suit/storage/toggle/med_dep_jacket
+ name = "department jacket, medical"
+ desc = "A cozy jacket in medical's colors. Show your department pride!"
+ icon_state = "med_dep_jacket"
+ item_state = "med_dep_jacket"
+
+
+
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 9d141377d32..12c72b1840d 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -321,3 +321,170 @@
name = "zebra scarf"
icon_state = "zebrascarf"
item_state = "zebrascarf"
+
+/obj/item/clothing/accessory/chaps
+ name = "brown chaps"
+ desc = "A pair of loose, brown leather chaps."
+ icon_state = "chaps"
+ item_state = "chaps"
+
+/obj/item/clothing/accessory/chaps/black
+ name = "black chaps"
+ desc = "A pair of loose, black leather chaps."
+ icon_state = "chaps_black"
+ item_state = "chaps_black"
+
+/*
+* Poncho
+*/
+
+/obj/item/clothing/accessory/poncho
+ name = "poncho"
+ desc = "A simple, comfortable poncho."
+ icon_state = "classicponcho"
+ item_state = "classicponcho"
+ icon_override = 'icons/mob/ties.dmi'
+ var/fire_resist = T0C+100
+ allowed = list(/obj/item/weapon/tank/emergency_oxygen)
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+ slot_flags = SLOT_OCLOTHING | SLOT_TIE
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+ siemens_coefficient = 0.9
+ w_class = 3
+ slot = "over"
+
+/obj/item/clothing/accessory/poncho/green
+ name = "green poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is green."
+ icon_state = "greenponcho"
+ item_state = "greenponcho"
+
+/obj/item/clothing/accessory/poncho/red
+ name = "red poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is red."
+ icon_state = "redponcho"
+ item_state = "redponcho"
+
+/obj/item/clothing/accessory/poncho/purple
+ name = "purple poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is purple."
+ icon_state = "purpleponcho"
+ item_state = "purpleponcho"
+
+/obj/item/clothing/accessory/poncho/blue
+ name = "blue poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is blue."
+ icon_state = "blueponcho"
+ item_state = "blueponcho"
+
+/obj/item/clothing/accessory/poncho/roles/medical
+ name = "medical poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is white with green and blue tint, standard Medical colors."
+ icon_state = "medponcho"
+ item_state = "medponcho"
+
+/obj/item/clothing/accessory/poncho/roles/engineering
+ name = "engineering poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is yellow and orange, standard Engineering colors."
+ icon_state = "engiponcho"
+ item_state = "engiponcho"
+
+/obj/item/clothing/accessory/poncho/roles/science
+ name = "science poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is white with purple trim, standard NanoTrasen Science colors."
+ icon_state = "sciponcho"
+ item_state = "sciponcho"
+
+/obj/item/clothing/accessory/poncho/roles/cargo
+ name = "cargo poncho"
+ desc = "A simple, comfortable cloak without sleeves. This one is tan and grey, the colors of Cargo."
+ icon_state = "cargoponcho"
+ item_state = "cargoponcho"
+
+/*
+ * Cloak
+ */
+/obj/item/clothing/accessory/poncho/roles/cloak
+ name = "quartermaster's cloak"
+ desc = "An elaborate brown and gold cloak."
+ icon_state = "qmcloak"
+ item_state = "qmcloak"
+ body_parts_covered = null
+
+/obj/item/clothing/accessory/poncho/roles/cloak/ce
+ name = "chief engineer's cloak"
+ desc = "An elaborate cloak worn by the chief engineer."
+ icon_state = "cecloak"
+ item_state = "cecloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/cmo
+ name = "chief medical officer's cloak"
+ desc = "An elaborate cloak meant to be worn by the chief medical officer."
+ icon_state = "cmocloak"
+ item_state = "cmocloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/hop
+ name = "head of personnel's cloak"
+ desc = "An elaborate cloak meant to be worn by the head of personnel."
+ icon_state = "hopcloak"
+ item_state = "hopcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/rd
+ name = "research director's cloak"
+ desc = "An elaborate cloak meant to be worn by the research director."
+ icon_state = "rdcloak"
+ item_state = "rdcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/qm
+ name = "quartermaster's cloak"
+ desc = "An elaborate cloak meant to be worn by the quartermaster."
+ icon_state = "qmcloak"
+ item_state = "qmcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/captain
+ name = "captain's cloak"
+ desc = "An elaborate cloak meant to be worn by the colony director."
+ icon_state = "capcloak"
+ item_state = "capcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/cargo
+ name = "brown cloak"
+ desc = "A simple brown and black cloak worn by crate jockeys."
+ icon_state = "cargocloak"
+ item_state = "cargocloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mining
+ name = "trimmed purple cloak"
+ desc = "A trimmed purple and brown cloak worn by dwarves."
+ icon_state = "miningcloak"
+ item_state = "miningcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/service
+ name = "green cloak"
+ desc = "A simple green and blue cloak worn by.. Who?"
+ icon_state = "servicecloak"
+ item_state = "servicecloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/engineer
+ name = "gold cloak"
+ desc = "A simple gold and brown cloak worn by grease monkeys."
+ icon_state = "engicloak"
+ item_state = "engicloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/atmos
+ name = "yellow cloak"
+ desc = "A trimmed yellow and blue cloak worn by airbenders."
+ icon_state = "atmoscloak"
+ item_state = "atmoscloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/research
+ name = "purple cloak"
+ desc = "A simple purple and white cloak worn by nerds."
+ icon_state = "scicloak"
+ item_state = "scicloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/medical
+ name = "blue cloak"
+ desc = "A simple blue and white cloak worn by suit sensor activists."
+ icon_state = "medcloak"
+ item_state = "medcloak"
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index f0150a1148e..763eacdfb7d 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -620,3 +620,28 @@
desc = "An oldfashioned red swimsuit."
icon_state = "swim_red"
siemens_coefficient = 1
+
+/obj/item/clothing/under/kimono
+ name = "kimono"
+ desc = "A traditional Japanese kimono."
+ icon_state = "kimono"
+ item_state = "kimono"
+
+/obj/item/clothing/under/kimono/ronin
+ name = "ronin kimono"
+ desc = "A non-traditional Japanese kimono, it appears to be very gothic. Like, totally gothic."
+ icon_state = "ronin_kimono"
+ item_state = "ronin_kimono"
+
+/obj/item/clothing/under/kimono/fancy
+ name = "fancy kimono"
+ desc = "A Japanese kimono, this one is very luxurious. It brings to mine iced tea cans."
+ icon_state = "fancy_kimono"
+ item_state = "fancy_kimono"
+
+/obj/item/clothing/under/gov
+ name = "green formal uniform"
+ desc = "A neat proper uniform of someone on offical business. Plain, professional attire. The collar is immaculately starched."
+ icon_state = "greensuit"
+ item_state = "greensuit"
+ worn_state = "greensuit"
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 02deaf0ff79..451d209d3ed 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -121,6 +121,26 @@
item_state = "trackpants"
contained_sprite = 1
+/obj/item/clothing/under/pants/track/blue
+ name = "blue track pants"
+ icon_state = "trackpantsblue"
+ item_state = "trackpantsblue"
+
+/obj/item/clothing/under/pants/track/green
+ name = "green track pants"
+ icon_state = "trackpantsgreen"
+ item_state = "trackpantsgreen"
+
+/obj/item/clothing/under/pants/track/white
+ name = "white track pants"
+ icon_state = "trackpantswhite"
+ item_state = "trackpantswhite"
+
+/obj/item/clothing/under/pants/track/red
+ name = "red track pants"
+ icon_state = "trackpantsred"
+ item_state = "trackpantsred"
+
/obj/item/clothing/under/pants/classic
name = "classic jeans"
desc = "A pair of classic jeans."
diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm
index cadb8d2638b..add9784bd6c 100644
--- a/code/modules/clothing/under/skirts.dm
+++ b/code/modules/clothing/under/skirts.dm
@@ -64,4 +64,11 @@
desc = "A black jumpskirt, Sol size 0."
icon_state = "blackjumpskirt"
item_state = "bl_suit"
- worn_state = "blackjumpskirt"
\ No newline at end of file
+ worn_state = "blackjumpskirt"
+
+/obj/item/clothing/under/skirt/loincloth
+ name = "loincloth"
+ desc = "A piece of cloth wrapped around the waist."
+ icon_state = "loincloth"
+ item_state = "loincloth"
+ worn_state = "loincloth"
\ No newline at end of file
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index d42a8af5751..216a0931d57 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1002,7 +1002,7 @@ All custom items with worn sprites must follow the contained sprite system: http
contained_sprite = TRUE
-/obj/item/clothing/suit/poncho/fluff/flaming_poncho //Stitched Heart White Poncho - Flaming Hearts Love Stars - sleepywolf
+/obj/item/clothing/accessory/poncho/fluff/flaming_poncho //Stitched Heart White Poncho - Flaming Hearts Love Stars - sleepywolf
name = "stitched heart white poncho"
desc = "A white poncho stitched together shoddily, with a pink heart made of flame patterned on the front. The fabric is rough, like chainmail."
icon = 'icons/obj/custom_items/flaming_poncho.dmi'
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 13ce241cac1..ea613290bed 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -69,10 +69,16 @@
//suit/armour
if(wear_suit)
+ var/tie_msg
+ if(istype(wear_suit,/obj/item/clothing/suit))
+ var/obj/item/clothing/suit/U = wear_suit
+ if(U.accessories.len)
+ tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]"
+
if(wear_suit.blood_DNA)
msg += "[T.He] [T.is] wearing \icon[wear_suit] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_suit.name]!\n"
else
- msg += "[T.He] [T.is] wearing \icon[wear_suit] \a [wear_suit].\n"
+ msg += "[T.He] [T.is] wearing \icon[wear_suit] \a [wear_suit][tie_msg].\n"
//suit/armour storage
if(s_store && !skipsuitstorage)
diff --git a/html/changelogs/paradoxspace-militaryfashionshow.yml b/html/changelogs/paradoxspace-militaryfashionshow.yml
new file mode 100644
index 00000000000..599df640ffe
--- /dev/null
+++ b/html/changelogs/paradoxspace-militaryfashionshow.yml
@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+#################################
+
+# Your name.
+author: ParadoxSpace
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Adds fingerless gloves, varsity jackets, new tracksuits, high-top shoes, departmental ponchos, beanies, departmental cloaks, departmental jackets, puffer jackets, a kimono, a new formal uniform, headphones, and military jackets."
+ - rscadd: "Cloaks and ponchos can now be worn over suit-slot items and as jumpsuit accessories. Yes, even over spacesuits and armored vests."
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
index c30f2fbacaf..87caf77f75e 100644
Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 561052e4c04..388705d59d9 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 56f0bc0e106..09b6cc814c1 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 9b399a482d7..415e405aeaf 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 65f22fa44bd..d2954f06d6a 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index da47e66b52d..a8958afea7b 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 5fbb092d3aa..679bafcdd72 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi
index 6073d67da4e..9d2361b0498 100644
Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index b61761252aa..d2aa7780fc8 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 346b362f66a..7d148c1190a 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index bef92def173..f205370001a 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 1dbcf98926b..4212f5ccf53 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index 56a2376a195..91e4b9b6f26 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index df71b02bf7c..60d839a54d1 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 8f9f78ba869..caea425c2de 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/tracksuit.dmi b/icons/obj/tracksuit.dmi
index 106cb60ceb5..39580a56ed1 100644
Binary files a/icons/obj/tracksuit.dmi and b/icons/obj/tracksuit.dmi differ