From 484c01498d3e3ff28d6c8cc8c0264ce63f1869be Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Sat, 23 Jun 2012 21:38:39 -0700
Subject: [PATCH] Sanity for the "give" command, changelog.

---
 code/modules/mob/living/carbon/give.dm |  4 ++++
 html/changelog.html                    | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index 167ad789fda..0b8c0614190 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -23,6 +23,8 @@ mob/living/carbon/verb/give()
 	if(src.r_hand == null)
 		switch(alert(src,"[usr] wants to give you \a [I]?",,"Yes","No"))
 			if("Yes")
+				if(!I)
+					return
 				if(!check_can_reach(usr,src))
 					usr << "You need to keep in reaching distance."
 					src << "[usr.name] moved too far away."
@@ -52,6 +54,8 @@ mob/living/carbon/verb/give()
 	else if(src.l_hand == null)
 		switch(alert(src,"[usr] wants to give you \a [I]?",,"Yes","No"))
 			if("Yes")
+				if(!I)
+					return
 				if(!check_can_reach(usr,src))
 					usr << "You need to keep in reaching distance."
 					src << "[usr.name] moved too far away."
diff --git a/html/changelog.html b/html/changelog.html
index c0fb3646ee1..18faae2f9de 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,18 @@ 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">23 June 2012</h2>
+	<h3 class="author">SkyMarshal updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">ZAS now has different thresholds to move mobs and dense objects.  A depressurising room at normal pressure will no longer turn lockers deadly.</li>
+		<li class="bugfix">ZAS now properly rebuilds zones, and connect/merge adjacent zones.  This should be the final real bugfix to the system.</li>
+		<li class="wip">I have removed the aspects of the wound system causing the instant healing and, very likely, lag.  This will result in wounds healing instantly again, but the computational overhead being significantly less.</li>
+		<li class="tweak">The auto-targeting-mode for guns will now provide a different type of flavor text when it makes you fire, to make the situations that it occurs in to be less ambiguous.</li>
+		<li class="experiment">UltraLight is in, but has some lighting bugs still remaining.  This is the next thing I intend to tackle, bare with it please.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">23 June 2012</h2>
 	<h3 class="author">TG updated:</h3>