diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
index 0c6792aeaec..c4f9c5bbdc5 100644
--- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
@@ -239,9 +239,6 @@
 			overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
 		s_store.screen_loc = ui_sstore1
 
-	if (h_store)
-		h_store.screen_loc = ui_hstore1
-
 	if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
 											   //to hide / show them.
 	if (client)
diff --git a/code/game/algorithm.dm b/code/game/algorithm.dm
index f0c1a7f737a..0303b3f0301 100644
--- a/code/game/algorithm.dm
+++ b/code/game/algorithm.dm
@@ -67,7 +67,6 @@ proc/countJob(rank)
 	slot_r_store = 16
 	slot_s_store = 17
 	slot_in_backpack = 18
-	slot_h_store = 19
 
 /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1)
 	for (var/slot in slots)
@@ -86,9 +85,6 @@ proc/countJob(rank)
 	if(slot == s_store && !src.wear_suit)
 		del(W)
 		return
-	if(slot == h_store && !src.head)
-		del(W)
-		return
 	switch(slot)
 		if(slot_back)
 			if(!src.back)
@@ -167,10 +163,6 @@ proc/countJob(rank)
 				if(B.contents.len < B.storage_slots && W.w_class <= B.max_w_class)
 					W.loc = B
 					equipped = 1
-		if(slot_h_store)
-			if(!src.h_store)
-				src.h_store = W
-				equipped = 1
 
 	if(equipped)
 		W.layer = 20
diff --git a/code/game/hud.dm b/code/game/hud.dm
index 4d60c7d50ac..797f54b9b54 100644
--- a/code/game/hud.dm
+++ b/code/game/hud.dm
@@ -68,7 +68,6 @@ obj/hud/New(var/type = 0)
 		if(mymob:r_ear) mymob:r_ear:screen_loc = ui_rear
 		if(mymob:s_store) mymob:s_store:screen_loc = ui_sstore1
 		if(mymob:glasses) mymob:glasses:screen_loc = ui_glasses
-		if(mymob:h_store) mymob:h_store:screen_loc = ui_hstore1
 	else
 		if(istype(mymob, /mob/living/carbon/human))
 			if(mymob:shoes) mymob:shoes:screen_loc = null
@@ -77,7 +76,6 @@ obj/hud/New(var/type = 0)
 			if(mymob:r_ear) mymob:r_ear:screen_loc = null
 			if(mymob:s_store) mymob:s_store:screen_loc = null
 			if(mymob:glasses) mymob:glasses:screen_loc = null
-			if(mymob:h_store) mymob:h_store:screen_loc = null
 
 
 /obj/hud/var/show_otherinventory = 1
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 3bf370b7d56..37cf507093b 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -104,8 +104,6 @@
 		H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/dflask(H.back), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/lighter/zippo(H), H.slot_l_store)
-//		H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(H), H.slot_h_store)
-//		No... just no. --SkyMarshal
 		var/datum/organ/external/O = H.organs[pick(H.organs)]
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(O)
 		O.implant += L
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index ef285d48af7..144e3d8ce93 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -430,7 +430,11 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 						if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc )	//issue 301 -mysthic
 						if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc )
 						if(17) new/obj/structure/door_assembly/door_assembly_med/glass( src.loc )
+						if(18) new/obj/structure/door_assembly/door_assembly_min( src.loc )
+						if(19) new/obj/structure/door_assembly/door_assembly_atmo( src.loc )
+						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 )
 					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 67cf74849be..b9c5c999055 100644
--- a/code/game/objects/door_assembly.dm
+++ b/code/game/objects/door_assembly.dm
@@ -72,12 +72,18 @@ obj/structure/door_assembly
 	door_assembly_min
 		name = "Mining Airlock Assembly"
 		icon_state = "door_as_min1"
+		glass_base_icon_state = "door_as_gmin"
+		glass_type = /obj/machinery/door/airlock/glass/glass_mining
 		airlock_type = /obj/machinery/door/airlock/mining
 		anchored = 1
 		density = 1
 		state = 1
 		glass = 0
 
+		glass
+			glass = 1
+			icon_state = "door_as_gmin1"
+
 	door_assembly_atmo
 		name = "Atmospherics Airlock Assembly"
 		icon_state = "door_as_atmo1"
@@ -90,12 +96,18 @@ obj/structure/door_assembly
 	door_assembly_research
 		name = "Research Airlock Assembly"
 		icon_state = "door_as_res1"
+		glass_base_icon_state = "door_as_gres"
+		glass_type = /obj/machinery/door/airlock/glass_research
 		airlock_type = /obj/machinery/door/airlock/research
 		anchored = 1
 		density = 1
 		state = 1
 		glass = 0
 
+		glass
+			glass = 1
+			icon_state = "door_as_gres1"
+
 	door_assembly_med
 		name = "Medical Airlock Assembly"
 		icon_state = "door_as_med1"
@@ -243,6 +255,8 @@ obj/structure/door_assembly
 			del(src)
 		else
 			W.loc = src.loc
+
+			//del(W)
 	else if(istype(W, /obj/item/weapon/crowbar) && state == 2 )
 		playsound(src.loc, 'Crowbar.ogg', 100, 1)
 		var/turf/T = get_turf(user)
@@ -266,7 +280,7 @@ obj/structure/door_assembly
 		if(do_after(user, 40))
 			if(G)
 				if(G.amount>=1)
-					user << "\blue You installed glass windows into the airlock assembly!"
+					user << "\blue You installed glass windows the airlock assembly!"
 					G.use(1)
 					src.glass = 1
 					src.name = "Near finished Window Airlock Assembly"
diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm
index 281e451624f..34ef0189ccb 100644
--- a/code/modules/mob/living/carbon/human/hud.dm
+++ b/code/modules/mob/living/carbon/human/hud.dm
@@ -206,14 +206,6 @@
 	using.layer = 19
 	src.other += using
 
-	using = new src.h_type( src )
-	using.name = "hat storage"
-	using.icon = ui_style
-	using.icon_state = "hair"
-	using.screen_loc = ui_hstore1
-	using.layer = 19
-	src.other += using
-
 	using = new src.h_type( src )
 	using.name = "resist"
 	using.icon = ui_style
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 1d1651d2ac9..ac6f0b3fcc9 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -39,7 +39,6 @@
 	var/obj/item/weapon/r_store = null
 	var/obj/item/weapon/l_store = null
 	var/obj/item/weapon/s_store = null
-	var/obj/item/weapon/h_store = null
 
 	var/icon/stand_icon = null
 	var/icon/lying_icon = null
@@ -479,15 +478,6 @@
 		glasses = null
 	else if (W == head)
 		var/obj/item/prev_head = W
-		W = h_store
-		if (W)
-			u_equip(W)
-			if (client)
-				client.screen -= W
-			if (W)
-				W.loc = loc
-				W.dropped(src)
-				W.layer = initial(W.layer)
 		head = null
 		if(prev_head && (prev_head.flags & BLOCKHAIR))
 			// rebuild face
@@ -522,8 +512,6 @@
 		l_store = null
 	else if (W == s_store)
 		s_store = null
-	else if (W == h_store)
-		h_store = null
 	else if (W == back)
 		back = null
 	else if (W == handcuffed)
@@ -754,22 +742,6 @@
 				u_equip(W)
 				s_store = W
 
-		if("hat storage")
-			if (h_store)
-				if (emptyHand)
-					h_store.DblClick()
-				return
-			var/confirm
-			if (head)
-				if (istype(W, /obj/item/weapon/pen))
-					confirm = 1
-				if (istype(head) && is_type_in_list(W, head.allowed)) // NOTE: head is /obj/item/clothing/head/ and parer hat is not /obj/item/clothing/ and does not have "allowed" --rastaf0
-					confirm = 1
-			if (!confirm) return
-			else
-				u_equip(W)
-				h_store = W
-
 	update_clothing()
 
 	return
@@ -1085,9 +1057,6 @@
 			overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
 		s_store.screen_loc = ui_sstore1
 
-	if (h_store)
-		h_store.screen_loc = ui_hstore1
-
 	if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
 											   //to hide / show them.
 	if (client)
@@ -1703,8 +1672,6 @@
 					message = text("\red <B>[] is trying to take off \a [] from []'s body!</B>", source, target.w_uniform, target)
 			if("s_store")
 				message = text("\red <B>[] is trying to take off \a [] from []'s suit!</B>", source, target.s_store, target)
-			if("h_store")
-				message = text("\red <B>[] is trying to empty []'s hat!</B>", source, target)
 			if("pockets")
 				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their pockets emptied by [source.name] ([source.ckey])</font>")
 				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to empty [target.name]'s ([target.ckey]) pockets</font>")
@@ -2319,7 +2286,6 @@ It can still be worn/put on as normal.
 	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
 	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
 	<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
-	<BR><A href='?src=\ref[src];item=h_store'>Empty Hat</A>
 	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
 	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
 	<BR>"}
diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi
index af58305920a..dcb5a91adcd 100644
Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ