diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 006f6fb8ad5..d6eee904e40 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -211,6 +211,13 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 			doortype = 22
 			glass = 1
 
+		glass_atmos
+			name = "Maintenance Hatch"
+			icon = 'dooratmoglass.dmi'
+			opacity = 0
+			doortype = 23
+			glass = 1
+
 	centcom
 		name = "Airlock"
 		icon = 'Doorele.dmi'
@@ -435,6 +442,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 						if(20) new/obj/structure/door_assembly/door_assembly_research( src.loc )
 						if(21) new/obj/structure/door_assembly/door_assembly_research( src.loc )
 						if(22) new/obj/structure/door_assembly/door_assembly_min/glass( src.loc )
+						if(23) new/obj/structure/door_assembly/door_assembly_atmo/glass( src.loc )
 					var/obj/item/weapon/airlock_electronics/ae
 					if (!electronics)
 						ae = new/obj/item/weapon/airlock_electronics( src.loc )
diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm
index 57f4d63ad65..f316fcc0e8c 100644
--- a/code/game/objects/door_assembly.dm
+++ b/code/game/objects/door_assembly.dm
@@ -87,12 +87,18 @@ obj/structure/door_assembly
 	door_assembly_atmo
 		name = "Atmospherics Airlock Assembly"
 		icon_state = "door_as_atmo1"
+		glass_base_icon_state = "door_as_gatmo"
+		glass_type = /obj/machinery/door/airlock/glass/glass_atmos
 		airlock_type = /obj/machinery/door/airlock/atmos
 		anchored = 1
 		density = 1
 		state = 1
 		glass = 0
 
+		glass
+			glass = 1
+			icon_state = "door_as_gatmo1"
+
 	door_assembly_research
 		name = "Research Airlock Assembly"
 		icon_state = "door_as_res1"
diff --git a/icons/obj/doors/Dooratmoglass.dmi b/icons/obj/doors/Dooratmoglass.dmi
new file mode 100644
index 00000000000..bdf034e3a94
Binary files /dev/null and b/icons/obj/doors/Dooratmoglass.dmi differ
diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi
index dcb5a91adcd..ee84879fb74 100644
Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ