From b1eb7900334ecd620ebbc996b50cee4bc68fa0e6 Mon Sep 17 00:00:00 2001
From: JJRcop <jjrcop@hidden.address>
Date: Sun, 14 Sep 2014 23:40:17 -0400
Subject: [PATCH] Adds button when pulling something Fixes drone laws
 indentation

---
 code/_onclick/hud/_defines.dm                       |  2 ++
 code/_onclick/hud/other_mobs.dm                     |  9 ++++++++-
 .../mob/living/simple_animal/friendly/drone.dm      | 13 ++++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 87102334fb1..8f42c37993f 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -60,6 +60,8 @@
 #define ui_alien_storage_l "CENTER-2:14,SOUTH:5"//alien
 #define ui_alien_storage_r "CENTER+1:18,SOUTH:5"//alien
 
+#define ui_drone_drop "CENTER+1:18,SOUTH:5"     //maintenance drones
+#define ui_drone_pull "CENTER+2:2,SOUTH:5"      //maintenance drones
 #define ui_drone_storage "CENTER-2:14,SOUTH:5"  //maintenance drones
 
 //Lower right, persistant menu
diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm
index 8056e50f989..1f9cd32370e 100644
--- a/code/_onclick/hud/other_mobs.dm
+++ b/code/_onclick/hud/other_mobs.dm
@@ -41,10 +41,17 @@
 	using.name = "drop"
 	using.icon = ui_style
 	using.icon_state = "act_drop"
-	using.screen_loc = ui_storage1
+	using.screen_loc = ui_drone_drop
 	using.layer = 19
 	adding += using
 
+	mymob.pullin = new /obj/screen()
+	mymob.pullin.icon = ui_style
+	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.name = "pull"
+	mymob.pullin.screen_loc = ui_drone_pull
+	adding += mymob.pullin
+
 	inv_box = new /obj/screen/inventory()
 	inv_box.name = "r_hand"
 	inv_box.icon = ui_style
diff --git a/code/modules/mob/living/simple_animal/friendly/drone.dm b/code/modules/mob/living/simple_animal/friendly/drone.dm
index dcca11f2076..b1c236b1f47 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone.dm
@@ -28,9 +28,9 @@
 	var/picked = FALSE
 	var/list/drone_overlays[TOTAL_LAYERS]
 	var/laws = \
-	{"1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone.
-	2. You may not harm any being, regardless of intent or circumstance.
-	3. You must maintain, repair, improve, and power the station to the best of your abilities."}
+	"1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone.\n"+\
+	"2. You may not harm any being, regardless of intent or circumstance.\n"+\
+	"3. You must maintain, repair, improve, and power the station to the best of your abilities."
 	var/light_on = 0
 	var/obj/item/internal_storage //Drones can store one item, of any size/type in their body
 
@@ -101,6 +101,13 @@
 
 	..()
 
+/mob/living/simple_animal/drone/Move()
+	if(pullin)
+		if(pulling)
+			pullin.icon_state = "pull"
+		else
+			pullin.icon_state = "pull0"
+	..()
 
 /mob/living/simple_animal/drone/IsAdvancedToolUser()
 	return 1