Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00
parent eeba86e27e 03d67c753e
commit 1f6b3ce629
285 changed files with 56239 additions and 56588 deletions
@@ -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.