From 4406fca8c2bc1fdda1a36e56996132df71e92e80 Mon Sep 17 00:00:00 2001
From: Erthilo <erthilo@gmail.com>
Date: Sat, 19 May 2012 02:39:50 +0100
Subject: [PATCH] Merge and compile fixes, changelog too.

---
 code/game/hud.dm                              |  4 ++--
 code/game/objects/door_assembly.dm            |  2 +-
 code/modules/mob/living/carbon/human/human.dm | 11 -----------
 html/changelog.html                           | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/code/game/hud.dm b/code/game/hud.dm
index 797f54b9b54..17c3fa45745 100644
--- a/code/game/hud.dm
+++ b/code/game/hud.dm
@@ -11,10 +11,10 @@
 #define ui_storage1 "SOUTH-1,4"
 #define ui_storage2 "SOUTH-1,5"
 #define ui_sstore1 "SOUTH+1,4"
-#define ui_hstore1 "SOUTH+1,5"
+#define ui_hstore1 "SOUTH+1,6"
 #define ui_resist "EAST+1,SOUTH-1"
 #define ui_gloves "SOUTH,5"
-#define ui_glasses "SOUTH+1,6"
+#define ui_glasses "SOUTH+1,5"
 #define ui_lear "SOUTH,7"
 #define ui_rear "SOUTH,6"
 #define ui_head "SOUTH+1,2"
diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm
index b9c5c999055..57f4d63ad65 100644
--- a/code/game/objects/door_assembly.dm
+++ b/code/game/objects/door_assembly.dm
@@ -97,7 +97,7 @@ obj/structure/door_assembly
 		name = "Research Airlock Assembly"
 		icon_state = "door_as_res1"
 		glass_base_icon_state = "door_as_gres"
-		glass_type = /obj/machinery/door/airlock/glass_research
+		glass_type = /obj/machinery/door/airlock/glass/glass_research
 		airlock_type = /obj/machinery/door/airlock/research
 		anchored = 1
 		density = 1
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ac6f0b3fcc9..8216b01cfe6 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -2125,17 +2125,6 @@ It can still be worn/put on as normal.
 					item.layer = 20
 					target.back = item
 					item.loc = target
-		if("h_store")
-			if (target.h_store)
-				var/obj/item/W = target.h_store
-				target.u_equip(W)
-				if (target.client)
-					target.client.screen -= W
-				if (W)
-					W.loc = target.loc
-					W.dropped(target)
-					W.layer = initial(W.layer)
-				W.add_fingerprint(source)
 		if("handcuff")
 			if (target.handcuffed)
 				var/obj/item/W = target.handcuffed
diff --git a/html/changelog.html b/html/changelog.html
index 675c3d72fc4..99f67eab052 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,6 +47,20 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">19 May 2012</h2>
+	<h3 class="author">TG updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Buckling into an office chair and using a fire extinguisher will lead to interesting results.</li>
+		<li class="tweak">Recipe updates for some booze in an attempt to resolve recipe conflicts.</li>
+		<li class="tweak">Wallets now fit in pockets.</li>
+		<li class="tweak">If you are clicking on a storage item in your pocket with an empty hand it will return that item to your hand.</li>
+		<li class="tweak">Extinguishers now say when they are empty.</li>
+		<li class="imageadd">New sprites for Cargo, HoP, and Captain's lockers.</li>
+		<li class="rscdel">Removed hat storage as it was never used and it cluttered the UI.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">17 May 2012</h2>
 	<h3 class="author">TG updated:</h3>