Merge remote-tracking branch 'upstream/master'

code/game/objects/items/clothing.dm

@@ -174,6 +174,7 @@ THERMAL GLASSES
 	desc = A.desc
 	icon_state = A.icon_state
 	item_state = A.item_state
+	usr.update_clothing()
 	color = A.color
 
 /obj/item/clothing/under/chameleon/emp_act(severity)

code/game/objects/items/item.dm

@@ -10,6 +10,7 @@
 
 /obj/item/proc/dropped(mob/user as mob)
 	..()
+	user.update_clothing()
 
 	// So you can't drop the Offhand
 	if(istype(src, /obj/item/weapon/offhand))

code/modules/mob/living/carbon/human/human_attackalien.dm

@@ -70,4 +70,5 @@
 					for(var/mob/O in viewers(src, null))
 						if ((O.client && !( O.blinded )))
 							O.show_message(text("\red <B>[] has tried to disarm []!</B>", M, src), 1)
+	update_clothing()
 	return

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -124,6 +124,7 @@
 
 			playsound(loc, 'punchmiss.ogg', 25, 1, -1)
 			visible_message("\red <B>[M] attempted to disarm [src]!</B>")
+	update_clothing()
 	return
 
 

code/modules/mob/living/carbon/human/human_attackpaw.dm

@@ -20,4 +20,5 @@
 				src = null
 				src = H.monkeyize()
 				contract_disease(D,1,0)
+	update_clothing()
 	return

code/modules/mob/living/carbon/human/human_damage.dm

@@ -67,4 +67,5 @@
 
 	UpdateDamageIcon()
 	updatehealth()
+	update_clothing()
 	return 1

code/modules/mob/living/carbon/human/human_defense.dm

@@ -135,4 +135,5 @@ emp_act
 				if(bloody)
 					if(src.wear_suit)	src.wear_suit.add_blood(src)
 					if(src.w_uniform)	src.w_uniform.add_blood(src)
-	src.UpdateDamageIcon()
+	UpdateDamageIcon()
+	update_clothing()

code/modules/mob/organ/organ.dm

@@ -293,6 +293,7 @@
 					var/lol = pick(cardinal)
 					step(H,lol)
 					destroyed = 1
+			src.owner.update_clothing()
 
 	proc/createwound(var/size = 1)
 		if(ishuman(src.owner))