diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 00301e7a70c..1f37542a90b 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -11,8 +11,8 @@
  * Oxygen
  */
 /obj/item/weapon/tank/oxygen
-	name = "Gas Tank (Oxygen)"
-	desc = "A tank of oxygen"
+	name = "oxygen tank"
+	desc = "A tank of oxygen."
 	icon_state = "oxygen"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 
@@ -32,12 +32,10 @@
 
 
 /obj/item/weapon/tank/oxygen/yellow
-	name = "Gas Tank (Oxygen)"
 	desc = "A tank of oxygen, this one is yellow."
 	icon_state = "oxygen_f"
 
 /obj/item/weapon/tank/oxygen/red
-	name = "Gas Tank (Oxygen)"
 	desc = "A tank of oxygen, this one is red."
 	icon_state = "oxygen_fr"
 
@@ -46,8 +44,8 @@
  * Anesthetic
  */
 /obj/item/weapon/tank/anesthetic
-	name = "Gas Tank (Sleeping Agent)"
-	desc = "A N2O/O2 gas mix"
+	name = "anesthetic tank"
+	desc = "A tank with an N2O/O2 gas mix."
 	icon_state = "anesthetic"
 	item_state = "an_tank"
 
@@ -66,7 +64,7 @@
  * Air
  */
 /obj/item/weapon/tank/air
-	name = "Gas Tank (Air Mix)"
+	name = "air tank"
 	desc = "Mixed anyone?"
 	icon_state = "oxygen"
 
@@ -90,8 +88,8 @@
  * Plasma
  */
 /obj/item/weapon/tank/plasma
-	name = "Gas Tank (BIOHAZARD)"
-	desc = "Contains dangerous plasma. Do not inhale."
+	name = "plasma tank"
+	desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
 	icon_state = "plasma"
 	flags = FPRINT | TABLEPASS | CONDUCT
 	slot_flags = null	//they have no straps!
@@ -103,42 +101,6 @@
 	src.air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
-
-/obj/item/weapon/tank/plasma/proc/release()
-	var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
-
-	loc.assume_air(removed)
-
-/obj/item/weapon/tank/plasma/proc/ignite()
-	var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
-	var/strength = 1
-
-	var/turf/ground_zero = get_turf(loc)
-	loc = null
-
-	if(air_contents.temperature > (T0C + 400))
-		strength = fuel_moles/15
-
-		explosion(ground_zero, strength, strength*2, strength*3, strength*4)
-
-	else if(air_contents.temperature > (T0C + 250))
-		strength = fuel_moles/20
-
-		explosion(ground_zero, 0, strength, strength*2, strength*3)
-
-	else if(air_contents.temperature > (T0C + 100))
-		strength = fuel_moles/25
-
-		explosion(ground_zero, 0, 0, strength, strength*3)
-
-	else
-		ground_zero.assume_air(air_contents)
-		ground_zero.hotspot_expose(1000, 125)
-
-	if(src.master)
-		del(src.master)
-	del(src)
-
 /obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 
@@ -180,11 +142,11 @@
 			usr << sound('sound/effects/alert.ogg')
 
 /obj/item/weapon/tank/emergency_oxygen/engi
-	icon_state = "emergency_engi"
 	name = "extended-capacity emergency oxygen tank"
+	icon_state = "emergency_engi"
 	volume = 6
 
 /obj/item/weapon/tank/emergency_oxygen/double
+	name = "double emergency oxygen tank"
 	icon_state = "emergency_double"
-	name = "Double Emergency Oxygen Tank"
 	volume = 10
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index aa785fc41f2..6e4716c8b86 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -238,7 +238,10 @@
 	else if(pressure > TANK_RUPTURE_PRESSURE)
 		//world << "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]"
 		if(integrity <= 0)
-			loc.assume_air(air_contents)
+			var/turf/simulated/T = get_turf(src)
+			if(!T)
+				return
+			T.assume_air(air_contents)
 			playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3)
 			del(src)
 		else
@@ -247,8 +250,11 @@
 	else if(pressure > TANK_LEAK_PRESSURE)
 		//world << "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]"
 		if(integrity <= 0)
+			var/turf/simulated/T = get_turf(src)
+			if(!T)
+				return
 			var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(0.25)
-			loc.assume_air(leaked_gas)
+			T.assume_air(leaked_gas)
 		else
 			integrity--
 
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index d11ebb59e8d..61773960fb0 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = ""
 	flags = FPRINT | TABLEPASS| CONDUCT
-	item_state = "electronic"
 	w_class = 2.0
 	m_amt = 100
 	g_amt = 0
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
new file mode 100644
index 00000000000..0208c74391a
--- /dev/null
+++ b/code/modules/assembly/bomb.dm
@@ -0,0 +1,153 @@
+/obj/item/device/onetankbomb
+	name = "bomb"
+	icon = 'tank.dmi'
+	item_state = "assembly"
+	throwforce = 5
+	w_class = 3.0
+	throw_speed = 2
+	throw_range = 4
+	flags = FPRINT | TABLEPASS| CONDUCT //Copied this from old code, so this may or may not be necessary
+	var/status = 0   //0 - not readied //1 - bomb finished with welder
+	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
+	var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank
+
+/obj/item/device/onetankbomb/examine()
+	..()
+	bombtank.examine()
+
+/obj/item/device/onetankbomb/update_icon()
+	if(bombtank)
+		icon_state = bombtank.icon_state
+	if(bombassembly)
+		overlays += bombassembly.icon_state
+		overlays += bombassembly.overlays
+		overlays += "bomb_assembly"
+
+/obj/item/device/onetankbomb/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/device/analyzer))
+		bombtank.attackby(W, user)
+		return
+	if(istype(W, /obj/item/weapon/wrench) && !status)	//This is basically bomb assembly code inverted. apparently it works.
+
+		user << "<span class='notice'>You disassemble [src].</span>"
+
+		bombassembly.loc = user.loc
+		bombassembly.master = null
+		bombassembly = null
+
+		bombtank.loc = user.loc
+		bombtank.master = null
+		bombtank = null
+
+		del(src)
+		return
+	if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
+		if(!status)
+			status = 1
+			bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
+			message_admins("[key_name_admin(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
+			user << "<span class='notice'>A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.</span>"
+		else
+			status = 0
+			bombers += "[key_name(user)] unwelded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
+			user << "<span class='notice'>The hole has been closed.</span>"
+	add_fingerprint(user)
+	..()
+
+/obj/item/device/onetankbomb/attack_self(mob/user as mob) //pressing the bomb accesses its assembly
+	bombassembly.attack_self(user, 1)
+	add_fingerprint(user)
+	return
+
+/obj/item/device/onetankbomb/receive_signal()	//This is mainly called by the sensor through sense() to the holder, and from the holder to here.
+	visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
+	sleep(10)
+	if(!src)
+		return
+	if(status)
+		bombtank.ignite()	//if its not a dud, boom (or not boom if you made shitty mix) the ignite proc is below, in this file
+
+/obj/item/device/onetankbomb/HasProximity(atom/movable/AM as mob|obj)
+	if(bombassembly)
+		bombassembly.HasProximity(AM)
+
+// ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
+
+/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob)	//Bomb assembly proc. This turns assembly+tank into a bomb
+	if(istype(W, /obj/item/device/assembly_holder))
+		var/obj/item/device/assembly_holder/S = W
+		if(!S.secured)										//Check if the assembly is secured
+			return
+		if(isigniter(S.a_left) == isigniter(S.a_right))		//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
+			return
+
+		var/obj/item/device/onetankbomb/R = new /obj/item/device/onetankbomb(loc)
+
+		user.drop_item()			//Remove the assembly from your hands
+		user.remove_from_mob(src)	//Remove the tank from your character,in case you were holding it
+		user.put_in_hands(R)		//Equips the bomb if possible, or puts it on the floor.
+
+		R.bombassembly = S	//Tell the bomb about its assembly part
+		S.master = R		//Tell the assembly about its new owner
+		S.loc = R			//Move the assembly out of the fucking way
+
+		R.bombtank = src	//Same for tank
+		master = R
+		loc = R
+		R.update_icon()
+		return
+
+/obj/item/weapon/tank/proc/ignite()	//This happens when a bomb is told to explode
+	var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
+	var/strength = 1
+
+	var/turf/ground_zero = get_turf(loc)
+	loc = null
+
+	if(air_contents.temperature > (T0C + 400))
+		strength = (fuel_moles/15)
+
+		if(strength >=1)
+			explosion(ground_zero, round(strength,1), round(strength*2,1), round(strength*3,1), round(strength*4,1))
+		else if(strength >=0.5)
+			explosion(ground_zero, 0, 1, 2, 4)
+		else if(strength >=0.2)
+			explosion(ground_zero, -1, 0, 1, 2)
+		else
+			ground_zero.assume_air(air_contents)
+			ground_zero.hotspot_expose(1000, 125)
+
+	else if(air_contents.temperature > (T0C + 250))
+		strength = (fuel_moles/20)
+
+		if(strength >=1)
+			explosion(ground_zero, 0, round(strength,1), round(strength*2,1), round(strength*3,1))
+		else if (strength >=0.5)
+			explosion(ground_zero, -1, 0, 1, 2)
+		else
+			ground_zero.assume_air(air_contents)
+			ground_zero.hotspot_expose(1000, 125)
+
+	else if(air_contents.temperature > (T0C + 100))
+		strength = (fuel_moles/25)
+
+		if (strength >=1)
+			explosion(ground_zero, -1, 0, round(strength,1), round(strength*3,1))
+		else
+			ground_zero.assume_air(air_contents)
+			ground_zero.hotspot_expose(1000, 125)
+
+	else
+		ground_zero.assume_air(air_contents)
+		ground_zero.hotspot_expose(1000, 125)
+
+	if(master)
+		del(master)
+	del(src)
+
+/obj/item/weapon/tank/proc/release()	//This happens when the bomb is not welded. Tank contents are just spat out.
+	var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
+	var/turf/simulated/T = get_turf(src)
+	if(!T)
+		return
+	T.assume_air(removed)
\ No newline at end of file
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index a3d9fe3160a..030e9402d55 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -4,7 +4,6 @@
 	icon_state = "holder"
 	item_state = "assembly"
 	flags = FPRINT | TABLEPASS| CONDUCT
-	item_state = "electronic"
 	throwforce = 5
 	w_class = 2.0
 	throw_speed = 3
@@ -70,6 +69,8 @@
 			src.overlays += "[initial(a_right.icon_state)]_right"
 			for(var/O in a_right.attached_overlays)
 				overlays += "[O]_r"
+		if(master)
+			master.update_icon()
 
 /*		if(special_assembly)
 			special_assembly.update_icon()
@@ -176,6 +177,8 @@
 				a_right.pulsed(0)
 			if(a_left != D)
 				a_left.pulsed(0)
+		if(master)
+			master.receive_signal()
 //		if(special && special_assembly)
 //			if(!special_assembly == D)
 //				special_assembly.dothings()
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 435aa176844..e1790d7d871 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -100,6 +100,8 @@
 
 
 	signal()
+		if(!radio_connection) return
+
 		var/datum/signal/signal = new
 		signal.source = src
 		signal.encryption = code
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index cc5240280c0..3cce208ebe7 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -37,8 +37,7 @@
 	timer_end()
 		if((!secured)||(cooldown > 0))	return 0
 		pulse(0)
-		for(var/mob/O in hearers(null, null))
-			O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
+		visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
 		cooldown = 2
 		spawn(10)
 			process_cooldown()
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index ebebd14dd87..59cf447ef84 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index bcc80f98b77..8c7c88b689f 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 701c2082f2e..1b47ca5e133 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,266 +6,6 @@
 
 // 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"
@@ -446,16 +186,6 @@
 #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"
@@ -470,7 +200,6 @@
 #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"
@@ -492,18 +221,8 @@
 #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