diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index d583e775470..b48d6a19338 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -141,7 +141,8 @@
 			new /obj/item/clothing/accessory/storage/brown_vest(src)
 		else
 			new /obj/item/clothing/accessory/storage/webbing(src)
-		new /obj/item/clothing/suit/fire/firefighter(src)
+		new /obj/item/clothing/suit/fire/atmos(src)
+		new /obj/item/clothing/head/hardhat/red/atmos(src)
 		new /obj/item/device/flashlight(src)
 		new /obj/item/weapon/extinguisher(src)
 		new /obj/item/device/radio/headset/headset_eng(src)
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 16a6adda677..142e5d44449 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -31,3 +31,9 @@
 /obj/item/clothing/head/hardhat/dblue
 	icon_state = "hardhat0_dblue"
 	item_state = "hardhat0_dblue"
+
+/obj/item/clothing/head/hardhat/red/atmos
+	name = "atmospheric firefighter helmet"
+	desc = "An atmospheric firefighter's helmet, able to keep the user protected from heat and fire."
+	icon_state = "atmos_fire"
+	item_state = "atmos_fire"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index c0cdd91ecdc..13ec0e26355 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -12,8 +12,8 @@
 /obj/item/clothing/suit/fire
 	name = "firesuit"
 	desc = "A suit that protects against fire and heat."
-	icon_state = "fire"
-	item_state = "fire_suit"
+	icon_state = "firesuit"
+	item_state = "firesuit"
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
@@ -29,7 +29,7 @@
 
 /obj/item/clothing/suit/fire/firefighter
 	icon_state = "firesuit"
-	item_state = "firefighter"
+	item_state = "firesuit"
 
 
 /obj/item/clothing/suit/fire/heavy
@@ -40,6 +40,12 @@
 	w_class = 4//bulky item
 	slowdown = 1.5
 
+/obj/item/clothing/suit/fire/atmos
+	name = "atmospheric technician firesuit"
+	desc = "A suit that protects against fire and heat, this one is designed for atmospheric technicians."
+	icon_state = "atmos_firesuit"
+	item_state = "atmos_firesuit"
+
 /*
  * Bomb protection
  */
diff --git a/html/changelogs/alberyk-PR-582.yml b/html/changelogs/alberyk-PR-582.yml
new file mode 100644
index 00000000000..c3160f63ecb
--- /dev/null
+++ b/html/changelogs/alberyk-PR-582.yml
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Alberyk
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added a firefighting suit and helmet for atmos techs."
+  - imageadd: "New, and better, firesuits sprites."
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 29cc2fb58cc..5032b274a89 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 51fffd3ddd4..25e1b460f27 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 5cdcefab3f9..3a2ba7678da 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 8715d040238..2b6555613aa 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniform.dmi b/icons/obj/clothing/uniform.dmi
new file mode 100644
index 00000000000..14bcb1894a0
Binary files /dev/null and b/icons/obj/clothing/uniform.dmi differ