Merge branch 'master' into upstream-merge-32188

code/modules/clothing/head/misc_special.dm

@@ -18,7 +18,6 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	item_state = "welding"
 	materials = list(MAT_METAL=1750, MAT_GLASS=400)
-//	var/up = 0
 	flash_protect = 2
 	tint = 2
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 60)

code/modules/clothing/under/jobs/civilian.dm

@@ -13,6 +13,7 @@
 	name = "purple bartender's uniform"
 	icon_state = "purplebartender"
 	item_state = "purplebartender"
+	item_color = "purplebartender"
 	alt_covers_chest = 1
 
 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.