Merge branch 'master' into upstream-merge-32188

2017-11-18 05:31:42 +00:00
parent bc1f65b381 9e78bcd8f9
commit eeba86e27e
109 changed files with 452 additions and 425 deletions
@@ -8,6 +8,13 @@
 	item_color = "barman"
 	alt_covers_chest = 1

+/obj/item/clothing/under/rank/bartender/purple
+	desc = "It looks like it has lots of flair!"
+	name = "purple bartender's uniform"
+	icon_state = "purplebartender"
+	item_state = "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.
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
 	name = "captain's jumpsuit"