From b7690008ada48af07e87c2cbea222ca91ddfb54b Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Sun, 20 Jul 2014 19:27:13 +0200
Subject: [PATCH] Updates the changelog with relevant AI changes.

---
 code/_onclick/ai.dm |  2 --
 html/changelog.html | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index f36e2ce34ab..a2ebbb33f3b 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -125,8 +125,6 @@
 	return
 
 /obj/machinery/door/airlock/AIAltClick() // Electrifies doors.
-	if(emagged)
-		return
 	if(!secondsElectrified)
 		// permenant shock
 		Topic("aiEnable=6", list("aiEnable"="6"), 1) // 1 meaning no window (consistency!)
diff --git a/html/changelog.html b/html/changelog.html
index 0f0f300b5c3..0b05b601276 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -113,6 +113,18 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
+<div class='commit sansserif'>
+	<h2 class='date'>20 July 2014</h2>
+	<h3 class='author'>PsiOmegaDelta updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>AI can now store up to five camera locations and return to them when desired.</li>
+		<li class='rscadd'>AI can now alt+left click turfs in camera view to list and interact with the objects.</li>
+		<li class='rscadd'>AI can now ctrl+click turret controls to enable/disable turrets.</li>
+		<li class='rscadd'>AI can now alt+click turret controls to toggle stun/lethal mode.</li>
+		<li class='rscadd'>AI can now select which channel to state laws on.</li>
+	</ul>
+</div>
+
 <div class='commit sansserif'>
 	<h2 class='date'>1 July 2014</h2>
 	<h3 class='author'>Mloc updated:</h3>