Merge branch 'master' into tinytweaks

2019-12-01 23:24:56 -08:00
parent e7523862eb f1ae57b626
commit 8d09f5a082
594 changed files with 4654 additions and 2602 deletions
@@ -8,6 +8,10 @@
 	vend_reply = "Thank you for using the ClothesMate!"
 	products = list(/obj/item/clothing/head/that = 4,
 					/obj/item/clothing/head/fedora = 3,
+					/obj/item/clothing/head/beret = 3,
+					/obj/item/clothing/head/beret/black = 3,
+					/obj/item/clothing/head/beret/purple = 3,
+					/obj/item/clothing/head/beret/blue = 3,
 					/obj/item/clothing/glasses/monocle = 3,
 					/obj/item/clothing/suit/jacket = 4,
 					/obj/item/clothing/suit/jacket/puffer/vest = 4,