-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/research/designs.dm

@@ -1518,7 +1518,7 @@ datum
 /obj/item/weapon/disk/design_disk
 	name = "Component Design Disk"
 	desc = "A disk for storing device design data for construction in lathes."
-	icon = 'cloning.dmi'
+	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk2"
 	item_state = "card-id"
 	w_class = 1.0

code/modules/research/destructive_analyzer.dm

@@ -103,7 +103,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 /*/obj/item/weapon/deconstruction_test
 	name = "Test Item"
 	desc = "WTF?"
-	icon = 'weapons.dmi'
+	icon = 'icons/obj/weapons.dmi'
 	icon_state = "d20"
 	g_amt = 5000
 	m_amt = 5000

code/modules/research/message_server.dm

@@ -45,7 +45,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 				priority = "Undetermined"
 
 /obj/machinery/message_server
-	icon = 'research.dmi'
+	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "server"
 	name = "Messaging Server"
 	density = 1
@@ -172,7 +172,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 var/obj/machinery/blackbox_recorder/blackbox
 
 /obj/machinery/blackbox_recorder
-	icon = 'stationobjs.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "blackbox"
 	name = "Blackbox Recorder"
 	density = 1

code/modules/research/rdmachines.dm

@@ -5,7 +5,7 @@
 
 /obj/machinery/r_n_d
 	name = "R&D Device"
-	icon = 'research.dmi'
+	icon = 'icons/obj/machines/research.dmi'
 	density = 1
 	anchored = 1
 	use_power = 1

code/modules/research/research.dm

@@ -259,7 +259,7 @@ datum
 /obj/item/weapon/disk/tech_disk
 	name = "Technology Disk"
 	desc = "A disk for storing technology data for further research."
-	icon = 'cloning.dmi'
+	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk2"
 	item_state = "card-id"
 	w_class = 1.0

code/modules/research/server.dm

@@ -1,6 +1,6 @@
 /obj/machinery/r_n_d/server
 	name = "R&D Server"
-	icon = 'research.dmi'
+	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "server"
 	var
 		datum/research/files