From 495b4b6ddc30d965aa7ee155ffe30df6eaa807a6 Mon Sep 17 00:00:00 2001
From: Unknown <gamtag7@aol.com>
Date: Mon, 25 Nov 2019 20:13:07 -0700
Subject: [PATCH] Fixes some issues

---
 code/modules/clothing/head/jobs.dm  | 10 ----------
 code/modules/vending/clothesmate.dm |  8 ++++----
 code/modules/vending/wardrobes.dm   |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 99d41f0519..a537d6716e 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -55,9 +55,6 @@
 	name = "captain's white beret"
 	desc = "A white beret fit for a leader."
 	icon_state = "beret_captain_white"
-	dynamic_hair_suffix = ""
-
-	dog_fashion = null
 
 //Head of Personnel
 /obj/item/clothing/head/hopcap
@@ -79,9 +76,6 @@
 	name = "head of personnel's white beret"
 	desc = "The symbol of true bureaucratic micromanagement, although in a fancy form."
 	icon_state = "beret_white_hop"
-	dynamic_hair_suffix = ""
-
-	dog_fashion = null
 
 //Chaplain
 /obj/item/clothing/head/nun_hood
@@ -273,15 +267,11 @@
 	name = "warden's beret"
 	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
 	icon_state = "wardenberet"
-	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-	strip_delay = 60
 
 /obj/item/clothing/head/beret/sec/corporatewarden
 	name = "warden's corporate beret"
 	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
 	icon_state = "beret_corporate_warden"
-	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-	strip_delay = 60
 
 /obj/item/clothing/head/beret/sec/navyofficer
 	desc = "A special beret with the security insignia emblazoned on it. For officers with class."
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 630ae5e521..0d1fe7f047 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -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,
@@ -102,10 +106,6 @@
 					/obj/item/clothing/under/rank/bartender/purple = 4,
 					/obj/item/clothing/accessory/attrocious_pokadots = 8,
 					/obj/item/clothing/accessory/black_white_pokadots = 8)
-		            /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,
 	contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
 					/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
 					/obj/item/clothing/mask/balaclava = 3,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 99a1c54eef..b9de33756e 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -65,7 +65,7 @@
 	vend_reply = "Thank you for using the EngiDrobe!"
 	products = list(/obj/item/clothing/accessory/pocketprotector = 5,
 					/obj/item/clothing/head/beret/eng = 3,
-					/obj/item/storage/backpack/duffelbag/engineering = 2,
+					/obj/item/storage/backpack/duffelbag/engineering = 3,
 					/obj/item/storage/backpack/industrial = 3,
 					/obj/item/storage/backpack/satchel/eng = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/engineering = 3,