Wrist Slot (Wear watches with gloves!) (#10951)

code/game/objects/items.dm

@@ -372,7 +372,8 @@ var/list/global/slot_flags_enumeration = list(
 	"[slot_r_ear]" = SLOT_EARS|SLOT_TWOEARS,
 	"[slot_w_uniform]" = SLOT_ICLOTHING,
 	"[slot_wear_id]" = SLOT_ID,
-	"[slot_tie]" = SLOT_TIE
+	"[slot_tie]" = SLOT_TIE,
+	"[slot_wrists]" = SLOT_WRISTS
 	)
 
 //the mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't.
@@ -762,6 +763,8 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 			M.update_inv_pockets()
 		if (slot_s_store)
 			M.update_inv_s_store()
+		if (slot_wrists)
+			M.update_inv_wrists()
 
 // Attacks mobs that are adjacent to the target and user.
 /obj/item/proc/cleave(var/mob/living/user, var/mob/living/target)

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -173,7 +173,7 @@
 		/obj/item/storage/box/fancy/crayons,
 		/obj/item/soap/deluxe,
 		/obj/item/pen/invisible,
-		/obj/item/clothing/gloves/watch,
+		/obj/item/clothing/wrists/watch,
 		/obj/item/lipstick/random,
 		/obj/item/clothing/shoes/carp,
 		/obj/item/bikehorn,
@@ -347,4 +347,4 @@
 
 /obj/item/xmasgift/viscerator
 	gift_type = /mob/living/simple_animal/hostile/viscerator
-	w_class = ITEMSIZE_NORMAL
+	w_class = ITEMSIZE_NORMAL

code/game/objects/items/weapons/storage/internal.dm

@@ -46,10 +46,10 @@
 
 		if (!( user.restrained() ) && !( user.stat ))
 			switch(over_object.name)
-				if(BP_R_HAND)
+				if("right hand")
 					user.u_equip(master_item)
 					user.put_in_r_hand(master_item)
-				if(BP_L_HAND)
+				if("left hand")
 					user.u_equip(master_item)
 					user.put_in_l_hand(master_item)
 			master_item.add_fingerprint(user)
@@ -96,4 +96,4 @@
 
 /obj/item/storage/internal/skrell/Initialize()
 	. = ..()
-	name = initial(name)
+	name = initial(name)

code/game/objects/items/weapons/storage/storage.dm

@@ -84,10 +84,10 @@
 			return
 
 		switch(over_object.name)
-			if(BP_R_HAND)
+			if("right hand")
 				usr.u_equip(src)
 				usr.put_in_r_hand(src,FALSE)
-			if(BP_L_HAND)
+			if("left hand")
 				usr.u_equip(src)
 				usr.put_in_l_hand(src,FALSE)
 		src.add_fingerprint(usr)

code/game/objects/random/random.dm

@@ -1009,10 +1009,10 @@
 	icon = 'icons/obj/clothing/gloves.dmi'
 	icon_state = "watch"
 	problist = list(
-		/obj/item/clothing/gloves/watch = 1,
-		/obj/item/clothing/gloves/watch/silver = 0.7,
-		/obj/item/clothing/gloves/watch/gold = 0.5,
-		/obj/item/clothing/gloves/watch/spy = 0.3,
+		/obj/item/clothing/wrists/watch = 1,
+		/obj/item/clothing/wrists/watch/silver = 0.7,
+		/obj/item/clothing/wrists/watch/gold = 0.5,
+		/obj/item/clothing/wrists/watch/spy = 0.3,
 	)
 
 /obj/random/hoodie

code/game/objects/structures/watercloset.dm

@@ -257,15 +257,17 @@
 
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			var/washgloves = 1
-			var/washshoes = 1
-			var/washmask = 1
-			var/washears = 1
-			var/washglasses = 1
+			var/washgloves = TRUE
+			var/washshoes = TRUE
+			var/washmask = TRUE
+			var/washears = TRUE
+			var/washglasses = TRUE
+			var/washwrists = TRUE
 
 			if(H.wear_suit)
 				washgloves = !(H.wear_suit.flags_inv & HIDEGLOVES)
 				washshoes = !(H.wear_suit.flags_inv & HIDESHOES)
+				washwrists = !(H.wear_suit.flags_inv & HIDEWRISTS)
 
 			if(H.head)
 				washmask = !(H.head.flags_inv & HIDEMASK)
@@ -318,6 +320,10 @@
 				if(H.belt.clean_blood())
 					H.update_inv_belt(0)
 					update_icons_required = TRUE
+			if(H.wrists && washwrists)
+				if(H.wrists.clean_blood())
+					H.update_inv_wrists(0)
+					update_icons_required = TRUE
 			H.clean_blood(washshoes)
 		else
 			if(M.wear_mask)						//if the mob is not human, it cleans the mask without asking for bitflags