Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi

code/modules/clothing/gloves/miscellaneous.dm

@@ -220,8 +220,8 @@
 	parry_max_attacks = INFINITY
 	parry_failed_cooldown_duration = 2.25 SECONDS
 	parry_failed_stagger_duration = 2.25 SECONDS
-	parry_cooldown = 0
-	parry_failed_clickcd_duration = 0
+	parry_cooldown = 3 SECONDS
+	parry_failed_clickcd_duration = 0.5 SECONDS
 
 /obj/item/clothing/gloves/botanic_leather
 	name = "botanist's leather gloves"

code/modules/clothing/shoes/colour.dm

@@ -51,6 +51,17 @@
 	desc = "Very gay shoes."
 	icon_state = "rain_bow"
 
+/obj/item/clothing/shoes/sneakers/poly/polychromic
+	name = "polychromic shoes"
+	desc = "Every color."
+	icon_state = "poly"
+	item_state = "poly"
+	var/list/poly_colors = list("#FFFFFF", "#1D1D1D")
+
+/obj/item/clothing/shoes/sneakers/poly/polychromic/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, poly_colors, 2)
+
 /obj/item/clothing/shoes/sneakers/orange
 	name = "orange shoes"
 	icon_state = "orange"

code/modules/clothing/suits/cloaks.dm

@@ -102,7 +102,18 @@
 /obj/item/clothing/neck/cloak/polychromic/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/polychromic, poly_colors, 3)
-	
+
+/obj/item/clothing/neck/cancloak/polychromic
+	name = "canvas cloak"
+	desc = "A rugged cloak made of canvas."
+	icon_state = "cancloak"
+	item_state = "cancloak"
+	var/list/poly_colors = list("#585858", "#373737", "#BEBEBE")
+
+/obj/item/clothing/neck/cancloak/polychromic/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, poly_colors, 3)
+
 /obj/item/clothing/neck/cloak/alt
 	name = "cloak"
 	desc = "A ragged up white cloak. It reminds you of a place not far from here."

code/modules/clothing/suits/miscellaneous.dm

@@ -1030,6 +1030,16 @@
 	alternate_worn_layer = UNDER_HEAD_LAYER
 	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 
+/obj/item/clothing/suit/toggle/wbreakpoly
+	name = "polychromic windbreaker"
+	desc = "Perfect for windy days."
+	icon_state = "wbreakpoly"
+	item_state = "wbreakpoly"
+
+/obj/item/clothing/suit/toggle/wbreakpoly/polychromic/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, list("#464F65", "#916035", "#474747"), 3)
+
 /obj/item/clothing/suit/flakjack
 	name = "flak jacket"
 	desc = "A dilapidated jacket made of a supposedly bullet-proof material (Hint: It isn't.). Smells faintly of napalm."