diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 3a6bcf447b..af377e2bfb 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -317,13 +317,20 @@ Turf and target are seperate in case you want to teleport some distance from a t
 			return
 
 		if(cmptext("ai",role))
-			oldname = null//don't bother with the records update crap
-			world << "<b>[newname] is the AI!</b>"
-			world << sound('sound/AI/newAI.ogg')
-			for(var/mob/aiEye/E in mob_list)
-				if(E.ai && E.ai == src)
-					E.name = "[newname] (AI Eye)"
-					break
+			if(isAI(src))
+				var/mob/living/silicon/ai/A = src
+				oldname = null//don't bother with the records update crap
+				world << "<b>[newname] is the AI!</b>"
+				world << sound('sound/AI/newAI.ogg')
+				// Set eyeobj name
+				if(A.eyeobj)
+					A.eyeobj.name = "[newname] (AI Eye)"
+
+				// Set ai pda name
+				if(A.aiPDA)
+					A.aiPDA.owner = newname
+					A.aiPDA.name = newname + " (" + A.aiPDA.ownjob + ")"
+
 
 		fully_replace_character_name(oldname,newname)
 
diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
index 605033f780..987e06a94d 100644
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -19,9 +19,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/ce(H), slot_l_store)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), slot_head)
-		var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H)
-		CIG.light("")
-		H.equip_to_slot_or_del(CIG, slot_wear_mask)
+		H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette(H), slot_wear_mask)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
 		if(H.backbag == 1)
diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm
new file mode 100644
index 0000000000..19fd46438c
--- /dev/null
+++ b/code/game/machinery/telecomms/presets.dm
@@ -0,0 +1,215 @@
+// ### Preset machines  ###
+
+//Relay
+
+/obj/machinery/telecomms/relay/preset
+	network = "tcommsat"
+
+/obj/machinery/telecomms/relay/preset/station
+	id = "Station Relay"
+	autolinkers = list("s_relay", "s_receiverA", "s_broadcasterA", "s_receiverB", "s_broadcasterB")
+
+/obj/machinery/telecomms/relay/preset/telecomms
+	id = "Telecomms Relay"
+	autolinkers = list("relay", "receiverA", "receiverB", "broadcasterA", "broadcasterB")
+
+/obj/machinery/telecomms/relay/preset/mining
+	id = "Mining Relay"
+	autolinkers = list("m_relay", "m_receiverB", "m_broadcasterB")
+
+/obj/machinery/telecomms/relay/preset/ruskie
+	id = "Ruskie Relay"
+	hide = 1
+	toggled = 0
+	autolinkers = list("r_relay", "r_receiverB", "r_broadcasterB")
+
+//HUB
+
+/obj/machinery/telecomms/hub/preset
+	id = "Hub"
+	network = "tcommsat"
+	autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical",
+	"cargo", "mining", "common", "command", "engineering", "security")
+
+//Receivers
+
+//--PRESET LEFT--//
+
+/obj/machinery/telecomms/receiver/preset_left
+	id = "Receiver A"
+	network = "tcommsat"
+	autolinkers = list("receiverA") // link to relay
+	freq_listening = list(1351, 1355, 1347, 1349) // science, medical, cargo, mining
+
+/obj/machinery/telecomms/receiver/preset_left/station
+	id = "Station Receiver A"
+	autolinkers = list("s_receiverA") // link to relay
+	listening_level = 1
+
+//--PRESET RIGHT--//
+
+/obj/machinery/telecomms/receiver/preset_right
+	id = "Receiver B"
+	network = "tcommsat"
+	autolinkers = list("receiverB") // link to relay
+	freq_listening = list(1353, 1357, 1359) //command, engineering, security
+
+	//Common and other radio frequencies for people to freely use
+	New()
+		for(var/i = 1441, i < 1489, i += 2)
+			freq_listening |= i
+		..()
+
+/obj/machinery/telecomms/receiver/preset_right/station
+	id = "Station Receiver B"
+	autolinkers = list("s_receiverB")
+	listening_level = 1 // Listen to the station remotely
+
+/obj/machinery/telecomms/receiver/preset_right/mining
+	id = "Mining Receiver B"
+	autolinkers = list("m_receiverB")
+	freq_listening = list(1351, 1355, 1347, 1349, 1353, 1357, 1359)
+
+/obj/machinery/telecomms/receiver/preset_right/ruskie
+	id = "Ruskie Receiver B"
+	autolinkers = list("r_receiverB")
+	freq_listening = list(1351, 1355, 1347, 1349, 1353, 1357, 1359) // science, medical, cargo, mining, command, engineering, security
+	toggled = 0
+	hide = 1
+
+
+//Buses
+
+/obj/machinery/telecomms/bus/preset_one
+	id = "Bus 1"
+	network = "tcommsat"
+	autolinkers = list("processor1", "science", "medical")
+
+/obj/machinery/telecomms/bus/preset_two
+	id = "Bus 2"
+	network = "tcommsat"
+	autolinkers = list("processor2", "cargo", "mining")
+
+/obj/machinery/telecomms/bus/preset_three
+	id = "Bus 3"
+	network = "tcommsat"
+	autolinkers = list("processor3", "security", "command")
+
+/obj/machinery/telecomms/bus/preset_four
+	id = "Bus 4"
+	network = "tcommsat"
+	autolinkers = list("processor4", "engineering", "common")
+
+
+//Processors
+
+/obj/machinery/telecomms/processor/preset_one
+	id = "Processor 1"
+	network = "tcommsat"
+	autolinkers = list("processor1") // processors are sort of isolated; they don't need backward links
+
+/obj/machinery/telecomms/processor/preset_two
+	id = "Processor 2"
+	network = "tcommsat"
+	autolinkers = list("processor2")
+
+/obj/machinery/telecomms/processor/preset_three
+	id = "Processor 3"
+	network = "tcommsat"
+	autolinkers = list("processor3")
+
+/obj/machinery/telecomms/processor/preset_four
+	id = "Processor 4"
+	network = "tcommsat"
+	autolinkers = list("processor4")
+
+//Servers
+
+/obj/machinery/telecomms/server/presets
+
+	network = "tcommsat"
+
+/obj/machinery/telecomms/server/presets/science
+	id = "Science Server"
+	freq_listening = list(1351)
+	autolinkers = list("science")
+
+/obj/machinery/telecomms/server/presets/medical
+	id = "Medical Server"
+	freq_listening = list(1355)
+	autolinkers = list("medical")
+
+/obj/machinery/telecomms/server/presets/cargo
+	id = "Cargo Server"
+	freq_listening = list(1347)
+	autolinkers = list("cargo")
+
+/obj/machinery/telecomms/server/presets/mining
+	id = "Mining Server"
+	freq_listening = list(1349)
+	autolinkers = list("mining")
+
+/obj/machinery/telecomms/server/presets/common
+	id = "Common Server"
+	freq_listening = list()
+	autolinkers = list("common")
+
+	//Common and other radio frequencies for people to freely use
+	// 1441 to 1489
+/obj/machinery/telecomms/server/presets/common/New()
+	for(var/i = 1441, i < 1489, i += 2)
+		freq_listening |= i
+	..()
+
+/obj/machinery/telecomms/server/presets/command
+	id = "Command Server"
+	freq_listening = list(1353)
+	autolinkers = list("command")
+
+/obj/machinery/telecomms/server/presets/engineering
+	id = "Engineering Server"
+	freq_listening = list(1357)
+	autolinkers = list("engineering")
+
+/obj/machinery/telecomms/server/presets/security
+	id = "Security Server"
+	freq_listening = list(1359)
+	autolinkers = list("security")
+
+
+//Broadcasters
+
+//--PRESET LEFT--//
+
+/obj/machinery/telecomms/broadcaster/preset_left
+	id = "Broadcaster A"
+	network = "tcommsat"
+	autolinkers = list("broadcasterA")
+
+/obj/machinery/telecomms/broadcaster/preset_left/station
+	id = "Station Broadcaster A"
+	autolinkers = list("s_broadcasterA")
+	listening_level = 1 // Station
+
+//--PRESET RIGHT--//
+
+/obj/machinery/telecomms/broadcaster/preset_right
+	id = "Broadcaster B"
+	network = "tcommsat"
+	autolinkers = list("broadcasterB")
+
+
+/obj/machinery/telecomms/broadcaster/preset_right/station
+	id = "Station Broadcaster B"
+	autolinkers = list("s_broadcasterB")
+	listening_level = 1 // Station
+
+/obj/machinery/telecomms/broadcaster/preset_right/mining
+	id = "Mining Broadcaster B"
+	autolinkers = list("m_broadcasterB")
+
+/obj/machinery/telecomms/broadcaster/preset_right/ruskie
+	id = "Ruskie Broadcaster B"
+	autolinkers = list("r_broadcasterB")
+	toggled = 0
+	hide = 1
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 8b2a5e19cc..97ecbbcffd 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -589,226 +589,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 
 
 
-// ### Preset machines (Located at centcom!) (Or the Comms Satellite) ###
-
-//Relay
-
-/obj/machinery/telecomms/relay/preset
-	network = "tcommsat"
-
-/obj/machinery/telecomms/relay/preset/station
-	id = "Station Relay"
-	autolinkers = list("s_relay", "s_receiverA", "s_broadcasterA", "s_receiverB", "s_broadcasterB")
-
-/obj/machinery/telecomms/relay/preset/telecomms
-	id = "Telecomms Relay"
-	autolinkers = list("relay", "receiverA", "receiverB", "broadcasterA", "broadcasterB")
-
-/obj/machinery/telecomms/relay/preset/mining
-	id = "Mining Relay"
-	autolinkers = list("m_relay", "m_receiverB", "m_broadcasterB")
-
-/obj/machinery/telecomms/relay/preset/ruskie
-	id = "Ruskie Relay"
-	hide = 1
-	toggled = 0
-	autolinkers = list("r_relay", "r_receiverB", "r_broadcasterB")
-
-//HUB
-
-/obj/machinery/telecomms/hub/preset
-	id = "Hub"
-	network = "tcommsat"
-	autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical",
-	"cargo", "mining", "common", "command", "engineering", "security")
-
-//Receivers
-
-//--PRESET LEFT--//
-
-/obj/machinery/telecomms/receiver/preset_left
-	id = "Receiver A"
-	network = "tcommsat"
-	autolinkers = list("receiverA") // link to relay
-	freq_listening = list(1351, 1355, 1347, 1349) // science, medical, cargo, mining
-
-/obj/machinery/telecomms/receiver/preset_left/station
-	id = "Station Receiver A"
-	autolinkers = list("s_receiverA") // link to relay
-	listening_level = 1
-
-//--PRESET RIGHT--//
-
-/obj/machinery/telecomms/receiver/preset_right
-	id = "Receiver B"
-	network = "tcommsat"
-	autolinkers = list("receiverB") // link to relay
-	freq_listening = list(1353, 1357, 1359) //command, engineering, security
-
-	//Common and other radio frequencies for people to freely use
-	New()
-		for(var/i = 1441, i < 1489, i += 2)
-			freq_listening |= i
-		..()
-
-/obj/machinery/telecomms/receiver/preset_right/station
-	id = "Station Receiver B"
-	autolinkers = list("s_receiverB")
-	listening_level = 1 // Listen to the station remotely
-
-/obj/machinery/telecomms/receiver/preset_right/mining
-	id = "Mining Receiver B"
-	autolinkers = list("m_receiverB")
-	freq_listening = list(1351, 1355, 1347, 1349, 1353, 1357, 1359)
-
-/obj/machinery/telecomms/receiver/preset_right/ruskie
-	id = "Ruskie Receiver B"
-	autolinkers = list("r_receiverB")
-	freq_listening = list(1351, 1355, 1347, 1349, 1353, 1357, 1359) // science, medical, cargo, mining, command, engineering, security
-	toggled = 0
-	hide = 1
-
-
-//Buses
-
-/obj/machinery/telecomms/bus/preset_one
-	id = "Bus 1"
-	network = "tcommsat"
-	autolinkers = list("processor1", "science", "medical")
-
-/obj/machinery/telecomms/bus/preset_two
-	id = "Bus 2"
-	network = "tcommsat"
-	autolinkers = list("processor2", "cargo", "mining")
-
-/obj/machinery/telecomms/bus/preset_three
-	id = "Bus 3"
-	network = "tcommsat"
-	autolinkers = list("processor3", "security", "command")
-
-/obj/machinery/telecomms/bus/preset_four
-	id = "Bus 4"
-	network = "tcommsat"
-	autolinkers = list("processor4", "engineering", "common")
-
-
-//Processors
-
-/obj/machinery/telecomms/processor/preset_one
-	id = "Processor 1"
-	network = "tcommsat"
-	autolinkers = list("processor1") // processors are sort of isolated; they don't need backward links
-
-/obj/machinery/telecomms/processor/preset_two
-	id = "Processor 2"
-	network = "tcommsat"
-	autolinkers = list("processor2")
-
-/obj/machinery/telecomms/processor/preset_three
-	id = "Processor 3"
-	network = "tcommsat"
-	autolinkers = list("processor3")
-
-/obj/machinery/telecomms/processor/preset_four
-	id = "Processor 4"
-	network = "tcommsat"
-	autolinkers = list("processor4")
-
-//Servers
-
-/obj/machinery/telecomms/server/presets
-
-	network = "tcommsat"
-
-/obj/machinery/telecomms/server/presets/science
-	id = "Science Server"
-	freq_listening = list(1351)
-	autolinkers = list("science")
-
-/obj/machinery/telecomms/server/presets/medical
-	id = "Medical Server"
-	freq_listening = list(1355)
-	autolinkers = list("medical")
-
-/obj/machinery/telecomms/server/presets/cargo
-	id = "Cargo Server"
-	freq_listening = list(1347)
-	autolinkers = list("cargo")
-
-/obj/machinery/telecomms/server/presets/mining
-	id = "Mining Server"
-	freq_listening = list(1349)
-	autolinkers = list("mining")
-
-/obj/machinery/telecomms/server/presets/common
-	id = "Common Server"
-	freq_listening = list()
-	autolinkers = list("common")
-
-	//Common and other radio frequencies for people to freely use
-	// 1441 to 1489
-/obj/machinery/telecomms/server/presets/common/New()
-	for(var/i = 1441, i < 1489, i += 2)
-		freq_listening |= i
-	..()
-
-/obj/machinery/telecomms/server/presets/command
-	id = "Command Server"
-	freq_listening = list(1353)
-	autolinkers = list("command")
-
-/obj/machinery/telecomms/server/presets/engineering
-	id = "Engineering Server"
-	freq_listening = list(1357)
-	autolinkers = list("engineering")
-
-/obj/machinery/telecomms/server/presets/security
-	id = "Security Server"
-	freq_listening = list(1359)
-	autolinkers = list("security")
-
-
-//Broadcasters
-
-//--PRESET LEFT--//
-
-/obj/machinery/telecomms/broadcaster/preset_left
-	id = "Broadcaster A"
-	network = "tcommsat"
-	autolinkers = list("broadcasterA")
-
-/obj/machinery/telecomms/broadcaster/preset_left/station
-	id = "Station Broadcaster A"
-	autolinkers = list("s_broadcasterA")
-	listening_level = 1 // Station
-
-//--PRESET RIGHT--//
-
-/obj/machinery/telecomms/broadcaster/preset_right
-	id = "Broadcaster B"
-	network = "tcommsat"
-	autolinkers = list("broadcasterB")
-
-
-/obj/machinery/telecomms/broadcaster/preset_right/station
-	id = "Station Broadcaster B"
-	autolinkers = list("s_broadcasterB")
-	listening_level = 1 // Station
-
-/obj/machinery/telecomms/broadcaster/preset_right/mining
-	id = "Mining Broadcaster B"
-	autolinkers = list("m_broadcasterB")
-
-/obj/machinery/telecomms/broadcaster/preset_right/ruskie
-	id = "Ruskie Broadcaster B"
-	autolinkers = list("r_broadcasterB")
-	toggled = 0
-	hide = 1
-
-
-
-
-
 
 
 
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 74fb96ba94..13aa67b495 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -2,17 +2,6 @@
 
 /*
 
-SYNDICATE UPLINKS
-
-TO-DO:
-	Once wizard is fixed, make sure the uplinks work correctly for it. wizard.dm is right now uncompiled and with broken code in it.
-
-	Clean the code up and comment it. Part of it is right now copy-pasted, with the general Topic() and modifications by Abi79.
-
-		I should take a more in-depth look at both the copy-pasted code for the individual uplinks below, and at each gamemode's code
-		to see how uplinks are assigned and if there are any bugs with those.
-
-
 A list of items and costs is stored under the datum of every game mode, alongside the number of crystals, and the welcoming message.
 
 */
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index ef10f4a4ea..fdd23f054c 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -63,9 +63,9 @@
 /mob/living/silicon/ai/New()
 	..()
 	eyeobj.ai = src
+	eyeobj.name = "[src.name] (AI Eye)" // Give it a name
 	spawn(5)
 		eyeobj.loc = src.loc
-		eyeobj.name = "[src.name] (AI Eye)" // Give it a name
 
 /mob/living/silicon/ai/Del()
 	eyeobj.ai = null
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 530fcfdd14..aff2250af6 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -12,10 +12,6 @@
 
 		src.updatehealth()
 
-		if(aiPDA && aiPDA.name != name)
-			aiPDA.owner = name
-			aiPDA.name = name + " (" + aiPDA.ownjob + ")"
-
 		if (src.malfhack)
 			if (src.malfhack.aidisabled)
 				src << "\red ERROR: APC access disabled, hack attempt canceled."
diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm
index 200e2020bb..4640065a65 100644
--- a/code/modules/mob/living/silicon/ai/login.dm
+++ b/code/modules/mob/living/silicon/ai/login.dm
@@ -18,7 +18,7 @@
 	client.screen += list( blind, flash )
 
 	if(stat != DEAD)
-		for(var/obj/machinery/ai_status_display/O in world) //change status
+		for(var/obj/machinery/ai_status_display/O in machines) //change status
 			if(O)
 				O.mode = 1
 				O.emotion = "Neutral"
diff --git a/tgstation.dme b/tgstation.dme
index d870e32a69..701c2082f2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,6 +6,266 @@
 
 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR ".svn"
+#define FILE_DIR ".svn/pristine"
+#define FILE_DIR ".svn/pristine/00"
+#define FILE_DIR ".svn/pristine/01"
+#define FILE_DIR ".svn/pristine/02"
+#define FILE_DIR ".svn/pristine/03"
+#define FILE_DIR ".svn/pristine/04"
+#define FILE_DIR ".svn/pristine/05"
+#define FILE_DIR ".svn/pristine/06"
+#define FILE_DIR ".svn/pristine/07"
+#define FILE_DIR ".svn/pristine/08"
+#define FILE_DIR ".svn/pristine/09"
+#define FILE_DIR ".svn/pristine/0a"
+#define FILE_DIR ".svn/pristine/0b"
+#define FILE_DIR ".svn/pristine/0c"
+#define FILE_DIR ".svn/pristine/0d"
+#define FILE_DIR ".svn/pristine/0e"
+#define FILE_DIR ".svn/pristine/0f"
+#define FILE_DIR ".svn/pristine/10"
+#define FILE_DIR ".svn/pristine/11"
+#define FILE_DIR ".svn/pristine/12"
+#define FILE_DIR ".svn/pristine/13"
+#define FILE_DIR ".svn/pristine/14"
+#define FILE_DIR ".svn/pristine/15"
+#define FILE_DIR ".svn/pristine/16"
+#define FILE_DIR ".svn/pristine/17"
+#define FILE_DIR ".svn/pristine/18"
+#define FILE_DIR ".svn/pristine/19"
+#define FILE_DIR ".svn/pristine/1a"
+#define FILE_DIR ".svn/pristine/1b"
+#define FILE_DIR ".svn/pristine/1c"
+#define FILE_DIR ".svn/pristine/1d"
+#define FILE_DIR ".svn/pristine/1e"
+#define FILE_DIR ".svn/pristine/1f"
+#define FILE_DIR ".svn/pristine/20"
+#define FILE_DIR ".svn/pristine/21"
+#define FILE_DIR ".svn/pristine/22"
+#define FILE_DIR ".svn/pristine/23"
+#define FILE_DIR ".svn/pristine/24"
+#define FILE_DIR ".svn/pristine/25"
+#define FILE_DIR ".svn/pristine/26"
+#define FILE_DIR ".svn/pristine/27"
+#define FILE_DIR ".svn/pristine/28"
+#define FILE_DIR ".svn/pristine/29"
+#define FILE_DIR ".svn/pristine/2a"
+#define FILE_DIR ".svn/pristine/2b"
+#define FILE_DIR ".svn/pristine/2c"
+#define FILE_DIR ".svn/pristine/2d"
+#define FILE_DIR ".svn/pristine/2e"
+#define FILE_DIR ".svn/pristine/2f"
+#define FILE_DIR ".svn/pristine/30"
+#define FILE_DIR ".svn/pristine/31"
+#define FILE_DIR ".svn/pristine/32"
+#define FILE_DIR ".svn/pristine/33"
+#define FILE_DIR ".svn/pristine/34"
+#define FILE_DIR ".svn/pristine/35"
+#define FILE_DIR ".svn/pristine/36"
+#define FILE_DIR ".svn/pristine/37"
+#define FILE_DIR ".svn/pristine/38"
+#define FILE_DIR ".svn/pristine/39"
+#define FILE_DIR ".svn/pristine/3a"
+#define FILE_DIR ".svn/pristine/3b"
+#define FILE_DIR ".svn/pristine/3c"
+#define FILE_DIR ".svn/pristine/3d"
+#define FILE_DIR ".svn/pristine/3e"
+#define FILE_DIR ".svn/pristine/3f"
+#define FILE_DIR ".svn/pristine/40"
+#define FILE_DIR ".svn/pristine/41"
+#define FILE_DIR ".svn/pristine/42"
+#define FILE_DIR ".svn/pristine/43"
+#define FILE_DIR ".svn/pristine/44"
+#define FILE_DIR ".svn/pristine/45"
+#define FILE_DIR ".svn/pristine/46"
+#define FILE_DIR ".svn/pristine/47"
+#define FILE_DIR ".svn/pristine/48"
+#define FILE_DIR ".svn/pristine/49"
+#define FILE_DIR ".svn/pristine/4a"
+#define FILE_DIR ".svn/pristine/4b"
+#define FILE_DIR ".svn/pristine/4c"
+#define FILE_DIR ".svn/pristine/4d"
+#define FILE_DIR ".svn/pristine/4e"
+#define FILE_DIR ".svn/pristine/4f"
+#define FILE_DIR ".svn/pristine/50"
+#define FILE_DIR ".svn/pristine/51"
+#define FILE_DIR ".svn/pristine/52"
+#define FILE_DIR ".svn/pristine/53"
+#define FILE_DIR ".svn/pristine/54"
+#define FILE_DIR ".svn/pristine/55"
+#define FILE_DIR ".svn/pristine/56"
+#define FILE_DIR ".svn/pristine/57"
+#define FILE_DIR ".svn/pristine/58"
+#define FILE_DIR ".svn/pristine/59"
+#define FILE_DIR ".svn/pristine/5a"
+#define FILE_DIR ".svn/pristine/5b"
+#define FILE_DIR ".svn/pristine/5c"
+#define FILE_DIR ".svn/pristine/5d"
+#define FILE_DIR ".svn/pristine/5e"
+#define FILE_DIR ".svn/pristine/5f"
+#define FILE_DIR ".svn/pristine/60"
+#define FILE_DIR ".svn/pristine/61"
+#define FILE_DIR ".svn/pristine/62"
+#define FILE_DIR ".svn/pristine/63"
+#define FILE_DIR ".svn/pristine/64"
+#define FILE_DIR ".svn/pristine/65"
+#define FILE_DIR ".svn/pristine/66"
+#define FILE_DIR ".svn/pristine/67"
+#define FILE_DIR ".svn/pristine/68"
+#define FILE_DIR ".svn/pristine/69"
+#define FILE_DIR ".svn/pristine/6a"
+#define FILE_DIR ".svn/pristine/6b"
+#define FILE_DIR ".svn/pristine/6c"
+#define FILE_DIR ".svn/pristine/6d"
+#define FILE_DIR ".svn/pristine/6e"
+#define FILE_DIR ".svn/pristine/6f"
+#define FILE_DIR ".svn/pristine/70"
+#define FILE_DIR ".svn/pristine/71"
+#define FILE_DIR ".svn/pristine/72"
+#define FILE_DIR ".svn/pristine/73"
+#define FILE_DIR ".svn/pristine/74"
+#define FILE_DIR ".svn/pristine/75"
+#define FILE_DIR ".svn/pristine/76"
+#define FILE_DIR ".svn/pristine/77"
+#define FILE_DIR ".svn/pristine/78"
+#define FILE_DIR ".svn/pristine/79"
+#define FILE_DIR ".svn/pristine/7a"
+#define FILE_DIR ".svn/pristine/7b"
+#define FILE_DIR ".svn/pristine/7c"
+#define FILE_DIR ".svn/pristine/7d"
+#define FILE_DIR ".svn/pristine/7e"
+#define FILE_DIR ".svn/pristine/7f"
+#define FILE_DIR ".svn/pristine/80"
+#define FILE_DIR ".svn/pristine/81"
+#define FILE_DIR ".svn/pristine/82"
+#define FILE_DIR ".svn/pristine/83"
+#define FILE_DIR ".svn/pristine/84"
+#define FILE_DIR ".svn/pristine/85"
+#define FILE_DIR ".svn/pristine/86"
+#define FILE_DIR ".svn/pristine/87"
+#define FILE_DIR ".svn/pristine/88"
+#define FILE_DIR ".svn/pristine/89"
+#define FILE_DIR ".svn/pristine/8a"
+#define FILE_DIR ".svn/pristine/8b"
+#define FILE_DIR ".svn/pristine/8c"
+#define FILE_DIR ".svn/pristine/8d"
+#define FILE_DIR ".svn/pristine/8e"
+#define FILE_DIR ".svn/pristine/8f"
+#define FILE_DIR ".svn/pristine/90"
+#define FILE_DIR ".svn/pristine/91"
+#define FILE_DIR ".svn/pristine/92"
+#define FILE_DIR ".svn/pristine/93"
+#define FILE_DIR ".svn/pristine/94"
+#define FILE_DIR ".svn/pristine/95"
+#define FILE_DIR ".svn/pristine/96"
+#define FILE_DIR ".svn/pristine/97"
+#define FILE_DIR ".svn/pristine/98"
+#define FILE_DIR ".svn/pristine/99"
+#define FILE_DIR ".svn/pristine/9a"
+#define FILE_DIR ".svn/pristine/9b"
+#define FILE_DIR ".svn/pristine/9c"
+#define FILE_DIR ".svn/pristine/9d"
+#define FILE_DIR ".svn/pristine/9e"
+#define FILE_DIR ".svn/pristine/9f"
+#define FILE_DIR ".svn/pristine/a0"
+#define FILE_DIR ".svn/pristine/a1"
+#define FILE_DIR ".svn/pristine/a2"
+#define FILE_DIR ".svn/pristine/a3"
+#define FILE_DIR ".svn/pristine/a4"
+#define FILE_DIR ".svn/pristine/a5"
+#define FILE_DIR ".svn/pristine/a6"
+#define FILE_DIR ".svn/pristine/a7"
+#define FILE_DIR ".svn/pristine/a8"
+#define FILE_DIR ".svn/pristine/a9"
+#define FILE_DIR ".svn/pristine/aa"
+#define FILE_DIR ".svn/pristine/ab"
+#define FILE_DIR ".svn/pristine/ac"
+#define FILE_DIR ".svn/pristine/ad"
+#define FILE_DIR ".svn/pristine/ae"
+#define FILE_DIR ".svn/pristine/af"
+#define FILE_DIR ".svn/pristine/b0"
+#define FILE_DIR ".svn/pristine/b1"
+#define FILE_DIR ".svn/pristine/b2"
+#define FILE_DIR ".svn/pristine/b3"
+#define FILE_DIR ".svn/pristine/b4"
+#define FILE_DIR ".svn/pristine/b5"
+#define FILE_DIR ".svn/pristine/b6"
+#define FILE_DIR ".svn/pristine/b7"
+#define FILE_DIR ".svn/pristine/b8"
+#define FILE_DIR ".svn/pristine/b9"
+#define FILE_DIR ".svn/pristine/ba"
+#define FILE_DIR ".svn/pristine/bb"
+#define FILE_DIR ".svn/pristine/bc"
+#define FILE_DIR ".svn/pristine/bd"
+#define FILE_DIR ".svn/pristine/be"
+#define FILE_DIR ".svn/pristine/bf"
+#define FILE_DIR ".svn/pristine/c0"
+#define FILE_DIR ".svn/pristine/c1"
+#define FILE_DIR ".svn/pristine/c2"
+#define FILE_DIR ".svn/pristine/c3"
+#define FILE_DIR ".svn/pristine/c4"
+#define FILE_DIR ".svn/pristine/c5"
+#define FILE_DIR ".svn/pristine/c6"
+#define FILE_DIR ".svn/pristine/c7"
+#define FILE_DIR ".svn/pristine/c8"
+#define FILE_DIR ".svn/pristine/c9"
+#define FILE_DIR ".svn/pristine/ca"
+#define FILE_DIR ".svn/pristine/cb"
+#define FILE_DIR ".svn/pristine/cc"
+#define FILE_DIR ".svn/pristine/cd"
+#define FILE_DIR ".svn/pristine/ce"
+#define FILE_DIR ".svn/pristine/cf"
+#define FILE_DIR ".svn/pristine/d0"
+#define FILE_DIR ".svn/pristine/d1"
+#define FILE_DIR ".svn/pristine/d2"
+#define FILE_DIR ".svn/pristine/d3"
+#define FILE_DIR ".svn/pristine/d4"
+#define FILE_DIR ".svn/pristine/d5"
+#define FILE_DIR ".svn/pristine/d6"
+#define FILE_DIR ".svn/pristine/d7"
+#define FILE_DIR ".svn/pristine/d8"
+#define FILE_DIR ".svn/pristine/d9"
+#define FILE_DIR ".svn/pristine/da"
+#define FILE_DIR ".svn/pristine/db"
+#define FILE_DIR ".svn/pristine/dc"
+#define FILE_DIR ".svn/pristine/dd"
+#define FILE_DIR ".svn/pristine/de"
+#define FILE_DIR ".svn/pristine/df"
+#define FILE_DIR ".svn/pristine/e0"
+#define FILE_DIR ".svn/pristine/e1"
+#define FILE_DIR ".svn/pristine/e2"
+#define FILE_DIR ".svn/pristine/e3"
+#define FILE_DIR ".svn/pristine/e4"
+#define FILE_DIR ".svn/pristine/e5"
+#define FILE_DIR ".svn/pristine/e6"
+#define FILE_DIR ".svn/pristine/e7"
+#define FILE_DIR ".svn/pristine/e8"
+#define FILE_DIR ".svn/pristine/e9"
+#define FILE_DIR ".svn/pristine/ea"
+#define FILE_DIR ".svn/pristine/eb"
+#define FILE_DIR ".svn/pristine/ec"
+#define FILE_DIR ".svn/pristine/ed"
+#define FILE_DIR ".svn/pristine/ee"
+#define FILE_DIR ".svn/pristine/ef"
+#define FILE_DIR ".svn/pristine/f0"
+#define FILE_DIR ".svn/pristine/f1"
+#define FILE_DIR ".svn/pristine/f2"
+#define FILE_DIR ".svn/pristine/f3"
+#define FILE_DIR ".svn/pristine/f4"
+#define FILE_DIR ".svn/pristine/f5"
+#define FILE_DIR ".svn/pristine/f6"
+#define FILE_DIR ".svn/pristine/f7"
+#define FILE_DIR ".svn/pristine/f8"
+#define FILE_DIR ".svn/pristine/f9"
+#define FILE_DIR ".svn/pristine/fa"
+#define FILE_DIR ".svn/pristine/fb"
+#define FILE_DIR ".svn/pristine/fc"
+#define FILE_DIR ".svn/pristine/fd"
+#define FILE_DIR ".svn/pristine/fe"
+#define FILE_DIR ".svn/pristine/ff"
+#define FILE_DIR "bot"
+#define FILE_DIR "bot/Marakov"
 #define FILE_DIR "code"
 #define FILE_DIR "code/ATMOSPHERICS"
 #define FILE_DIR "code/ATMOSPHERICS/components"
@@ -186,6 +446,16 @@
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/organs"
 #define FILE_DIR "code/WorkInProgress/virus2"
+#define FILE_DIR "config"
+#define FILE_DIR "config/names"
+#define FILE_DIR "data"
+#define FILE_DIR "data/logs"
+#define FILE_DIR "data/logs/2012"
+#define FILE_DIR "data/logs/2012/08-August"
+#define FILE_DIR "data/logs/2012/09-September"
+#define FILE_DIR "data/player_saves"
+#define FILE_DIR "data/player_saves/g"
+#define FILE_DIR "data/player_saves/g/giacomand"
 #define FILE_DIR "html"
 #define FILE_DIR "icons"
 #define FILE_DIR "icons/effects"
@@ -200,6 +470,7 @@
 #define FILE_DIR "icons/obj/machines"
 #define FILE_DIR "icons/obj/pipes"
 #define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/PSD files"
 #define FILE_DIR "icons/spideros_icons"
 #define FILE_DIR "icons/Testing"
 #define FILE_DIR "icons/turf"
@@ -208,6 +479,7 @@
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
 #define FILE_DIR "maps/RandomZLevels"
+#define FILE_DIR "music"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"
@@ -220,8 +492,18 @@
 #define FILE_DIR "sound/piano"
 #define FILE_DIR "sound/voice"
 #define FILE_DIR "sound/weapons"
+#define FILE_DIR "SQL"
 #define FILE_DIR "tools"
 #define FILE_DIR "tools/Redirector"
+#define FILE_DIR "tools/Runtime Condenser"
+#define FILE_DIR "tools/UnstandardnessTestForDM"
+#define FILE_DIR "tools/UnstandardnessTestForDM/UnstandardnessTestForDM"
+#define FILE_DIR "tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin"
+#define FILE_DIR "tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug"
+#define FILE_DIR "tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj"
+#define FILE_DIR "tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86"
+#define FILE_DIR "tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug"
+#define FILE_DIR "tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties"
 // END_FILE_DIR
 
 // BEGIN_PREFERENCES
@@ -564,6 +846,7 @@
 #include "code\game\machinery\telecomms\broadcaster.dm"
 #include "code\game\machinery\telecomms\logbrowser.dm"
 #include "code\game\machinery\telecomms\machine_interactions.dm"
+#include "code\game\machinery\telecomms\presets.dm"
 #include "code\game\machinery\telecomms\telecomunications.dm"
 #include "code\game\machinery\telecomms\telemonitor.dm"
 #include "code\game\machinery\telecomms\traffic_control.dm"