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

# Conflicts:
#	icons/mob/clothing/suit.dmi

code/modules/clothing/glasses/_glasses.dm

@@ -311,7 +311,7 @@
 		to_chat(user, "<span class = 'danger'>Install a new flash in [src]!</span>")
 
 /obj/item/clothing/glasses/sunglasses/stunglasses/attackby(obj/item/W,mob/user)
-	if (istype(W,/obj/item/screwdriver))
+	if (W.tool_behaviour == TOOL_SCREWDRIVER)
 		if (installed)
 			installed.forceMove(get_turf(src))
 			to_chat(user, "<span class = 'notice'>You remove [installed] from [src].</span>")

code/modules/clothing/gloves/color.dm

@@ -99,7 +99,7 @@
 	name = "fingerless insulated gloves"
 
 /obj/item/clothing/gloves/color/yellow/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/wirecutters))
+	if(I.tool_behaviour == TOOL_WIRECUTTER)
 		if(can_be_cut && icon_state == initial(icon_state))//only if not dyed
 			to_chat(user, "<span class='notice'>You snip the fingertips off of [src].</span>")
 			I.play_tool_sound(src)
@@ -108,7 +108,7 @@
 	..()
 
 /obj/item/clothing/gloves/color/fyellow/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/wirecutters))
+	if(I.tool_behaviour == TOOL_WIRECUTTER)
 		if(can_be_cut && icon_state == initial(icon_state))//only if not dyed
 			to_chat(user, "<span class='notice'>You snip the fingertips off of [src].</span>")
 			I.play_tool_sound(src)
@@ -130,7 +130,7 @@
 	strip_mod = 1.2
 
 /obj/item/clothing/gloves/color/black/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/wirecutters))
+	if(I.tool_behaviour == TOOL_WIRECUTTER)
 		if(can_be_cut && icon_state == initial(icon_state))//only if not dyed
 			to_chat(user, "<span class='notice'>You snip the fingertips off of [src].</span>")
 			I.play_tool_sound(src)

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 = 3 SECONDS
-	parry_failed_clickcd_duration = 0.5 SECONDS
+	parry_cooldown = 0
+	parry_failed_clickcd_duration = 0
 
 /obj/item/clothing/gloves/botanic_leather
 	name = "botanist's leather gloves"

code/modules/clothing/head/helmet.dm

@@ -313,7 +313,7 @@
 					A.Grant(user)
 		return
 
-	if(istype(I, /obj/item/screwdriver))
+	if(I.tool_behaviour == TOOL_SCREWDRIVER)
 		if(F)
 			for(var/obj/item/flashlight/seclite/S in src)
 				to_chat(user, "<span class='notice'>You unscrew the seclite from [src].</span>")

code/modules/clothing/spacesuits/hardsuit.dm

@@ -122,7 +122,7 @@
 			jetpack = I
 			to_chat(user, "<span class='notice'>You successfully install the jetpack into [src].</span>")
 			return
-	else if(istype(I, /obj/item/screwdriver))
+	else if(I.tool_behaviour == TOOL_SCREWDRIVER)
 		if(!jetpack)
 			to_chat(user, "<span class='warning'>[src] has no jetpack installed.</span>")
 			return

code/modules/clothing/suits/cloaks.dm

@@ -107,7 +107,7 @@
 	name = "canvas cloak"
 	desc = "A rugged cloak made of canvas."
 	icon_state = "cancloak"
-	item_state = "cancloak"
+	item_state = "cloak"
 	var/list/poly_colors = list("#585858", "#373737", "#BEBEBE")
 
 /obj/item/clothing/neck/cancloak/polychromic/ComponentInitialize()

code/modules/clothing/suits/miscellaneous.dm

@@ -496,7 +496,7 @@
 
 /obj/item/clothing/suit/jacket/urbanjacket/polychromic/ComponentInitialize()
 	. = ..()
-	AddElement(/datum/element/polychromic, list("#26321D", "#CBBDAF", "#292929"), 3)
+	AddElement(/datum/element/polychromic, list("#3D4C31", "#CBBDAF", "#3B3B3B"), 3)
 
 /obj/item/clothing/suit/jacket/letterman
 	name = "letterman jacket"
@@ -1040,6 +1040,12 @@
 	icon_state = "wbreakpoly"
 	item_state = "wbreakpoly"
 
+/obj/item/clothing/suit/toggle/wbreakpoly/on_toggle(mob/user)
+	if(suittoggled)
+		to_chat(usr, "<span class='notice'>You zip up [src].</span>")
+	else
+		to_chat(usr, "<span class='notice'>You unzip [src].</span>")
+
 /obj/item/clothing/suit/toggle/wbreakpoly/polychromic/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/polychromic, list("#464F65", "#916035", "#474747"), 3)

code/modules/clothing/suits/toggles.dm

@@ -110,6 +110,9 @@
 	suit_toggle(user)
 	return TRUE
 
+/obj/item/clothing/suit/toggle/proc/on_toggle(mob/user) // override this, not suit_toggle, which does checks
+	to_chat(usr, "<span class='notice'>You toggle [src]'s [togglename].</span>")
+
 /obj/item/clothing/suit/toggle/ui_action_click()
 	suit_toggle()
 
@@ -119,7 +122,7 @@
 	if(!can_use(usr))
 		return 0
 
-	to_chat(usr, "<span class='notice'>You toggle [src]'s [togglename].</span>")
+	on_toggle(usr)
 	if(src.suittoggled)
 		src.icon_state = "[initial(icon_state)]"
 		src.suittoggled = FALSE