-Make holodeck eswords a child of obj/item/weapon/holo instead of reg…

…ular 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/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -4,7 +4,7 @@
 /obj/machinery/atmospherics/binary/circulator
 	name = "circulator/heat exchanger"
 	desc = "A gas circulator pump and heat exchanger."
-	icon = 'pipes.dmi'
+	icon = 'icons/obj/pipes.dmi'
 	icon_state = "circ1-off"
 
 	var/side = 1 // 1=left 2=right

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -1,5 +1,5 @@
 /obj/machinery/atmospherics/binary/dp_vent_pump
-	icon = 'dp_vent_pump.dmi'
+	icon = 'icons/obj/atmospherics/dp_vent_pump.dmi'
 	icon_state = "off"
 
 	//node2 is output port

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -13,7 +13,7 @@ Thus, the two variables affect pump operation are set in New():
 */
 
 obj/machinery/atmospherics/binary/pump
-	icon = 'pump.dmi'
+	icon = 'icons/obj/atmospherics/pump.dmi'
 	icon_state = "intact_off"
 
 	name = "Gas pump"

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -13,7 +13,7 @@ Thus, the two variables affect pump operation are set in New():
 */
 
 obj/machinery/atmospherics/binary/volume_pump
-	icon = 'volume_pump.dmi'
+	icon = 'icons/obj/atmospherics/volume_pump.dmi'
 	icon_state = "intact_off"
 
 	name = "Gas pump"

code/ATMOSPHERICS/components/portables_connector.dm

@@ -1,5 +1,5 @@
 /obj/machinery/atmospherics/portables_connector
-	icon = 'portables_connector.dmi'
+	icon = 'icons/obj/atmospherics/portables_connector.dmi'
 	icon_state = "intact"
 
 	name = "Connector Port"

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -1,5 +1,5 @@
 obj/machinery/atmospherics/trinary/filter
-	icon = 'filter.dmi'
+	icon = 'icons/obj/atmospherics/filter.dmi'
 	icon_state = "intact_off"
 	density = 1
 

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -1,5 +1,5 @@
 obj/machinery/atmospherics/trinary/mixer
-	icon = 'mixer.dmi'
+	icon = 'icons/obj/atmospherics/mixer.dmi'
 	icon_state = "intact_off"
 	density = 1
 

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -1,5 +1,5 @@
 /obj/machinery/atmospherics/unary/cold_sink
-	icon = 'cold_sink.dmi'
+	icon = 'icons/obj/atmospherics/cold_sink.dmi'
 	icon_state = "intact_off"
 	density = 1
 

code/ATMOSPHERICS/components/unary/generator_input.dm

@@ -1,5 +1,5 @@
 /obj/machinery/atmospherics/unary/generator_input
-	icon = 'heat_exchanger.dmi'
+	icon = 'icons/obj/atmospherics/heat_exchanger.dmi'
 	icon_state = "intact"
 	density = 1
 

code/ATMOSPHERICS/components/unary/heat_exchanger.dm

@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/unary/heat_exchanger
 
-	icon = 'heat_exchanger.dmi'
+	icon = 'icons/obj/atmospherics/heat_exchanger.dmi'
 	icon_state = "intact"
 	density = 1
 

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -1,7 +1,7 @@
 /obj/machinery/atmospherics/unary/heat_reservoir
 //currently the same code as cold_sink but anticipating process() changes
 
-	icon = 'cold_sink.dmi'
+	icon = 'icons/obj/atmospherics/cold_sink.dmi'
 	icon_state = "intact_off"
 	density = 1
 

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -1,5 +1,5 @@
 /obj/machinery/atmospherics/unary/outlet_injector
-	icon = 'outlet_injector.dmi'
+	icon = 'icons/obj/atmospherics/outlet_injector.dmi'
 	icon_state = "off"
 
 	name = "Air Injector"

code/ATMOSPHERICS/components/unary/oxygen_generator.dm

@@ -1,5 +1,5 @@
 obj/machinery/atmospherics/unary/oxygen_generator
-	icon = 'oxygen_generator.dmi'
+	icon = 'icons/obj/atmospherics/oxygen_generator.dmi'
 	icon_state = "intact_off"
 	density = 1
 

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -1,5 +1,5 @@
 /obj/machinery/atmospherics/unary/vent_pump
-	icon = 'vent_pump.dmi'
+	icon = 'icons/obj/atmospherics/vent_pump.dmi'
 	icon_state = "off"
 
 	name = "Air Vent"

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -1,5 +1,5 @@
 /obj/machinery/atmospherics/unary/vent_scrubber
-	icon = 'vent_scrubber.dmi'
+	icon = 'icons/obj/atmospherics/vent_scrubber.dmi'
 	icon_state = "off"
 
 	name = "Air Scrubber"

code/ATMOSPHERICS/components/valve.dm

@@ -1,5 +1,5 @@
 obj/machinery/atmospherics/valve
-	icon = 'valve.dmi'
+	icon = 'icons/obj/atmospherics/valve.dmi'
 	icon_state = "valve0"
 
 	name = "manual valve"
@@ -250,7 +250,7 @@ obj/machinery/atmospherics/valve
 	digital		// can be controlled by AI
 		name = "digital valve"
 		desc = "A digitally controlled valve."
-		icon = 'digital_valve.dmi'
+		icon = 'icons/obj/atmospherics/digital_valve.dmi'
 
 		attack_ai(mob/user as mob)
 			return src.attack_hand(user)

code/ATMOSPHERICS/he_pipes.dm

@@ -1,6 +1,6 @@
 
 obj/machinery/atmospherics/pipe/simple/heat_exchanging
-	icon = 'heat.dmi'
+	icon = 'icons/obj/pipes/heat.dmi'
 	icon_state = "intact"
 	level = 2
 	var/initialize_directions_he
@@ -58,7 +58,7 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
 
 
 obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
-	icon = 'junction.dmi'
+	icon = 'icons/obj/pipes/junction.dmi'
 	icon_state = "intact"
 	level = 2
 	minimum_temperature_difference = 300

code/ATMOSPHERICS/pipes.dm

@@ -56,7 +56,7 @@ obj/machinery/atmospherics/pipe
 		..()
 
 	simple
-		icon = 'pipes.dmi'
+		icon = 'icons/obj/pipes.dmi'
 		icon_state = "intact-f"
 
 		name = "pipe"
@@ -304,7 +304,7 @@ obj/machinery/atmospherics/pipe
 
 
 	simple/insulated
-		icon = 'red_pipe.dmi'
+		icon = 'icons/obj/atmospherics/red_pipe.dmi'
 		icon_state = "intact"
 
 		minimum_temperature_difference = 10000
@@ -317,7 +317,7 @@ obj/machinery/atmospherics/pipe
 
 
 	tank
-		icon = 'pipe_tank.dmi'
+		icon = 'icons/obj/atmospherics/pipe_tank.dmi'
 		icon_state = "intact"
 
 		name = "Pressure Tank"
@@ -361,7 +361,7 @@ obj/machinery/atmospherics/pipe
 				..()
 
 		toxins
-			icon = 'orange_pipe_tank.dmi'
+			icon = 'icons/obj/atmospherics/orange_pipe_tank.dmi'
 			name = "Pressure Tank (Plasma)"
 
 			New()
@@ -374,7 +374,7 @@ obj/machinery/atmospherics/pipe
 				..()
 
 		oxygen_agent_b
-			icon = 'red_orange_pipe_tank.dmi'
+			icon = 'icons/obj/atmospherics/red_orange_pipe_tank.dmi'
 			name = "Pressure Tank (Oxygen + Plasma)"
 
 			New()
@@ -390,7 +390,7 @@ obj/machinery/atmospherics/pipe
 				..()
 
 		oxygen
-			icon = 'blue_pipe_tank.dmi'
+			icon = 'icons/obj/atmospherics/blue_pipe_tank.dmi'
 			name = "Pressure Tank (Oxygen)"
 
 			New()
@@ -403,7 +403,7 @@ obj/machinery/atmospherics/pipe
 				..()
 
 		nitrogen
-			icon = 'red_pipe_tank.dmi'
+			icon = 'icons/obj/atmospherics/red_pipe_tank.dmi'
 			name = "Pressure Tank (Nitrogen)"
 
 			New()
@@ -416,7 +416,7 @@ obj/machinery/atmospherics/pipe
 				..()
 
 		air
-			icon = 'red_pipe_tank.dmi'
+			icon = 'icons/obj/atmospherics/red_pipe_tank.dmi'
 			name = "Pressure Tank (Air)"
 
 			New()
@@ -497,7 +497,7 @@ obj/machinery/atmospherics/pipe
 					user << "\blue Tank is empty!"
 
 	vent
-		icon = 'pipe_vent.dmi'
+		icon = 'icons/obj/atmospherics/pipe_vent.dmi'
 		icon_state = "intact"
 
 		name = "Vent"
@@ -581,7 +581,7 @@ obj/machinery/atmospherics/pipe
 				icon_state = "exposed"
 
 	manifold
-		icon = 'pipe_manifold.dmi'
+		icon = 'icons/obj/atmospherics/pipe_manifold.dmi'
 		icon_state = "manifold-f"
 
 		name = "pipe manifold"

code/FEA/FEA_fire.dm

@@ -51,7 +51,7 @@
 	anchored = 1
 	mouse_opacity = 0
 	unacidable = 1//So you can't melt fire with acid.
-	icon = 'fire.dmi'
+	icon = 'icons/effects/fire.dmi'
 	icon_state = "1"
 	layer = TURF_LAYER
 

code/FEA/FEA_turf_tile.dm

@@ -128,7 +128,7 @@ turf
 
 				var/siding_icon_state = return_siding_icon_state()
 				if(siding_icon_state)
-					overlays += image('floors.dmi',siding_icon_state)
+					overlays += image('icons/turf/floors.dmi',siding_icon_state)
 
 				switch(model.graphic)
 					if("plasma")

code/WorkInProgress/buildmode.dm

@@ -39,7 +39,7 @@
 	anchored = 1
 	layer = 20
 	dir = NORTH
-	icon = 'buildmode.dmi'
+	icon = 'icons/misc/buildmode.dmi'
 	var/obj/effect/bmode/buildholder/master = null
 
 /obj/effect/bmode/builddir
@@ -60,7 +60,7 @@
 		return
 
 /obj/effect/bmode/buildhelp
-	icon = 'buildmode.dmi'
+	icon = 'icons/misc/buildmode.dmi'
 	icon_state = "buildhelp"
 	screen_loc = "NORTH,WEST+1"
 	Click()

code/WorkInProgress/explosion_particles.dm

@@ -1,6 +1,6 @@
 /obj/effect/expl_particles
 	name = "fire"
-	icon = 'effects.dmi'
+	icon = 'icons/effects/effects.dmi'
 	icon_state = "explosion_particle"
 	opacity = 1
 	anchored = 1
@@ -38,7 +38,7 @@
 
 /obj/effect/explosion
 	name = "fire"
-	icon = '96x96.dmi'
+	icon = 'icons/effects/96x96.dmi'
 	icon_state = "explosion"
 	opacity = 1
 	anchored = 1

code/datums/helper_datums/tension.dm

@@ -595,7 +595,7 @@ var/global/datum/tension/tension_master
 							if(synd_mind.current.client)
 								for(var/datum/mind/synd_mind_1 in ticker.mode.syndicates)
 									if(synd_mind_1.current)
-										var/I = image('mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
+										var/I = image('icons/mob/mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
 										synd_mind.current.client.images += I
 
 					for (var/obj/machinery/nuclearbomb/bomb in world)
@@ -973,7 +973,7 @@ var/global/datum/tension/tension_master
 
 /obj/machinery/computer/Borg_station
 	name = "Cyborg Station Terminal"
-	icon = 'computer.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_state = "syndishuttle"
 	req_access = list()
 	var/temp = null

code/datums/spell.dm

@@ -28,7 +28,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 	var/selection_type = "view" //can be "range" or "view"
 
 	var/overlay = 0
-	var/overlay_icon = 'wizard.dmi'
+	var/overlay_icon = 'icons/obj/wizard.dmi'
 	var/overlay_icon_state = "spell"
 	var/overlay_lifespan = 0
 

code/datums/spells/ethereal_jaunt.dm

@@ -23,7 +23,7 @@
 			animation.name = "water"
 			animation.density = 0
 			animation.anchored = 1
-			animation.icon = 'mob.dmi'
+			animation.icon = 'icons/mob/mob.dmi'
 			animation.icon_state = "liquify"
 			animation.layer = 5
 			animation.master = holder
@@ -69,7 +69,7 @@
 
 /obj/effect/dummy/spell_jaunt
 	name = "water"
-	icon = 'effects.dmi'
+	icon = 'icons/effects/effects.dmi'
 	icon_state = "nothing"
 	var/canmove = 1
 	density = 0

code/datums/spells/projectile.dm

@@ -2,13 +2,13 @@
 	name = "Projectile"
 	desc = "This spell summons projectiles which try to hit the targets."
 
-	var/proj_icon = 'projectiles.dmi'
+	var/proj_icon = 'icons/obj/projectiles.dmi'
 	var/proj_icon_state = "spell"
 	var/proj_name = "a spell projectile"
 
 	var/proj_trail = 0 //if it leaves a trail
 	var/proj_trail_lifespan = 0 //deciseconds
-	var/proj_trail_icon = 'wizard.dmi'
+	var/proj_trail_icon = 'icons/obj/wizard.dmi'
 	var/proj_trail_icon_state = "trail"
 
 	var/proj_type = "/obj/effect/proc_holder/spell/targeted" //IMPORTANT use only subtypes of this

code/defines/area/Space Station 13 areas.dm

@@ -22,7 +22,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/party = null
 	level = null
 	name = "Space"
-	icon = 'areas.dmi'
+	icon = 'icons/turf/areas.dmi'
 	icon_state = "unknown"
 	layer = 10
 	mouse_opacity = 0

code/defines/atom.dm

@@ -179,7 +179,7 @@ Also, the icon used for the beam will have to be vertical and 32x32.
 The math involved assumes that the icon is vertical to begin with so unless you want to adjust the math,
 its easier to just keep the beam vertical.
 */
-/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='beam.dmi',time=50, maxdistance=10)
+/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10)
 	//BeamTarget represents the target for the beam, basically just means the other end.
 	//Time is the duration to draw the beam
 	//Icon is obviously which icon to use for the beam, default is beam.dmi

code/defines/mob/dead/observer.dm

@@ -1,7 +1,7 @@
 /mob/dead/observer
 	name = "ghost"
 	desc = "It's a g-g-g-g-ghooooost!" //jinkies!
-	icon = 'mob.dmi'
+	icon = 'icons/mob/mob.dmi'
 	icon_state = "ghost"
 	layer = 4
 	stat = DEAD

code/defines/mob/living/carbon/alien.dm

@@ -3,7 +3,7 @@
 	voice_name = "alien"
 	voice_message = "hisses"
 	say_message = "hisses"
-	icon = 'alien.dmi'
+	icon = 'icons/mob/alien.dmi'
 	gender = NEUTER
 
 	var/storedPlasma = 250