Merge branch 'master' of git://github.com/Baystation12/Baystation12

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))
@@ -369,6 +370,11 @@ mob/proc/flash_weak_pain()
 
 	if(istype(M, /mob/living/carbon/human))
 		M:attacked_by(src, user, def_zone)
+		var/mob/living/carbon/human/H = M
+		if(H)
+			H.UpdateDamageIcon()
+			H.update_clothing()
+		user.update_clothing()
 	else
 		switch(src.damtype)
 			if("brute")

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

@@ -266,6 +266,7 @@ ZIPPO
 				else
 					user.r_hand = W
 				W.layer = 20
+				user.update_clothing()
 		else
 			return ..()
 		src.update_icon()

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

@@ -87,6 +87,7 @@
 
 			spawn( 0 )
 				O.process()
+				user.update_clothing()
 				return
 		else
 			for(var/mob/O in viewers(M, null))

code/game/objects/items/weapons/implants/implantfreedom.dm

@@ -29,6 +29,7 @@
 					dropped(source)
 					if (W)
 						W.layer = initial(W.layer)
+				source.update_clothing()
 		return
 
 

code/game/objects/stool.dm

@@ -69,6 +69,7 @@
 		if (M.buckled == src)
 			M.buckled = null
 			M.anchored = 0
+			M.update_clothing()
 
 /obj/structure/stool/proc/manual_unbuckle_all(mob/user as mob)
 	var/N = 0;
@@ -87,6 +88,7 @@
 //			world << "[M] is no longer buckled to [src]"
 			M.anchored = 0
 			M.buckled = null
+			M.update_clothing()
 			N++
 	return N
 
@@ -109,6 +111,7 @@
 	M.buckled = src
 	M.loc = src.loc
 	M.dir = src.dir
+	M.update_clothing()
 	src:buckled_mobs += M
 	src.add_fingerprint(user)
 	return
@@ -339,6 +342,7 @@
 				M.pixel_y = 0
 				M.anchored = 0
 				M.buckled = null
+				M.update_clothing()
 				N++
 		if(N)
 			density = 0