Merge pull request #928 from FreeStylaLT/notparadise2

Engineering/Atmos beret changes

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -7,7 +7,7 @@
 	icon_opened = "secureceopen"
 	icon_broken = "securecebroken"
 	icon_off = "secureceoff"
-
+
 	New()
 		..()
 		sleep(2)
@@ -31,7 +31,8 @@
 		new /obj/item/device/multitool(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/taperoll/engineering(src)
-		return
+		new /obj/item/clothing/head/beret/eng(src)
+		return
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "Electrical Supplies"
@@ -58,6 +59,7 @@
 		new /obj/item/device/multitool(src)
 		new /obj/item/device/multitool(src)
 		new /obj/item/device/multitool(src)
+		new /obj/item/clothing/head/beret/eng
 		return
 
 
@@ -113,6 +115,7 @@
 		new /obj/item/clothing/glasses/meson(src)
 		new /obj/item/weapon/cartridge/engineering(src)
 		new /obj/item/taperoll/engineering(src)
+		new /obj/item/clothing/head/beret/eng(src)
 		return
 
 /obj/structure/closet/secure_closet/atmos_personal

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -186,9 +186,9 @@
 	new /obj/item/clothing/head/hardhat/red(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 	new /obj/item/clothing/head/hardhat/red(src)
-	new /obj/item/clothing/head/beret/eng(src)
-	new /obj/item/clothing/head/beret/eng(src)
-	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/atmos(src)
+	new /obj/item/clothing/head/beret/atmos(src)
+	new /obj/item/clothing/head/beret/atmos(src)
 	return
 
 

code/modules/clothing/head/jobs.dm

@@ -117,6 +117,11 @@
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
 	icon_state = "e_beret_badge"
 
+/obj/item/clothing/head/beret/atmos
+	name = "atmospherics beret"
+	desc = "A beret for those who have shown immaculate proficienty in piping. Or plumbing."
+	icon_state = "a_beret_badge"
+
 //Medical
 /obj/item/clothing/head/surgery
 	name = "surgical cap"