From ed1cd7b8c8c71fc502d6ee3675dae9f76de7b436 Mon Sep 17 00:00:00 2001
From: SoundScopes <Musical.Flow@LIve.com>
Date: Wed, 20 Aug 2014 16:32:53 +0100
Subject: [PATCH] Admin Gravity

- Fixed admin induced gravity messages
---
 Scopes Files/signal_modifier.dm     | 16 +++++++++-------
 code/game/machinery/door_control.dm | 15 +++++++++++++++
 code/modules/admin/topic.dm         | 12 ++++++------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/Scopes Files/signal_modifier.dm b/Scopes Files/signal_modifier.dm
index 907a38e5..593755a0 100644
--- a/Scopes Files/signal_modifier.dm	
+++ b/Scopes Files/signal_modifier.dm	
@@ -24,13 +24,15 @@
 	var/mode = 0
 
 	attack_self(mob/M as mob)
-		if (alert(usr, "What would you like to do", "[name] Settings", "Copy", "New") == "New")
-			change_tool_settings("id")
-			change_tool_settings("freq")
-			mode = 1
-		else
-			mode = 0
-		return
+		switch(alert(usr, "What would you like to do", "[name] Settings", "Set", "Copy", "New",))
+			if("New")
+				change_tool_settings("id")
+				change_tool_settings("freq")
+				mode = 1
+			if("Copy")
+				mode = 0
+			if("Set")
+				mode = 1
 
 	proc/change_ID(var/cur_setting)
 		if(mode)
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 066a65f7..203e481d 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -58,6 +58,21 @@
 	if(istype(W, /obj/item/device/signaltool))
 		var/obj/item/device/signaltool/ST = W
 		id = ST.change_ID(id)
+		if(alert(usr, "Does this button control airlocks?", "Normal doors?", "Yes", "No") == "Yes")
+			normaldoorcontrol = 1
+			switch(alert(usr, "What function does the button do?", "Function", "Open", "Bolts", "Shock"))
+				if("Open")
+					specialfunctions = 1
+//				if("IDscan")
+//					specialfunctions = 2
+				if("Bolts")
+					specialfunctions = 4
+				if("Shock")
+					specialfunctions = 8
+//				if("Safetys")
+//					specialfunctions = 16
+		else
+			normaldoorcontrol = 0
 		return
 	if(istype(W, /obj/item/device/detective_scanner))
 		return
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 9ba9ccf3..7713a735 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1763,15 +1763,15 @@
 					if(gravity_is_on)
 						if(!(M.stat & BROKEN))
 							M.set_broken()
-							log_admin("[key_name(usr)] toggled gravity on.", 1)
-							message_admins("\blue [key_name_admin(usr)] toggled gravity on.", 1)
-							command_alert("Gravity generators are again functioning within normal parameters, please restart your generator, Sorry for any inconvenience.")
-					else
-						if(M.stat & BROKEN)
-							M.set_fix()
 							log_admin("[key_name(usr)] toggled gravity off.", 1)
 							message_admins("\blue [key_name_admin(usr)] toggled gravity off.", 1)
 							command_alert("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")
+					else
+						if(M.stat & BROKEN)
+							M.set_fix()
+							log_admin("[key_name(usr)] toggled gravity on.", 1)
+							message_admins("\blue [key_name_admin(usr)] toggled gravity on.", 1)
+							command_alert("Gravity generators are again functioning within normal parameters, please restart your generator, Sorry for any inconvenience.")
 /*
 				spawn(300)
 					for(var/area/A in world)