From 613a4f43b6a99e5efbc0fa01b00dd1704c28cdc6 Mon Sep 17 00:00:00 2001
From: Bobder <bobder22@aim.com>
Date: Thu, 13 Nov 2014 16:37:42 -0500
Subject: [PATCH 1/2] Fixed drones being able to pick up hand labelers and
 pens.

---
 code/modules/mob/living/simple_animal/friendly/drone.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/friendly/drone.dm b/code/modules/mob/living/simple_animal/friendly/drone.dm
index 54b6293a1a..5190ecf445 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone.dm
@@ -105,7 +105,7 @@
 	return 1
 
 /mob/living/simple_animal/drone/UnarmedAttack(atom/A, proximity)
-	if(istype(A,/obj/item/weapon/gun))
+	if(istype(A,/obj/item/weapon/gun)|istype(A,/obj/item/weapon/hand_labeler)|istype(A,/obj/item/weapon/pen))
 		src << "<span class='warning'>Your subroutines prevent you from picking up [A].</span>"
 		return
 

From d83e59038e402d17437594294b24f940922a5d7f Mon Sep 17 00:00:00 2001
From: Bobder <bobder22@aim.com>
Date: Thu, 13 Nov 2014 16:49:56 -0500
Subject: [PATCH 2/2] Fixed a bug where drones could pick up pens and hand
 labelers to communicate with living players.

---
 NTstation13.dme                               | 42 +++++++++++++++++++
 .../living/simple_animal/friendly/drone.dm    |  2 +-
 html/changelog.html                           | 11 ++++-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/NTstation13.dme b/NTstation13.dme
index 95b7b75374..d968626b71 100644
--- a/NTstation13.dme
+++ b/NTstation13.dme
@@ -6,6 +6,48 @@
 
 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR "html"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/ass"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/flora"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/obj/power_cond"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/stamp_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "nano"
+#define FILE_DIR "nano/images"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/violin"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/voice/complionator"
+#define FILE_DIR "sound/vox_fem"
+#define FILE_DIR "sound/weapons"
+#define FILE_DIR "tools"
+#define FILE_DIR "tools/AddToChangelog"
+#define FILE_DIR "tools/AddToChangelog/AddToChangelog"
 // END_FILE_DIR
 
 // BEGIN_PREFERENCES
diff --git a/code/modules/mob/living/simple_animal/friendly/drone.dm b/code/modules/mob/living/simple_animal/friendly/drone.dm
index 5190ecf445..0c2e3e5bf2 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone.dm
@@ -105,7 +105,7 @@
 	return 1
 
 /mob/living/simple_animal/drone/UnarmedAttack(atom/A, proximity)
-	if(istype(A,/obj/item/weapon/gun)|istype(A,/obj/item/weapon/hand_labeler)|istype(A,/obj/item/weapon/pen))
+	if(istype(A,/obj/item/weapon/gun) | istype(A,/obj/item/weapon/hand_labeler) | istype(A,/obj/item/weapon/pen))
 		src << "<span class='warning'>Your subroutines prevent you from picking up [A].</span>"
 		return
 
diff --git a/html/changelog.html b/html/changelog.html
index 33be2e2fa3..f7279a761d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -51,7 +51,16 @@
 
 <!-- You can simply add changelogs using AddToChangelog.exe -->
 
-<!-- DO NOT REMOVE OR MOVE THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
+<!-- DO NOT REMOVE OR MOVE THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->

+
+<div class='commit sansserif'>
+	<h2 class='date'>13 November 2014</h2>
+	<h3 class='author'>Bobder updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='bugfix'>Fixed drones being able to pick up hand labelers and pens to communicate with players.</li>
+	</ul>
+</div>
+
 
 <div class='commit sansserif'>
 	<h2 class='date'>17 August 2014</h2>