Make icon paths absolute.

code/TriDimension/Structures.dm

@@ -3,7 +3,7 @@
 ///////////////////////////////////////
 
 /obj/multiz
-	icon = 'multiz.dmi'
+	icon = 'code/TriDimension/multiz.dmi'
 	density = 0
 	opacity = 0
 	anchored = 1

code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm

@@ -45,7 +45,7 @@
 
 	var/minimap_updating = 0
 
-	var/icon/minimap_icon = new('minimap.dmi', "chunk_base")
+	var/icon/minimap_icon = new('icons/minimap.dmi', "chunk_base")
 	var/obj/minimap_obj/minimap_obj = new()
 
 /obj/minimap_obj/Click(location, control, params)
@@ -243,7 +243,7 @@
 
 		if(!(t in visibleTurfs))
 			if(!t.obscured)
-				t.obscured = image('cameravis.dmi', t, "black", 15)
+				t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
 
 			obscured += t.obscured
 			for(var/mob/aiEye/m in seenby)
@@ -253,7 +253,7 @@
 	for(var/turf/t in dimAdded)
 		if(!(t in visibleTurfs))
 			if(!t.dim)
-				t.dim = image('cameravis.dmi', t, "dim", 15)
+				t.dim = image('icons/effects/cameravis.dmi', t, "dim", 15)
 				t.mouse_opacity = 0
 
 			dim += t.dim
@@ -277,7 +277,7 @@
 	for(var/turf/t in visRemoved)
 		if(t in obscuredTurfs)
 			if(!t.obscured)
-				t.obscured = image('cameravis.dmi', t, "black", 15)
+				t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
 
 			obscured += t.obscured
 			for(var/mob/aiEye/m in seenby)
@@ -313,14 +313,14 @@
 
 	for(var/turf/t in obscuredTurfs)
 		if(!t.obscured)
-			t.obscured = image('cameravis.dmi', t, "black", 15)
+			t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
 
 		obscured += t.obscured
 
 	for(var/turf/t in dimTurfs)
 		if(!(t in visibleTurfs))
 			if(!t.dim)
-				t.dim = image('cameravis.dmi', t, "dim", TURF_LAYER)
+				t.dim = image('icons/effects/cameravis.dmi', t, "dim", TURF_LAYER)
 				t.dim.mouse_opacity = 0
 
 			dim += t.dim

code/WorkInProgress/AI_Visibility/chunk.dm

@@ -22,7 +22,7 @@
 	var/z
 
 
-	var/icon/minimap_icon = new('minimap.dmi', "chunk_base")
+	var/icon/minimap_icon = new('icons/minimap.dmi', "chunk_base")
 	var/obj/minimap_obj/minimap_obj = new()
 
 
@@ -77,13 +77,13 @@
 
 	for(var/turf/t in obscuredTurfs)
 		if(!t.obscured)
-			t.obscured = image('cameravis.dmi', t, "black", 15)
+			t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
 
 		obscured += t.obscured
 
 	for(var/turf/t in dimTurfs)
 		if(!t.dim)
-			t.dim = image('cameravis.dmi', t, "dim", TURF_LAYER)
+			t.dim = image('icons/effects/cameravis.dmi', t, "dim", TURF_LAYER)
 			t.dim.mouse_opacity = 0
 
 		dim += t.dim
@@ -184,7 +184,7 @@
 
 		if(!(t in visibleTurfs))
 			if(!t.obscured)
-				t.obscured = image('cameravis.dmi', t, "black", 15)
+				t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
 
 			obscured += t.obscured
 			images_added += t.obscured
@@ -192,7 +192,7 @@
 	for(var/turf/t in dimAdded)
 		if(!(t in visibleTurfs))
 			if(!t.dim)
-				t.dim = image('cameravis.dmi', t, "dim", 15)
+				t.dim = image('icons/effects/cameravis.dmi', t, "dim", 15)
 				t.dim.mouse_opacity = 0
 
 			dim += t.dim
@@ -210,7 +210,7 @@
 	for(var/turf/t in visRemoved)
 		if(t in obscuredTurfs)
 			if(!t.obscured)
-				t.obscured = image('cameravis.dmi', t, "black", 15)
+				t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
 
 			obscured += t.obscured
 			images_added += t.obscured

code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm

@@ -147,6 +147,7 @@
 	//newMsg.is_admin_message = 1
 	var/datum/trade_destination/affected_dest = pick(weighted_mundaneevent_locations)
 	newMsg.body = pick(file2list("config/news/trivial.txt"))
+	newMsg.body = replacetext(newMsg.body,"{{AFFECTED}}",affected_dest.name)
 
 	for(var/datum/feed_channel/FC in news_network.network_channels)
 		if(FC.channel_name == "The Gibson Gazette")

code/WorkInProgress/Chinsky/ashtray.dm

@@ -1,5 +1,5 @@
 /obj/item/ashtray
-	icon = 'ashtray.dmi'
+	icon = 'icons/ashtray.dmi'
 	var/
 		max_butts 	= 0
 		empty_desc 	= ""

code/WorkInProgress/Cib/amorph/amorph_attack.dm

@@ -16,7 +16,7 @@
 				return
 			if (health > 0)
 				attacked += 10
-				playsound(loc, 'bite.ogg', 50, 1, -1)
+				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[M.name] has bit [src]!</B>"), 1)
@@ -71,14 +71,14 @@
 					playsound(loc, "punch", 25, 1, -1)
 				else if(M.type == /mob/living/carbon/human/tajaran)
 					damage += 10
-					playsound(loc, 'slice.ogg', 25, 1, -1)
+					playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
 				adjustBruteLoss(damage/10)
 				updatehealth()
 			else
 				if(M.type != /mob/living/carbon/human/tajaran)
-					playsound(loc, 'punchmiss.ogg', 25, 1, -1)
+					playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 				else if(M.type == /mob/living/carbon/human/tajaran)
-					playsound(loc, 'slashmiss.ogg', 25, 1, -1)
+					playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] has attempted to [attack_verb] [name]!</B>", M), 1)
@@ -100,14 +100,14 @@
 
 				LAssailant = M
 
-				playsound(loc, 'thudswoosh.ogg', 50, 1, -1)
+				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					O.show_message(text("\red [] has grabbed [name] passively!", M), 1)
 
 			else
 				if (!( paralysis ))
 					drop_item()
-					playsound(loc, 'thudswoosh.ogg', 50, 1, -1)
+					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 					for(var/mob/O in viewers(src, null))
 						if ((O.client && !( O.blinded )))
 							O.show_message(text("\red <B>[] has disarmed [name]!</B>", M), 1)
@@ -125,7 +125,7 @@
 
 		if ("hurt")
 			if ((prob(95) && health > 0))
-				playsound(loc, 'slice.ogg', 25, 1, -1)
+				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
 				var/damage = rand(15, 30)
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
@@ -134,7 +134,7 @@
 				updatehealth()
 				react_to_attack(M)
 			else
-				playsound(loc, 'slashmiss.ogg', 25, 1, -1)
+				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] has attempted to lunge at [name]!</B>", M), 1)
@@ -155,12 +155,12 @@
 
 			LAssailant = M
 
-			playsound(loc, 'thudswoosh.ogg', 50, 1, -1)
+			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\red [] has grabbed [name] passively!", M), 1)
 
 		if ("disarm")
-			playsound(loc, 'pierce.ogg', 25, 1, -1)
+			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
 			var/damage = 5
 			if(prob(95))
 				Weaken(rand(10,15))

code/WorkInProgress/Cib/amorph/amorph_hud.dm

@@ -1,4 +1,4 @@
-/obj/hud/proc/amorph_hud(var/ui_style='screen1_old.dmi')
+/obj/hud/proc/amorph_hud(var/ui_style='icons/mob/screen1_old.dmi')
 
 	src.adding = list(  )
 	src.other = list(  )
@@ -285,7 +285,7 @@
 
 	mymob.zone_sel = new /obj/screen/zone_sel( null )
 	mymob.zone_sel.overlays = null
-	mymob.zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
+	mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
 
 	//Handle the gun settings buttons
 	mymob.gun_setting_icon = new /obj/screen/gun/mode(null)

code/WorkInProgress/Ported/Abi79/uplinks.dm

@@ -199,7 +199,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 /obj/item/device/uplink/pda
 	name = "uplink module"
 	desc = "An electronic uplink system of unknown origin."
-	icon = 'module.dmi'
+	icon = 'icons/obj/module.dmi'
 	icon_state = "power_mod"
 	var/obj/item/device/pda/hostpda = null
 
@@ -312,7 +312,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 
 /obj/item/device/uplink/radio
 	name = "ship bounced radio"
-	icon = 'radio.dmi'
+	icon = 'icons/obj/radio.dmi'
 	icon_state = "radio"
 	var/temp = null 			//Temporary storage area for a message offering the option to destroy the radio
 	var/selfdestruct = 0		//Set to 1 while the radio is self destructing itself.

code/WorkInProgress/Ported/Bureaucracy/copier.dm

@@ -2,7 +2,7 @@
 
 /obj/machinery/copier
 	name = "Copy Machine"
-	icon = 'bureaucracy.dmi'
+	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "copier_o"
 	density = 1
 	anchored = 1
@@ -116,7 +116,7 @@
 
 			// fx
 			flick("copier_s", src)
-			playsound(src, 'polaroid1.ogg', 50, 1)
+			playsound(src, 'sound/items/polaroid1.ogg', 50, 1)
 
 			// dup the file
 			if(istype(template, /obj/item/weapon/paper))

code/WorkInProgress/Ported/Bureaucracy/filing.dm

@@ -1,7 +1,7 @@
 /obj/structure/filingcabinet
 	name = "Filing Cabinet"
 	desc = "A large cabinet with drawers."
-	icon = 'bureaucracy.dmi'
+	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "filingcabinet"
 	density = 1
 	anchored = 1

code/WorkInProgress/Ported/Spawners/spawner.dm

@@ -3,7 +3,7 @@
 
 /obj/spawner/bomb
 	name = "bomb"
-	icon = 'screen1.dmi'
+	icon = 'icons/mob/screen1.dmi'
 	icon_state = "x"
 	var/btype = 0  //0 = radio, 1= prox, 2=time
 	var/explosive = 1	// 0= firebomb
@@ -30,7 +30,7 @@
 	// Going in depth: the reason we do not do a Del() in its New()is because then we cannot access its properties.
 	// I might be doing this wrong / not knowing of a Byond function. If I'm doing it wrong, let me know please.
 	name = "bomb"
-	icon = 'screen1.dmi'
+	icon = 'icons/mob/screen1.dmi'
 	icon_state = "x"
 	var/btype = 0 // 0=radio, 1=prox, 2=time
 	var/btemp1 = 1500

code/WorkInProgress/Ported/policetape.dm

@@ -1,7 +1,7 @@
 //Define all tape types in policetape.dm
 /obj/item/taperoll
 	name = "tape roll"
-	icon = 'policetape.dmi'
+	icon = 'icons/policetape.dmi'
 	icon_state = "rollstart"
 	flags = FPRINT
 	w_class = 1.0
@@ -12,7 +12,7 @@
 
 /obj/item/tape
 	name = "tape"
-	icon = 'policetape.dmi'
+	icon = 'icons/policetape.dmi'
 	anchored = 1
 	density = 1
 	var/icon_base

code/WorkInProgress/SkyMarshal/Ultralight.dm

@@ -352,7 +352,7 @@ area/proc/ul_Light(var/Red = LightLevelRed, var/Green = LightLevelGreen, var/Blu
 	if(ul_CachedOverlay)
 		ul_Overlay = ul_CachedOverlay
 	else
-		ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] = image('ULIcons.dmi', , "[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]", ul_Layer)
+		ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] = image('icons/effects/ULIcons.dmi', , "[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]", ul_Layer)
 		ul_Overlay = ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"]
 
 	overlays += ul_Overlay

code/WorkInProgress/SkyMarshal/portalathe.dm

@@ -2,7 +2,7 @@
 /obj/item/device/portalathe
 	name = "portable autolathe"
 	desc = "A device which can repair broken lights instantly. Must be advanced."
-	icon = 'janitor.dmi'
+	icon = 'icons/obj/janitor.dmi'
 	icon_state = "portalathe"
 
 	afterattack(var/atom/target, mob/user as mob)

code/WorkInProgress/SkyMarshal/traitoritems.dm

@@ -4,7 +4,7 @@
 	name = "eraser"
 	desc = "It looks like some kind of eraser."
 	flags = FPRINT | TABLEPASS
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "zippo"
 	item_state = "zippo"
 	w_class = 1.0

code/WorkInProgress/SkyMarshal/wardrobes.dm

@@ -3,7 +3,7 @@
 /obj/item/wardrobe
 	name = "\improper Wardrobe"
 	desc = "A standard-issue bag for clothing and equipment. Usually comes sealed, stocked with everything you need for a particular job."
-	icon = 'suits.dmi'
+	icon = 'icons/obj/clothing/suits.dmi'
 	icon_state = "wardrobe_sealed"
 	item_state = "wardrobe"
 	w_class = 4

code/WorkInProgress/Susan/susan_desert_turfs.dm

@@ -2,7 +2,7 @@
 
 turf/unsimulated/desert
 	name = "desert"
-	icon = 'desert.dmi'
+	icon = 'code/WorkInProgress/Susan/desert.dmi'
 	icon_state = "desert"
 	temperature = 393.15
 	luminosity = 5
@@ -120,7 +120,7 @@ turf/simulated/wall/impassable_rock
 /obj/effect/alien/flesh/weeds
 	name = "Fleshy Growth"
 	desc = "A pulsating grouping of odd, alien tissues. It's almost like it has a heartbeat..."
-	icon = 'biocraps.dmi'
+	icon = 'code/WorkInProgress/Susan/biocraps.dmi'
 	icon_state = "flesh"
 
 	anchored = 1
@@ -130,7 +130,7 @@ turf/simulated/wall/impassable_rock
 
 /obj/effect/alien/flesh/weeds/node
 	icon_state = "fleshnode"
-	icon = 'biocraps.dmi'
+	icon = 'code/WorkInProgress/Susan/biocraps.dmi'
 	name = "Throbbing Pustule"
 	desc = "A grotquese, oozing, pimple-like growth. You swear you can see something moving around in the bulb..."
 	luminosity = NODERANGE
@@ -316,7 +316,7 @@ Alien plants should do something if theres a lot of poison
 //hostile entities or npcs
 
 /obj/item/projectile/slimeglob
-	icon = 'projectiles.dmi'
+	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "toxin"
 	damage = 20
 	damage_type = BRUTE
@@ -461,7 +461,7 @@ Alien plants should do something if theres a lot of poison
 
 obj/effect/critter/fleshmonster/fleshslime
 	name = "Flesh Slime"
-	icon = 'biocraps.dmi'
+	icon = 'code/WorkInProgress/Susan/biocraps.dmi'
 	icon_state = "livingflesh"
 	desc = "A creature that appears to be made out of living tissue strewn together haphazardly. Some kind of liquid bubbles from its maw."
 	//ranged = 1

code/WorkInProgress/Tastyfish/Eliza_Data.dm

@@ -391,12 +391,12 @@
 					ai.show_message("<i>Intercepted message from <b>[who]</b>: [object]</i>")
 
 			if (!pda.silent)
-				playsound(pda.loc, 'twobeep.ogg', 50, 1)
+				playsound(pda.loc, 'sound/machines/twobeep.ogg', 50, 1)
 				for (var/mob/O in hearers(3, pda.loc))
 					O.show_message(text("\icon[pda] *[pda.ttone]*"))
 
 			pda.overlays = null
-			pda.overlays += image('pda.dmi', "pda-r")
+			pda.overlays += image('icons/obj/pda.dmi', "pda-r")
 		else
 			var/list/href_list = list()
 			href_list["src"] = "\ref[eliza.speaker.loc.loc]"

code/WorkInProgress/Tastyfish/livestock.dm

@@ -1,7 +1,7 @@
 // Base Class
 /mob/living/simple_animal/livestock
 	desc = "Tasty!"
-	icon = 'livestock.dmi'
+	icon = 'icons/mob/livestock.dmi'
 	emote_see = list("shakes its head", "kicks the ground")
 	speak_chance = 1
 	turns_per_move = 15
@@ -165,7 +165,7 @@
 /obj/structure/closet/critter
 	desc = "\improper Critter crate."
 	name = "Critter Crate"
-	icon = 'storage.dmi'
+	icon = 'icons/obj/storage.dmi'
 	icon_state = "critter"
 	density = 1
 	icon_opened = "critteropen"

code/WorkInProgress/Tastyfish/mainspipe.dm

@@ -33,7 +33,7 @@ obj/machinery/atmospherics/pipe/mains_component
 		parent_pipe.burst()
 
 obj/machinery/atmospherics/mains_pipe
-	icon = 'mainspipe.dmi'
+	icon = 'icons/obj/atmospherics/mainspipe.dmi'
 	layer = 2.4 //under wires with their 2.5
 
 	var/volume = 0

code/WorkInProgress/Tastyfish/wallmount_frame.dm

@@ -1,7 +1,7 @@
 // a frame for generic wall-mounted things, such as fire alarm, status display..
 // combination of apc_frame and machine_frame
 /obj/machinery/constructable_frame/wallmount_frame
-	icon = 'stock_parts.dmi'
+	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "wm_0"
 	var/wall_offset = 24
 	density = 0
@@ -35,7 +35,7 @@
 		if(1)
 			if(istype(P, /obj/item/weapon/cable_coil))
 				if(P:amount >= 5)
-					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					user << "\blue You start to add cables to the frame."
 					if(do_after(user, 20))
 						P:amount -= 5
@@ -44,7 +44,7 @@
 						state = 2
 						icon_state = "wm_1"
 			if(istype(P, /obj/item/weapon/wrench))
-				playsound(src.loc, 'Ratchet.ogg', 75, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 				user << "\blue You dismantle the frame"
 				new /obj/item/stack/sheet/metal(src.loc, 2)
 				del(src)
@@ -52,7 +52,7 @@
 			if(istype(P, /obj/item/weapon/circuitboard))
 				var/obj/item/weapon/circuitboard/B = P
 				if(B.board_type == "wallmount")
-					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					user << "\blue You add the circuit board to the frame."
 					circuit = P
 					user.drop_item()
@@ -76,7 +76,7 @@
 				else
 					user << "\red This frame does not accept circuit boards of this type!"
 			if(istype(P, /obj/item/weapon/wirecutters))
-				playsound(src.loc, 'wirecutter.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
 				user << "\blue You remove the cables."
 				state = 1
 				icon_state = "wm_0"
@@ -85,7 +85,7 @@
 
 		if(3)
 			if(istype(P, /obj/item/weapon/crowbar))
-				playsound(src.loc, 'Crowbar.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 				state = 2
 				circuit.loc = src.loc
 				circuit = null
@@ -107,7 +107,7 @@
 						component_check = 0
 						break
 				if(component_check)
-					playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 					var/obj/machinery/new_machine = new src.circuit.build_path(src.loc)
 					new_machine.dir = dir
 					if(istype(circuit, /obj/item/weapon/circuitboard/status_display))
@@ -135,7 +135,7 @@
 			if(istype(P, /obj/item/weapon))
 				for(var/I in req_components)
 					if(istype(P, text2path(I)) && (req_components[I] > 0))
-						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+						playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 						if(istype(P, /obj/item/weapon/cable_coil))
 							var/obj/item/weapon/cable_coil/CP = P
 							if(CP.amount > 1)

code/WorkInProgress/Wrongnumber/weldbackpack.dm

@@ -2,7 +2,7 @@
 	name = "Welding kit"
 	desc = "A heavy-duty, portable welding fluid carrier."
 	slot_flags = SLOT_BACK
-	icon = 'storage.dmi'
+	icon = 'icons/obj/storage.dmi'
 	icon_state = "welderpack"
 	w_class = 4.0
 	var/max_fuel = 350
@@ -29,7 +29,7 @@
 				user << "\red That was close!"
 			src.reagents.trans_to(W, T.max_fuel)
 			user << "\blue Welder refilled!"
-			playsound(src.loc, 'refill.ogg', 50, 1, -6)
+			playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 			return
 	user << "\blue The tank scoffs at your insolence.  It only provides services to welders."
 	return
@@ -38,7 +38,7 @@
 	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume < max_fuel)
 		O.reagents.trans_to(src, max_fuel)
 		user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank."
-		playsound(src.loc, 'refill.ogg', 50, 1, -6)
+		playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return
 	else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume == max_fuel)
 		user << "\blue The pack is already full!"

code/WorkInProgress/animusstation/atm.dm

@@ -12,7 +12,7 @@ log transactions
 /obj/machinery/atm
 	name = "\improper NanoTrasen Automatic Teller Machine"
 	desc = "For all your monetary needs!"
-	icon = 'terminals.dmi'
+	icon = 'icons/obj/terminals.dmi'
 	icon_state = "atm"
 	anchored = 1
 	use_power = 1

code/WorkInProgress/meteors.dm

@@ -78,7 +78,7 @@
 
 /obj/effect/meteor
 	name = "meteor"
-	icon = 'meteor.dmi'
+	icon = 'icons/obj/meteor.dmi'
 	icon_state = "flaming"
 	density = 1
 	anchored = 1.0
@@ -105,7 +105,7 @@
 				shake_camera(M, 3, 1)
 		if (A)
 			A.meteorhit(src)
-			playsound(get_turf(src), 'meteorimpact.ogg', 40, 1)
+			playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 40, 1)
 		if (--src.hits <= 0)
 			if(prob(15))// && !istype(A, /obj/structure/grille))
 				explosion(get_turf(src), 4, 5, 6, 7, 0)
@@ -138,7 +138,7 @@
 					A.meteorhit(src)
 				src.hits--
 				return
-				playsound(get_turf(src), 'meteorimpact.ogg', 40, 1)
+				playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 40, 1)
 			if (--src.hits <= 0)
 				if(prob(15) && !istype(A, /obj/structure/grille))
 					explosion(get_turf(src), 1, 2, 3, 4, 0)

code/game/gamemodes/events/PortalStorm.dm

@@ -18,7 +18,7 @@
 					var/obj/portal/P = new /obj/portal( T )
 					P.target = picked
 					P.creator = null
-					P.icon = 'objects.dmi'
+					P.icon = 'icons/obj/objects.dmi'
 					P.failchance = 0
 					P.icon_state = "anom"
 					P.name = "wormhole"

code/game/gamemodes/revolution/rp_revolution.dm

@@ -238,7 +238,7 @@
 
 			comm.messagetitle.Add("Cent. Com. Announcement")
 			comm.messagetext.Add(message)
-	world << sound('commandreport.ogg')
+	world << sound('sound/AI/commandreport.ogg')
 
 /datum/game_mode/revolution/rp_revolution/latespawn(mob/M)
 	if(M.mind.assigned_role in command_positions)

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -143,4 +143,4 @@
 			user << "\blue Tank is empty!"
 		return
 
-	return
+	return

code/game/machinery/bots/farmbot.dm

@@ -26,7 +26,7 @@
 /obj/machinery/bot/farmbot
 	name = "Farmbot"
 	desc = "The botanist's best friend."
-	icon = 'aibots.dmi'
+	icon = 'icons/obj/aibots.dmi'
 	icon_state = "farmbot0"
 	layer = 5.0
 	density = 1
@@ -515,7 +515,7 @@
 /obj/item/weapon/farmbot_arm_assembly
 	name = "water tank/robot arm assembly"
 	desc = "A water tank with a robot arm permanently grafted to it."
-	icon = 'aibots.dmi'
+	icon = 'icons/obj/aibots.dmi'
 	icon_state = "water_arm"
 	var/build_step = 0
 	var/created_name = "Farmbot" //To preserve the name if it's a unique farmbot I guess

code/game/machinery/records_scanner.dm

@@ -2,7 +2,7 @@
 obj/machinery/scanner
 	name = "Identity Analyser"
 	var/outputdir = 0
-	icon = 'stationobjs.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "scanner_idle"
 	density = 1
 	anchored = 1

code/game/machinery/walllockers.dm

@@ -1,6 +1,6 @@
 /obj/structure/walllocker
 	name = "Wall Locker"
-	icon = 'lockwall.dmi'
+	icon = 'icons/obj/lockwall.dmi'
 	icon_state = "emerg"
 	var/list/spawnitems = list()
 	anchored = 1

code/game/objects/closets/walllocker.dm

@@ -4,7 +4,7 @@
 /obj/structure/closet/walllocker
 	desc = "A wall mounted storage locker."
 	name = "Wall Locker"
-	icon = 'walllocker.dmi'
+	icon = 'icons/obj/walllocker.dmi'
 	icon_state = "wall-locker"
 	density = 0
 	anchored = 1

code/game/objects/effects/barsign.dm

@@ -1,5 +1,5 @@
 /obj/effect/sign/barsign
-	icon = 'barsigns.dmi'
+	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
 

code/game/objects/items/stacks/medical.dm

@@ -96,7 +96,7 @@
 	name = "\improper S'rendarr's Hand leaf"
 	singular_name = "S'rendarr's Hand leaf"
 	desc = "A soft leaf that is rubbed on bruises."
-	icon = 'harvest.dmi'
+	icon = 'icons/obj/harvest.dmi'
 	icon_state = "cabbage"
 	heal_brute = 7
 
@@ -104,7 +104,7 @@
 	name = "\improper Messa's Tear leaf"
 	singular_name = "Messa's Tear leaf"
 	desc = "A cold leaf that is rubbed on burns."
-	icon = 'harvest.dmi'
+	icon = 'icons/obj/harvest.dmi'
 	icon_state = "ambrosiavulgaris"
 	heal_burn = 7
 

code/game/objects/items/trash.dm

@@ -54,4 +54,4 @@
 		icon_state = "liquidfood"
 
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
-	return
+	return

code/game/objects/items/weapons/surgery_tools.dm

@@ -794,14 +794,14 @@ LOOK FOR SURGERY.DM*/
 //misc, formerly from code/defines/weapons.dm
 /obj/item/weapon/bonegel
 	name = "bone gel"
-	icon = 'surgery.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "bone-gel"
 	force = 0
 	throwforce = 1.0
 
 /obj/item/weapon/FixOVein
 	name = "FixOVein"
-	icon = 'surgery.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "fixovein"
 	force = 0
 	throwforce = 1.0
@@ -810,7 +810,7 @@ LOOK FOR SURGERY.DM*/
 
 /obj/item/weapon/bonesetter
 	name = "bone setter"
-	icon = 'surgery.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "bone setter"
 	force = 8.0
 	throwforce = 9.0

code/game/objects/items/weapons/syndie.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/syndie
-	icon = 'syndieweapons.dmi'
+	icon = 'icons/obj/syndieweapons.dmi'
 
 /*C-4 explosive charge and etc, replaces the old syndie transfer valve bomb.*/
 

code/game/objects/structures/barsign.dm

@@ -1,5 +1,5 @@
 /obj/structure/sign/barsign
-	icon = 'barsigns.dmi'
+	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
 	New()

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -224,4 +224,4 @@
 		sleep(2)
 		new /obj/item/clothing/suit/space/paramedic(src)
 		new /obj/item/clothing/head/helmet/space/paramedic(src)
-		return
+		return

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -106,7 +106,7 @@
 /obj/item/roller
 	name = "roller bed"
 	desc = "A collapsed roller bed that can be carried around."
-	icon = 'rollerbed.dmi'
+	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "folded"
 	w_class = 4.0 // Can't be put in backpacks. Oh well.
 

code/game/objects/structures/window.dm

@@ -131,12 +131,12 @@
 			message_admins("Window destroyed by hulk [user.real_name] ([formatPlayerPanel(user,user.ckey)]) with pdiff [pdiff] at [formatJumpTo(loc)]!")
 			log_admin("Window destroyed by hulk [user.real_name] ([user.ckey]) with pdiff [pdiff] at [loc]!")
 	else if (usr.a_intent == "hurt")
-		playsound(src.loc, 'glassknock.ogg', 80, 1)
+		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
 		usr.visible_message("\red [usr.name] bangs against the [src.name]!", \
 							"\red You bang against the [src.name]!", \
 							"You hear a banging sound.")
 	else
-		playsound(src.loc, 'glassknock.ogg', 80, 1)
+		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
 		usr.visible_message("[usr.name] knocks on the [src.name].", \
 							"You knock on the [src.name].", \
 							"You hear a knocking sound.")

code/modules/clothing/suits/jobs.dm

@@ -194,4 +194,4 @@
 	desc = "They suspend the illusion of the mime's play."
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "suspenders"
-	blood_overlay_type = "armor" //it's the less thing that I can put here
+	blood_overlay_type = "armor" //it's the less thing that I can put here

code/modules/customitems/item_defines.dm

@@ -4,7 +4,7 @@ hi
 // Clothing item_state doesn't use custom_items.dmi. Just add them to the normal clothing files.
 
 /obj/item/fluff // so that they don't spam up the object tree
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	w_class = 1.0
 
 //////////////////////////////////
@@ -70,7 +70,7 @@ hi
 /obj/item/weapon/book/fluff/johnathan_falcian_1
 	name = "sketchbook"
 	desc = "A small, well-used sketchbook."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "johnathan_notebook"
 	dat = "In the notebook there are numerous drawings of various crew-mates, locations, and scenes on the ship. They are of fairly good quality."
 	author = "Johnathan Falcian"
@@ -88,13 +88,13 @@ hi
 /obj/item/weapon/pen/fluff/fancypen //orangebottle: Lillian Levett, Lilliana Reade
 	name = "fancy pen"
 	desc = "A fancy metal pen. It uses blue ink. An inscription on one side reads,\"L.L. - L.R.\""
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "fancypen"
 
 /obj/item/weapon/pen/fluff/fountainpen //paththegreat: Eli Stevens
 	name = "Engraved Fountain Pen"
 	desc = "An expensive looking pen with the initials E.S. engraved into the side."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "fountainpen"
 
 /obj/item/fluff/victor_kaminsky_1 //chinsky: Victor Kaminski
@@ -110,27 +110,27 @@ hi
 /obj/item/weapon/clipboard/fluff/smallnote //lexusjjss: Lexus Langg, Zachary Tomlinson
 	name = "small notebook"
 	desc = "A generic small spiral notebook that flips upwards."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "smallnotetext"
 	item_state = "smallnotetext"
 
 /obj/item/weapon/storage/fluff/maye_daye_1 //morrinn: Maye Day
 	name = "pristine lunchbox"
 	desc = "A pristine stainless steel lunch box. The initials M.D. are engraved on the inside of the lid."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "maye_daye_1"
 
 /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1 //leonheart11:  Johann Erzatz
 	name = "vintage thermos"
 	desc = "An older thermos with a faint shine."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "johann_erzatz_1"
 	volume = 50
 
 /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda
 	name = "blue zippo lighter"
 	desc = "A zippo lighter made of some blue metal."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "bluezippo"
 	icon_on = "bluezippoon"
 	icon_off = "bluezippo"
@@ -138,7 +138,7 @@ hi
 /obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess
 	name = "engraved lighter"
 	desc = "A golden lighter, engraved with some ornaments and a G."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "guessip"
 	icon_on = "guessipon"
 	icon_off = "guessip"
@@ -146,7 +146,7 @@ hi
 /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin
 	name = "Riley's black zippo"
 	desc = "A black zippo lighter, which holds some form of sentimental value."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "blackzippo"
 	icon_on = "blackzippoon"
 	icon_off = "blackzippo"
@@ -154,7 +154,7 @@ hi
 /obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan
 	name = "Graduation Lighter"
 	desc = "A silver engraved lighter with 41 on one side and Tharsis University on the other. The lid reads Fay Sullivan, Cybernetic Engineering, 2541"
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "gradzippo"
 	icon_on = "gradzippoon"
 	icon_off = "gradzippo"
@@ -162,7 +162,7 @@ hi
 /obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
 	name = "Gonzo Fist zippo"
 	desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "gonzozippo"
 	icon_on = "gonzozippoon"
 	icon_off = "gonzozippo"
@@ -170,7 +170,7 @@ hi
 /obj/item/weapon/lighter/zippo/fluff/naples_1 //naples: Russell Vierson
 	name = "Engraved zippo"
 	desc = "A intricately engraved Zippo lighter."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "engravedzippo"
 	icon_on = "engravedzippoon"
 	icon_off = "engravedzippo"
@@ -179,7 +179,7 @@ hi
 	name = "purple comb"
 	desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."
 	w_class = 1.0
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "purplecomb"
 	item_state = "purplecomb"
 
@@ -192,12 +192,12 @@ hi
 /obj/item/weapon/fluff/hugo_cinderbacth_1 //thatoneguy: Hugo Cinderbatch
 	name = "Old Cane"
 	desc = "An old brown cane made from wood. It has a a large, itallicized H on it's handle."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "special_cane"
 
 /obj/item/device/camera/fluff/orange //chinsky: Summer Springfield
 	name = "orange camera"
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black."
 	icon_state = "orangecamera"
 	icon_on = "orangecamera"
@@ -206,7 +206,7 @@ hi
 
 /obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash
 	name = "Old Camera"
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue."
 	icon_state = "oldcamera"
 	icon_on = "oldcamera"
@@ -216,20 +216,20 @@ hi
 /obj/item/weapon/card/id/fluff/lifetime	//fastler: Fastler Greay; it seemed like something multiple people would have
 	name = "Lifetime ID Card"
 	desc = "A modified ID card given only to those people who have devoted their lives to the better interests of NanoTrasen. It sparkles blue."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "lifetimeid"
 
 /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask //lexusjjss: Lexus Langg & Zachary Tomlinson
 	name = "shiny flask"
 	desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "shinyflask"
 	volume = 50
 
 /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask //mcgulliver: Wox Derax
 	name = "Lithium Flask"
 	desc = "A flask with a Lithium Atom symbol on it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "lithiumflask"
 	volume = 50
 
@@ -267,7 +267,7 @@ hi
 /obj/item/clothing/mask/fluff/electriccig //CubeJackal: Barry Sharke
 	name = "Electronic cigarette"
 	desc = "An electronic cigarette. Most of the relief of a real cigarette with none of the side effects. Often used by smokers who are trying to quit the habit."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "cigon"
 	throw_speed = 0.5
 	item_state = "ciglit"
@@ -280,7 +280,7 @@ hi
 /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1
 	name = "strange penlight"
 	desc = "Besides the coloring, this penlight looks rather normal and innocent. However, you get a nagging feeling whenever you see it..."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "asher_spock_1"
 	amount_per_transfer_from_this = 5
 	volume = 15
@@ -333,27 +333,27 @@ hi
 /obj/item/weapon/card/id/fluff/asher_spock_2 //Nerezza: Asher Spock
 	name = "Odysses Specialist ID card"
 	desc = "A special identification card with a red cross signifying an emergency physician has specialised in Odysseus operations and maintenance.\nIt grants the owner recharge bay access."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "odysseus_spec_id"
 
 /obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary
 	name = "McReary's journal"
 	desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "mcreary_journal"
 	item_state = "mcreary_journal"
 
 /obj/item/device/flashlight/fluff/thejesster14_1 //thejesster14: Rosa Wolff
 	name = "old red flashlight"
 	desc = "A very old, childlike flashlight."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "wolfflight"
 	item_state = "wolfflight"
 
 /obj/item/weapon/crowbar/fluff/zelda_creedy_1 //daaneesh: Zelda Creedy
 	name = "Zelda's Crowbar"
 	desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "zeldacrowbar"
 	item_state = "crowbar"
 
@@ -362,7 +362,7 @@ hi
 /obj/item/weapon/fluff/butcher_royce_1
 	name = "Ripley customisation kit"
 	desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into a Titan's Fist worker mech."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "royce_kit"
 
 ////// Ripley customisation kit - Sven Fjeltson - Mordeth221
@@ -370,7 +370,7 @@ hi
 /obj/item/weapon/fluff/sven_fjeltson_1
   name = "Mercenary APLU kit"
   desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into an old Mercenaries APLU."
-  icon = 'custom_items.dmi'
+  icon = 'icons/obj/custom_items.dmi'
   icon_state = "sven_kit"
 
 //////////////////////////////////
@@ -391,7 +391,7 @@ hi
 /obj/item/clothing/gloves/fluff/walter_brooks_1 //botanistpower: Walter Brooks
 	name = "mittens"
 	desc = "A pair of well worn, blue mittens."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "walter_brooks_1"
 	item_state = "bluegloves"
 	color="blue"
@@ -399,13 +399,13 @@ hi
 /obj/item/clothing/gloves/fluff/chal_appara_1 //furlucis: Chal Appara
 	name = "Left Black Glove"
 	desc = "The left one of a pair of black gloves. Wonder where the other one went..."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "chal_appara_1"
 
 /obj/item/clothing/gloves/fluff/ashley_rifler_1 //Vinceluk: Ashley Rifler
 	name = "Purple Glove"
 	desc = "A single, purple glove. Initials A.R. are written on the inside of it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "ashley_rifler_1"
 
 //////////// Eye Wear ////////////
@@ -413,13 +413,13 @@ hi
 /obj/item/clothing/glasses/meson/fluff/book_berner_1 //asanadas: Book Berner
 	name = "bespectacled mesonic surveyors"
 	desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "book_berner_1"
 
 /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra
 	name = "Scanning Goggles"
 	desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "uzenwa_sissra_1"
 
 ////// Medical eyepatch - Thysse Ezinwa - Jadepython
@@ -431,7 +431,7 @@ hi
 /obj/item/clothing/glasses/fluff/arjun_chopra_1
 	name = "safety goggles"
 	desc = "A used pair of leather safety goggles."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "arjun_chopra"
 	item_state = "arjun_chopra"
 
@@ -440,62 +440,62 @@ hi
 /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
 	name = "\improper SWAT hat"
 	desc = "A black hat.  The inside has the words, \"Lieutenant James Girard, LPD SWAT Team Four.\""
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "swatcap"
 
 /obj/item/clothing/head/welding/fluff/alice_mccrea_1 //madmalicemccrea: Alice McCrea
 	name = "flame decal welding helmet"
 	desc = "A welding helmet adorned with flame decals, and several cryptic slogans of varying degrees of legibility. \"Fly the Friendly Skies\" is clearly visible, written above the visor, for some reason."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "alice_mccrea_1"
 
 /obj/item/clothing/head/welding/fluff/yuki_matsuda_1 //searif: Yuki Matsuda
 	name = "white decal welding helmet"
 	desc = "A white welding helmet with a character written across it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "yuki_matsuda_1"
 
 /obj/item/clothing/head/welding/fluff/norah_briggs_1 //bountylord13: Norah Briggs
 	name = "blue flame decal welding helmet"
 	desc = "A welding helmet with blue flame decals on it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "norah_briggs_1"
 
 /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 //themij: Taryn Kifer
 	name = "orange bandana"
 	desc = "Hey, I think we're missing a hazard vest..."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "taryn_kifer_1"
 
 /obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor
 	name = "Edvin's Hat"
 	desc = "A hat specially tailored for Skrellian anatomy. It has a yellow badge on the front, with a large red 'T' inscribed on it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "edvin_telephosphor_1"
 
 /obj/item/clothing/head/hardhat/fluff/neil_patterson_1 //superboredguy: Neil Patterson
 	name = "Engineering Cap"
 	desc = "Much safer than a hard helmet."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "neilpatterson0_hat"
 
 /obj/item/clothing/head/fluff/krinnhat //Shirotyrant: Krinn Seeskale
 	name = "saucepan hat"
 	desc = "This hat is the shiniest shiny Krinn has ever owned."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "krinn_hat"
 //////////// Suits ////////////
 
 /obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber
 	name = "pink labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "labcoat_pink_open"
 
 /obj/item/clothing/suit/storage/det_suit/fluff/graycoat //vinceluk: Seth Sealis
 	name = "gray coat"
 	desc = "Old, worn out coat. It's seen better days."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "graycoat"
 	item_state = "graycoat"
 	color = "graycoat"
@@ -503,7 +503,7 @@ hi
 /obj/item/clothing/suit/storage/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis
 	name = "leather jacket"
 	desc = "A black leather coat, popular amongst punks, greasers, and other galactic scum."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "leatherjack"
 	item_state = "leatherjack"
 	color = "leatherjack"
@@ -511,13 +511,13 @@ hi
 /obj/item/clothing/suit/storage/labcoat/fluff/burnt //Jamini: Edwin Atweeke
 	name = "burnt labcoat"
 	desc = "This lab coat has clearly seen better, less burnt, days."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "labcoat_burnt_open"
 
 /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl
 	name = "blue shield security armor"
 	desc = "An armored vest with the badge of a Blue Shield Security lieutenant."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "deus_blueshield"
 	item_state = "deus_blueshield"
 
@@ -534,7 +534,7 @@ hi
 /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda
 	name = "rolled down jumpsuit"
 	desc = "A rolled down jumpsuit. Great for mechanics."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "jumpsuitdown"
 	item_state = "jumpsuitdown"
 	color = "jumpsuitdown"
@@ -542,7 +542,7 @@ hi
 /obj/item/clothing/under/fluff/olddressuniform //desiderium: Momiji Inubashiri
 	name = "retired dress uniform"
 	desc = "A retired Station Head of Staff uniform, phased out twenty years ago for the newer jumpsuit design, but still acceptable dress. Lovingly maintained."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "olddressuniform"
 	item_state = "olddressuniform"
 	color = "olddressuniform"
@@ -550,14 +550,14 @@ hi
 /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 //whitewolf41: Jeremy Wolf
 	name = "worn officer's uniform"
 	desc = "An old red security jumpsuit. Seems to have some slight modifications."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "jeremy_wolf_1"
 	color = "jeremy_wolf_1"
 
 /obj/item/clothing/under/fluff/tian_dress //phaux: Tian Yinhu
 	name = "purple dress"
 	desc = "A nicely tailored purple dress made for the taller woman."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "tian_dress"
 	item_state = "tian_dress"
 	color = "tian_dress"
@@ -565,7 +565,7 @@ hi
 /obj/item/clothing/under/rank/bartender/fluff/classy	//searif: Ara Al-Jazari
 	name = "classy bartender uniform"
 	desc = "A prim and proper uniform that looks very similar to a bartender's, the only differences being a red tie, waistcoat and a rag hanging out of the back pocket."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "ara_bar_uniform"
 	item_state = "ara_bar_uniform"
 	color = "ara_bar_uniform"
@@ -573,7 +573,7 @@ hi
 /obj/item/clothing/under/fluff/callum_suit //roaper: Callum Leamus
 	name = "knockoff suit"
 	desc = "A knockoff of a suit commonly worn by the upper class."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "callum_suit"
 	item_state = "callum_suit"
 	color = "callum_suit"
@@ -617,7 +617,7 @@ hi
 
 	name = "ex-commander jumpsuit"
 	desc = "A standard Central Command Engineering Commander jumpsuit tailored to fight the wearer tightly. It has a Medal of Service pinned onto the left side of it."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "wyatt_uniform"
 	item_state = "wyatt_uniform"
 	color = "wyatt_uniform"
@@ -628,7 +628,7 @@ hi
 /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell
 	name = "\improper First Nations facemask"
 	desc = "A simple cloth rag that bears the flag of the first nations."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "flagmask"
 	item_state = "flagmask"
 	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
@@ -639,7 +639,7 @@ hi
 /obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick
 	name = "shamrock pendant"
 	desc = "A silver and emerald shamrock pendant. It has the initials \"M.K.\" engraved on the back."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "mara_kilpatrick_1"
 	flags = FPRINT|TABLEPASS
 	w_class = 1
@@ -649,7 +649,7 @@ hi
 /obj/item/clothing/tie/fluff/altair_locket
 	name = "small locket"
 	desc = "A small golden locket attached to an Ii'rka-reed string. Inside the locket is a holo-picture of a female Tajaran, and an inscription writtin in Siik'mas."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "altair_locket"
 	item_state = "altair_locket"
 	color = "altair_locket"
@@ -663,7 +663,7 @@ hi
 /obj/item/clothing/tie/fluff/nasir_khayyam_1
 	name = "medallion"
 	desc = "This silvered medallion bears the symbol of the Hadii Clan of the Tajaran."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "nasir_khayyam_1"
 	flags = FPRINT|TABLEPASS
 	w_class = 1
@@ -674,7 +674,7 @@ hi
 /obj/item/clothing/mask/mara_kilpatrick_1
 	name = "emerald necklace"
 	desc = "A brass necklace with a green emerald placed at the end. It has a small inscription on the top of the chain, saying \'Foster\'"
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "ty_foster"
 	flags = FPRINT|TABLEPASS
 	w_class = 1
@@ -684,7 +684,7 @@ hi
 /obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris
 	name = "Susan's Magboots"
 	desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "atmosmagboots0"
 
 //////////// Sets ////////////
@@ -693,7 +693,7 @@ hi
 /obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat
 	name = "\improper CDC labcoat"
 	desc = "A standard-issue CDC labcoat that protects against minor chemical spills.  It has the name \"Wiles\" sewn on to the breast pocket."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "labcoat_cdc_open"
 */
 ////// Short Sleeve Medical Outfit //erthilo: Farah Lants
@@ -701,14 +701,14 @@ hi
 /obj/item/clothing/under/rank/medical/fluff/short
 	name = "short sleeve medical jumpsuit"
 	desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personnel and short sleeves."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "medical_short"
 	color = "medical_short"
 
 /obj/item/clothing/suit/storage/labcoat/fluff/red
 	name = "red labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "labcoat_red_open"
 
 ////// Retired Patrol Outfit //desiderium: Rook Maudlin
@@ -716,7 +716,7 @@ hi
 /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat
 	name = "retired colony patrolman's coat"
 	desc = "A clean, black nylon windbreaker with the words \"OUTER LIGHT POLICE\" embroidered in gold-dyed thread on the back. \"RETIRED\" is tastefully embroidered below in a smaller font."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "retpolcoat"
 	item_state = "retpolcoat"
 	color = "retpolcoat"
@@ -724,13 +724,13 @@ hi
 /obj/item/clothing/head/det_hat/fluff/retpolcap
 	name = "retired colony patrolman's cap"
 	desc = "A clean and properly creased colony police cap. The badge is shined and polished, the word \"RETIRED\" engraved professionally under the words \"OUTER LIGHT POLICE.\""
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "retpolcap"
 
 /obj/item/clothing/under/det/fluff/retpoluniform
 	name = "retired colony patrolman's uniform"
 	desc = "A meticulously clean police uniform belonging to Precinct 31, Outer Light Colony. The word \"RETIRED\" is engraved tastefully and professionally in the badge below the number, 501."
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "retpoluniform"
 	color = "retpoluniform"
 
@@ -742,7 +742,7 @@ hi
 
 /*	name = "Peacemaker"
 	desc = "A nickel-plated revolver with pearl grips. It has a certain Old West flair!"
-	icon = 'custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "peacemaker"*/
 
 ///// Well-used baton - Oen'g Issek - Donofnyc3

code/modules/projectiles/guns/energy.dm

@@ -41,4 +41,4 @@
 		if(modifystate)
 			icon_state = "[modifystate][ratio]"
 		else
-			icon_state = "[initial(icon_state)][ratio]"
+			icon_state = "[initial(icon_state)][ratio]"

code/modules/reagents/Chemistry-Machinery.dm

@@ -494,7 +494,7 @@
 			for(var/i = 1 to MAX_PILL_SPRITE)
 				usr << browse_rsc(icon('icons/obj/chemical.dmi', "pill" + num2text(i)), "pill[i].png")
 			for(var/i = 1 to MAX_BOTTLE_SPRITE)
-				usr << browse_rsc(icon('chemical.dmi', "bottle" + num2text(i)), "bottle[i].png")
+				usr << browse_rsc(icon('icons/obj/chemical.dmi', "bottle" + num2text(i)), "bottle[i].png")
 	var/dat = ""
 	if(!beaker)
 		dat = "Please insert beaker.<BR>"

code/modules/reagents/reagent_containers/borghydro.dm

@@ -104,4 +104,4 @@
 			empty = 0
 
 	if(empty)
-		usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more."
+		usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more."

code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm

@@ -12,7 +12,7 @@
 /obj/machinery/artifact
 	name = "alien artifact"
 	desc = "A large alien device."
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "ano00"
 	var/icon_num = 0
 	anchored = 0

code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm

@@ -4,7 +4,7 @@
 obj/machinery/anomaly/ion_mobility
 	name = "Ion Mobility Spectrometer"
 	desc = "A specialised, complex analysis machine."
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "analyser"
 
 obj/machinery/anomaly/ion_mobility/ScanResults()

code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm

@@ -4,7 +4,7 @@
 obj/machinery/anomaly/isotope_ratio
 	name = "Isotope ratio spectrometer"
 	desc = "A specialised, complex analysis machine."
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "analyser"
 
 obj/machinery/anomaly/isotope_ratio/ScanResults()

code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm

@@ -4,7 +4,7 @@
 /obj/machinery/artifact_analyser
 	name = "Artifact Analyser"
 	desc = "Studies the structure of artifacts to discover their uses."
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "analyser"
 	anchored = 1
 	density = 1
@@ -302,7 +302,7 @@
 /obj/machinery/analyser_pad
 	name = "artifact analysis pad"
 	desc = "Studies the structure of artifacts to discover their uses."
-	icon = 'stationobjs.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "tele0"
 	anchored = 1
 	density = 0

code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm

@@ -1,7 +1,7 @@
 
 /obj/machinery/artifact_harvester
 	name = "Exotic Particle Harvester"
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "incubator"	//incubator_on
 	anchored = 1
 	density = 1

code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm

@@ -2,7 +2,7 @@
 /obj/machinery/artifact_scanpad
 	name = "Anomaly Scanner Pad"
 	desc = "Place things here for scanning."
-	icon = 'stationobjs.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "tele0"
 	anchored = 1
 	density = 0

code/modules/research/xenoarchaeology/tools/tools.dm

@@ -5,7 +5,7 @@
 /obj/item/device/gps
 	name = "relay positioning device"
 	desc = "Triangulates the approximate co-ordinates using a nearby satellite network."
-	icon = 'device.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "locator"
 	item_state = "locator"
 	w_class = 2

code/modules/research/xenoarchaeology/tools/tools_coresampler.dm

@@ -16,7 +16,7 @@
 /obj/item/device/core_sampler
 	name = "core sampler"
 	desc = "Used to extract geological core samples."
-	icon = 'device.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "sampler0"
 	item_state = "screwdriver_brown"
 	w_class = 1.0

code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm

@@ -6,7 +6,7 @@
 /obj/item/device/depth_scanner
 	name = "depth analysis scanner"
 	desc = "Used to check spatial depth and density of rock outcroppings."
-	icon = 'pda.dmi'
+	icon = 'icons/obj/pda.dmi'
 	icon_state = "crap"
 	item_state = "analyzer"
 	w_class = 1.0

code/modules/research/xenoarchaeology/tools/tools_locater.dm

@@ -5,7 +5,7 @@
 /obj/item/device/beacon_locator
 	name = "locater device"
 	desc = "Used to scan and locate signals on a particular frequency according ."
-	icon = 'device.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "pinoff"	//pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull
 	item_state = "electronic"
 	var/frequency = 1459

data/mode.txt

@@ -1 +1 @@
-extended
+sandbox

maps/Antiqua.dmm

@@ -3594,7 +3594,7 @@
 "brH" = (/obj/machinery/camera{c_tag = "Virology Access"; dir = 1; network = "Medbay"},/obj/machinery/access_button{command = "cycle_interior"; layer = 4; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 0; pixel_y = -25; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "brI" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/virology)
 "brJ" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/chapel/main)
-"brK" = (/obj/machinery/mass_driver{id = "chapelgun"},/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; name = "Mass Driver"; req_access_txt = "22"},/turf/simulated/floor/plating,/area/chapel/main)
+"brK" = (/obj/machinery/mass_driver{id = "chapelgun"},/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Mass Driver"; req_access_txt = "22"},/turf/simulated/floor/plating,/area/chapel/main)
 "brL" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/medical/virology)
 "brM" = (/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_interior"; locked = 1; name = "Virology Access"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology)
 "brN" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/virology)
@@ -3758,28 +3758,28 @@
 "buP" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/space,/area/supply/dock)
 "buQ" = (/obj/structure/shuttle/engine/propulsion/burst/right,/turf/space,/area/supply/dock)
 "buR" = (/turf/unsimulated/wall,/area)
-"buS" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
+"buS" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area)
 "buT" = (/obj/structure/table{pixel_y = 0},/obj/item/weapon/storage/firstaid/fire{pixel_y = 6},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/regular{pixel_x = 4; pixel_y = 3},/obj/machinery/camera{c_tag = "Emergency Room Starboard"; network = "Medbay"; pixel_x = 22},/turf/simulated/floor{icon_state = "white"; dir = 8},/area)
 "buU" = (/obj/structure/plasticflaps,/turf/unsimulated/floor,/area)
 "buV" = (/obj/structure/rack,/turf/unsimulated/floor{icon_state = "grimy"},/area)
 "buW" = (/turf/unsimulated/floor{icon_state = "grimy"},/area)
 "buX" = (/obj/structure/stool/bed,/turf/unsimulated/floor{icon_state = "grimy"},/area)
-"buY" = (/obj/structure/table/reinforced,/obj/item/weapon/surgicaldrill,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
-"buZ" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
-"bva" = (/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
+"buY" = (/obj/structure/table/reinforced,/obj/item/weapon/surgicaldrill,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area)
+"buZ" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area)
+"bva" = (/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area)
 "bvb" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area)
 "bvc" = (/obj/structure/closet/crate,/obj/item/weapon/trashbag,/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bvd" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/infinite,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bve" = (/obj/structure/closet,/obj/item/weapon/storage/bible,/obj/item/weapon/storage/bible/booze,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bvf" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bvg" = (/obj/structure/table/reinforced,/obj/structure/bedsheetbin,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
-"bvh" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/tramadol,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
+"bvh" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/tramadol,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area)
 "bvi" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area)
 "bvj" = (/turf/unsimulated/floor{icon_state = "dark"},/area)
 "bvk" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "grimy"},/area)
-"bvl" = (/obj/item/weapon/book/manual/medical_cloning,/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
+"bvl" = (/obj/item/weapon/book/manual/medical_cloning,/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area)
 "bvm" = (/obj/effect/decal/cleanable/dirt,/turf/unsimulated/floor{icon_state = "dark"},/area)
-"bvn" = (/obj/structure/closet/wardrobe/medic_white,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area)
+"bvn" = (/obj/structure/closet/wardrobe/medic_white,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area)
 "bvo" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bvp" = (/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)
 "bvq" = (/obj/item/stack/tile/plasteel,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)

maps/exodus.dmm

@@ -1521,7 +1521,7 @@
 "aDm" = (/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aDn" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aDo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
-"aDp" = (/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Mass Driver"; req_access_txt = "22"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/chapel/main)
+"aDp" = (/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/door/window{dir = 8; icon = 'icons/obj/doors/windoor.dmi'; name = "Mass Driver"; req_access_txt = "22"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/chapel/main)
 "aDq" = (/turf/simulated/floor/plating,/area/chapel/main)
 "aDr" = (/obj/machinery/door/poddoor{id = "chapelgun"; name = "Chapel Launcher Door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/chapel/main)
 "aDs" = (/obj/effect/landmark{name = "Marauder Entry"},/turf/space,/area)
@@ -2741,7 +2741,7 @@
 "baK" = (/turf/simulated/floor{icon_state = "arrival"; dir = 4},/area/quartermaster/sorting)
 "baL" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor,/area/quartermaster/sorting)
 "baM" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/central)
-"baN" = (/obj/machinery/door/window{dir = 2; icon = 'windoor.dmi'; name = "Captain's Quarters"; req_access_txt = "20"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
+"baN" = (/obj/machinery/door/window{dir = 2; icon = 'icons/obj/doors/windoor.dmi'; name = "Captain's Quarters"; req_access_txt = "20"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "baO" = (/obj/item/weapon/hand_tele,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "baP" = (/obj/item/weapon/soap/deluxe,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "baQ" = (/obj/structure/table/woodentable,/obj/structure/disposalpipe/segment{dir = 1},/obj/item/weapon/megaphone,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
@@ -2907,7 +2907,7 @@
 "bdU" = (/obj/structure/cable{icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/heads/hop)
 "bdV" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/heads/hop)
 "bdW" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/crew_quarters/heads/hop)
-"bdX" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon = 'windoor.dmi'; icon_state = "right"; name = "Heads of Staff"; req_access_txt = "19"},/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; req_access_txt = "0"},/obj/structure/table/reinforced,/obj/structure/noticeboard{pixel_y = -27},/turf/simulated/floor,/area/crew_quarters/heads/hop)
+"bdX" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon = 'icons/obj/doors/windoor.dmi'; icon_state = "right"; name = "Heads of Staff"; req_access_txt = "19"},/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; req_access_txt = "0"},/obj/structure/table/reinforced,/obj/structure/noticeboard{pixel_y = -27},/turf/simulated/floor,/area/crew_quarters/heads/hop)
 "bdY" = (/turf/simulated/floor{icon_state = "delivery"},/area/hallway/primary/central)
 "bdZ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/hallway/primary/central)
 "bea" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen)
@@ -3106,7 +3106,7 @@
 "bhL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "bhM" = (/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "bhN" = (/obj/machinery/camera{c_tag = "North"; dir = 2; network = "SS13"},/obj/machinery/light{dir = 1},/obj/structure/noticeboard{pixel_y = 27},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
-"bhO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/computer/security/telescreen{desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; name = "Entertainment monitor"; pixel_y = 30},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
+"bhO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/computer/security/telescreen{desc = "Damn, they better have /tg/thechannel on these things."; icon = 'icons/obj/status_display.dmi'; icon_state = "entertainment"; name = "Entertainment monitor"; pixel_y = 30},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "bhP" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "bhQ" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "bhR" = (/obj/machinery/vending/cigarette{pixel_x = -3; pixel_y = 2},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
@@ -3995,7 +3995,7 @@
 "byQ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/quartermaster/qm)
 "byR" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/quartermaster/qm)
 "byS" = (/obj/effect/landmark/start{name = "Quartermaster"},/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/quartermaster/qm)
-"byT" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; name = "Quartermaster's desk"; req_access_txt = "41"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/quartermaster/qm)
+"byT" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Quartermaster's desk"; req_access_txt = "41"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/quartermaster/qm)
 "byU" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AIW"; location = "QM"},/turf/simulated/floor,/area/hallway/primary/aft)
 "byV" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AftH"; location = "AIW"},/obj/machinery/door/firedoor/border_only{dir = 4},/turf/simulated/floor,/area/hallway/primary/aft)
 "byW" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=HOP"; location = "AIE"},/turf/simulated/floor,/area/hallway/primary/aft)
@@ -4711,7 +4711,7 @@
 "bME" = (/obj/machinery/power/apc{dir = 1; name = "Nuke Storage APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area/security/nuke_storage)
 "bMF" = (/obj/structure/disposalpipe/segment,/obj/structure/cable,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/nuke_storage)
 "bMG" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "caution"; dir = 8},/area/hallway/primary/aft)
-"bMH" = (/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 8},/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/obj/structure/table/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/atmos)
+"bMH" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/obj/structure/table/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/atmos)
 "bMI" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor,/area/atmos)
 "bMJ" = (/turf/simulated/floor,/area/atmos)
 "bMK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/atmos)
@@ -5570,7 +5570,7 @@
 "cdf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "cdg" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall/r_wall,/area/medical/virology)
 "cdh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; frequency = 1439; icon_state = "off"; id_tag = null; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/weapon/cleaner,/obj/item/weapon/reagent_containers/syringe/antiviral,/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
-"cdi" = (/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Virology Holding Rooms"; req_access_txt = "39"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
+"cdi" = (/obj/machinery/door/window{dir = 8; icon = 'icons/obj/doors/windoor.dmi'; name = "Virology Holding Rooms"; req_access_txt = "39"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "cdj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Virology East"; dir = 8; network = "Medbay"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "cdk" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{pixel_x = 5; pixel_y = -5; charge = 100; maxcharge = 15000},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor,/area/assembly/assembly_line)
 "cdl" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 20},/obj/structure/disposalpipe/segment,/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line)
@@ -6387,7 +6387,7 @@
 "csQ" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area)
 "csR" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew10,/area)
 "csS" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew12,/area)
-"csT" = (/turf/simulated/floor/holofloor{icon = 'beach.dmi'; icon_state = "sand"; name = "Soft sand"},/area/holodeck/source_beach)
+"csT" = (/turf/simulated/floor/holofloor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "Soft sand"},/area/holodeck/source_beach)
 "csU" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "blue"},/area/holodeck/source_thunderdomecourt)
 "csV" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "blue"},/area/holodeck/source_thunderdomecourt)
 "csW" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area)
@@ -6400,7 +6400,7 @@
 "ctd" = (/turf/simulated/floor/holofloor{icon_state = "blue"},/area/holodeck/source_boxingcourt)
 "cte" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "bluecorner"},/area/holodeck/source_boxingcourt)
 "ctf" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns8,/area)
-"ctg" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach)
+"ctg" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'icons/misc/beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach)
 "cth" = (/turf/simulated/floor/holofloor{dir = 10; icon_state = "blue"},/area/holodeck/source_thunderdomecourt)
 "cti" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/melee/energy/sword/holosword/green,/turf/simulated/floor/holofloor{dir = 6; icon_state = "blue"},/area/holodeck/source_thunderdomecourt)
 "ctj" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/melee/energy/sword/holosword/green,/turf/simulated/floor/holofloor,/area/holodeck/source_thunderdomecourt)
@@ -6545,7 +6545,7 @@
 "cvS" = (/turf/unsimulated/floor,/area/start)
 "cvT" = (/obj/effect/landmark/start,/turf/unsimulated/floor,/area/start)
 "cvU" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_mothership)
-"cvV" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership)
+"cvV" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership)
 "cvW" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership)
 "cvX" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite/mothership)
 "cvY" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 1},/turf/space,/area/shuttle/syndicate_elite/mothership)
@@ -6562,24 +6562,24 @@
 "cwj" = (/mob/living/silicon/decoy{icon_state = "ai-malf"; name = "GLaDOS"},/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/syndicate_mothership/control)
 "cwk" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; freerange = 1; frequency = 1213; listening = 1; name = "Syndicate Ops Intercom"; pixel_y = 0; subspace_transmission = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "circuit"},/area/syndicate_mothership)
 "cwl" = (/turf/unsimulated/wall{icon = 'mineral_walls.dmi'; icon_state = "plasma3"},/area/alien)
-"cwm" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor5"},/area/alien)
+"cwm" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
 "cwn" = (/turf/unsimulated/wall{icon = 'mineral_walls.dmi'; icon_state = "plasma1"},/area/alien)
 "cwo" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
 "cwp" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
 "cwq" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
-"cwr" = (/obj/item/weapon/paper{info = "Some stuff is missing..."; name = "Insert alien artifacts here."},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor5"},/area/alien)
-"cws" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor5"},/area/alien)
+"cwr" = (/obj/item/weapon/paper{info = "Some stuff is missing..."; name = "Insert alien artifacts here."},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
+"cws" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
 "cwt" = (/turf/space,/area/syndicate_mothership/elite_squad)
 "cwu" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership/elite_squad)
-"cwv" = (/obj/machinery/computer/pod{id = "syndicate_elite"; name = "Hull Door Control"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
-"cww" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; freerange = 1; frequency = 1213; listening = 0; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
-"cwx" = (/obj/effect/landmark{name = "Syndicate-Commando"; tag = "Commando"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
-"cwy" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
-"cwz" = (/obj/machinery/mech_bay_recharge_port,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
-"cwA" = (/obj/mecha/combat/marauder/mauler,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership)
-"cwB" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership)
+"cwv" = (/obj/machinery/computer/pod{id = "syndicate_elite"; name = "Hull Door Control"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
+"cww" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; freerange = 1; frequency = 1213; listening = 0; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
+"cwx" = (/obj/effect/landmark{name = "Syndicate-Commando"; tag = "Commando"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
+"cwy" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
+"cwz" = (/obj/machinery/mech_bay_recharge_port,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
+"cwA" = (/obj/mecha/combat/marauder/mauler,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership)
+"cwB" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership)
 "cwC" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; name = "Space Station 13"},/area/start)
-"cwD" = (/obj/structure/closet/acloset,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor5"},/area/alien)
+"cwD" = (/obj/structure/closet/acloset,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
 "cwE" = (/turf/unsimulated/wall{icon = 'mineral_walls.dmi'; icon_state = "plasma2"},/area/alien)
 "cwF" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
 "cwG" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
@@ -6591,8 +6591,8 @@
 "cwM" = (/obj/machinery/door/airlock/external{name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "syndicate_elite"; name = "Side Hull Door"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
 "cwN" = (/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership/elite_squad)
 "cwO" = (/obj/machinery/door/airlock/external{req_access_txt = "150"},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership/elite_squad)
-"cwP" = (/obj/machinery/door/poddoor{id = "syndicate_elite_mech_room"; name = "Mech Room Door"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
-"cwQ" = (/obj/structure/stool/bed/alien,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor5"},/area/alien)
+"cwP" = (/obj/machinery/door/poddoor{id = "syndicate_elite_mech_room"; name = "Mech Room Door"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership/elite_squad)
+"cwQ" = (/obj/structure/stool/bed/alien,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area/alien)
 "cwR" = (/obj/machinery/computer/pod{id = "syndicate_elite"; name = "Hull Door Control"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
 "cwS" = (/obj/machinery/computer/syndicate_elite_shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite/mothership)
 "cwT" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite/mothership)
@@ -6603,38 +6603,38 @@
 "cwY" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_station/start)
 "cwZ" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_station/start)
 "cxa" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/syndicate_station/start)
-"cxb" = (/obj/structure/table,/obj/machinery/microwave,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxc" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxd" = (/obj/structure/table,/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxe" = (/obj/machinery/computer/syndicate_station,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxf" = (/obj/structure/table,/obj/item/weapon/pen/sleepypen,/obj/item/weapon/paper,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxg" = (/obj/machinery/telecomms/allinone{intercept = 1; nuke = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxh" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxi" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxj" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxk" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxl" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxm" = (/obj/effect/landmark{name = "Syndicate-Gear-Closet"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxb" = (/obj/structure/table,/obj/machinery/microwave,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxc" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxd" = (/obj/structure/table,/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxe" = (/obj/machinery/computer/syndicate_station,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxf" = (/obj/structure/table,/obj/item/weapon/pen/sleepypen,/obj/item/weapon/paper,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxg" = (/obj/machinery/telecomms/allinone{intercept = 1; nuke = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxh" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxi" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxj" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxk" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxl" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxm" = (/obj/effect/landmark{name = "Syndicate-Gear-Closet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxn" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/syndicate_station/start)
-"cxo" = (/obj/machinery/door/window,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxo" = (/obj/machinery/door/window,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxp" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/syndicate_station/start)
-"cxq" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxq" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxr" = (/turf/unsimulated/wall,/area/centcom)
-"cxs" = (/obj/effect/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxt" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area)
-"cxu" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom)
+"cxs" = (/obj/effect/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxt" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area)
+"cxu" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom)
 "cxv" = (/turf/unsimulated/floor{icon_state = "warnplate"; dir = 8},/area/centcom)
 "cxw" = (/turf/unsimulated/floor{name = "plating"},/area/centcom)
-"cxx" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxy" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxx" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxy" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxz" = (/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"},/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_station/start)
-"cxA" = (/obj/machinery/door/poddoor{id = "syndicate"; name = "Outer Airlock"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxA" = (/obj/machinery/door/poddoor{id = "syndicate"; name = "Outer Airlock"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxB" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/administration/centcom)
 "cxC" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/administration/centcom)
 "cxD" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/shuttle/administration/centcom)
 "cxE" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/administration/centcom)
-"cxF" = (/obj/structure/table,/obj/item/device/aicard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxG" = (/obj/structure/table,/obj/machinery/computer/pod/old/syndicate{id = "syndicate"; pixel_x = -3; pixel_y = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxF" = (/obj/structure/table,/obj/item/device/aicard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxG" = (/obj/structure/table,/obj/machinery/computer/pod/old/syndicate{id = "syndicate"; pixel_x = -3; pixel_y = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxH" = (/obj/machinery/vending/boozeomat,/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/administration/centcom)
 "cxI" = (/obj/machinery/vending/coffee,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cxJ" = (/obj/machinery/vending/cigarette,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
@@ -6643,17 +6643,17 @@
 "cxM" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/obj/item/device/multitool,/obj/item/weapon/cleaner,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cxN" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cxO" = (/turf/unsimulated/floor{name = "plating"},/area)
-"cxP" = (/obj/effect/landmark{name = "Syndicate-Gear-Closet"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxQ" = (/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cxR" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxP" = (/obj/effect/landmark{name = "Syndicate-Gear-Closet"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxQ" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxR" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxS" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cxT" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/simulated/floor/plating,/area/shuttle/administration/centcom)
 "cxU" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cxV" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/obj/machinery/cell_charger,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cxW" = (/turf/unsimulated/wall,/area/centcom/living)
-"cxX" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxX" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cxY" = (/obj/machinery/atmospherics/pipe/simple{dir = 10},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/syndicate_station/start)
-"cxZ" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cxZ" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cya" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cyb" = (/obj/structure/table/reinforced{icon_state = "reinf_tabledir"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "cyc" = (/obj/structure/table/reinforced{icon_state = "reinf_tabledir"},/obj/item/weapon/lighter/zippo,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
@@ -6688,49 +6688,49 @@
 "cyF" = (/turf/unsimulated/floor{icon_state = "warnplate"; dir = 8},/area/centcom/suppy)
 "cyG" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy)
 "cyH" = (/turf/unsimulated/floor{icon_state = "warnplate"; dir = 4},/area/centcom/suppy)
-"cyI" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy)
-"cyJ" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"cyK" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"cyL" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"cyM" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/table,/obj/item/stack/medical/bruise_pack,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"cyN" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/table,/obj/item/stack/medical/ointment,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"cyO" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cyP" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cyQ" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/infra,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cyR" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"cyS" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cyI" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy)
+"cyJ" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"cyK" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"cyL" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"cyM" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/table,/obj/item/stack/medical/bruise_pack,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"cyN" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/table,/obj/item/stack/medical/ointment,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"cyO" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cyP" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cyQ" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/infra,/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cyR" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"cyS" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "cyT" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/space,/area/shuttle/administration/centcom)
 "cyU" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/administration/centcom)
 "cyV" = (/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/structure/table,/turf/unsimulated/floor{icon_state = "redyellowfull"},/area/centcom/living)
 "cyW" = (/obj/structure/table,/obj/machinery/juicer{pixel_y = 6},/turf/unsimulated/floor{icon_state = "redyellowfull"},/area/centcom/living)
 "cyX" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{name = "plating"},/area/centcom/living)
 "cyY" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/living)
-"cyZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living)
+"cyZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living)
 "cza" = (/turf/simulated/shuttle/wall{icon_state = "swall_s6"; dir = 2},/area/supply/dock)
 "czb" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/supply/dock)
 "czc" = (/turf/simulated/shuttle/wall{icon_state = "swall_s10"; dir = 2},/area/supply/dock)
-"czd" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"cze" = (/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"czf" = (/obj/machinery/door/window/westright,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"czg" = (/obj/structure/closet/crate/internals,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czd" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"cze" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"czf" = (/obj/machinery/door/window/westright,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czg" = (/obj/structure/closet/crate/internals,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "czh" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/administration/centcom)
 "czi" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "czj" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "czk" = (/turf/unsimulated/floor{icon_state = "warnplate"; dir = 4},/area/centcom)
 "czl" = (/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/supply/dock)
 "czm" = (/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock)
-"czn" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"czo" = (/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"czp" = (/obj/structure/table,/obj/item/weapon/syndie/c4explosive/heavy,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czn" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"czo" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czp" = (/obj/structure/table,/obj/item/weapon/syndie/c4explosive/heavy,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "czq" = (/obj/machinery/shield_capacitor{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "czr" = (/obj/machinery/shield_gen/external{dir = 8; layer = 3},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "czs" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor,/area/supply/dock)
-"czt" = (/obj/structure/table,/obj/machinery/light,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
-"czu" = (/obj/item/weapon/weldingtool,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"czv" = (/obj/machinery/door/window{dir = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"czw" = (/obj/item/weapon/crowbar,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"czx" = (/obj/machinery/atmospherics/pipe/simple{dir = 10},/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"czy" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czt" = (/obj/structure/table,/obj/machinery/light,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"czu" = (/obj/item/weapon/weldingtool,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czv" = (/obj/machinery/door/window{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czw" = (/obj/item/weapon/crowbar,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czx" = (/obj/machinery/atmospherics/pipe/simple{dir = 10},/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czy" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "czz" = (/obj/machinery/dna_scannernew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom)
 "czA" = (/obj/machinery/computer/cloning,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom)
 "czB" = (/obj/machinery/clonepod,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom)
@@ -6743,16 +6743,16 @@
 "czI" = (/obj/structure/kitchenspike,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
 "czJ" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
 "czK" = (/obj/machinery/gibber,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
-"czL" = (/obj/effect/landmark{name = "Nuclear-Bomb"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"czM" = (/obj/item/clothing/head/helmet/welding,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czL" = (/obj/effect/landmark{name = "Nuclear-Bomb"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czM" = (/obj/item/clothing/head/helmet/welding,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "czN" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom)
 "czO" = (/obj/item/weapon/reagent_containers/food/condiment/saltshaker,/obj/structure/table,/turf/unsimulated/floor{icon_state = "redyellowfull"},/area/centcom/living)
 "czP" = (/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living)
 "czQ" = (/obj/structure/closet/secure_closet/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
 "czR" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
-"czS" = (/obj/structure/closet/crate/medical,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
+"czS" = (/obj/structure/closet/crate/medical,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
 "czT" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/syndicate_station/start)
-"czU" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"czU" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "czV" = (/obj/machinery/optable,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom)
 "czW" = (/obj/structure/table/reinforced,/obj/machinery/librarycomp,/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/shuttle/administration/centcom)
 "czX" = (/obj/structure/bookcase,/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/shuttle/administration/centcom)
@@ -7012,7 +7012,7 @@
 "cER" = (/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "ERTIN"; name = "ERT-Shuttle Airlock"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom)
 "cES" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/specops/centcom)
 "cET" = (/obj/machinery/door/airlock/secure/centcom{name = "General Access"; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/control)
-"cEU" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control)
+"cEU" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control)
 "cEV" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/space,/area/shuttle/specops/centcom)
 "cEW" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/turf/unsimulated/floor,/area/shuttle/specops/centcom)
 "cEX" = (/obj/machinery/computer/security/telescreen{name = "ERT Monitor"; network = "CREED"; pixel_y = 26},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom)
@@ -7064,12 +7064,12 @@
 "cFR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
 "cFS" = (/obj/structure/table/reinforced{icon_state = "reinf_tabledir"},/obj/machinery/door/window/southleft{name = "Security"; req_access_txt = ""},/obj/machinery/door/window/southleft{dir = 1; name = "Security"; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
 "cFT" = (/obj/machinery/door/poddoor{id = "CentComPort"; name = "Security Doors"},/turf/unsimulated/floor{icon_state = "green"; dir = 4},/area/centcom/control)
-"cFU" = (/obj{anchored = 1; icon = 'shuttle.dmi'; icon_state = "floor3"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{icon_state = "swall_f9"; dir = 2},/area/shuttle/escape/centcom)
+"cFU" = (/obj{anchored = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{icon_state = "swall_f9"; dir = 2},/area/shuttle/escape/centcom)
 "cFV" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cFW" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
 "cFX" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
 "cFY" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
-"cFZ" = (/obj{anchored = 1; icon = 'shuttle.dmi'; icon_state = "floor3"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area/shuttle/escape/centcom)
+"cFZ" = (/obj{anchored = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area/shuttle/escape/centcom)
 "cGa" = (/obj/structure/stool/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/control)
 "cGb" = (/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/shuttle/escape/centcom)
 "cGc" = (/obj/machinery/computer/atmos_alert,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
@@ -7077,7 +7077,7 @@
 "cGe" = (/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
 "cGf" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cGg" = (/obj/machinery/computer/security,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
-"cGh" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry)
+"cGh" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry)
 "cGi" = (/turf/unsimulated/floor{icon_state = "warnplate"; dir = 8},/area/centcom/ferry)
 "cGj" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry)
 "cGk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry)
@@ -7163,9 +7163,9 @@
 "cHM" = (/obj/structure/rack,/obj/item/toy/sword,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cHN" = (/obj/structure/rack,/obj/item/toy/gun,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cHO" = (/obj/machinery/computer/arcade,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
-"cHP" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/centcom/holding)
-"cHQ" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
-"cHR" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
+"cHP" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/centcom/holding)
+"cHQ" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
+"cHR" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
 "cHS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
 "cHT" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{icon_state = "warning"; dir = 1; heat_capacity = 1},/area/centcom/evac)
 "cHU" = (/turf/unsimulated/floor{icon_state = "warning"; dir = 1; heat_capacity = 1},/area/centcom/evac)
@@ -7173,8 +7173,8 @@
 "cHW" = (/obj/structure/table,/obj/item/clothing/head/that,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "cHX" = (/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cHY" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
-"cHZ" = (/obj/item/weapon/camera_test,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
-"cIa" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
+"cHZ" = (/obj/item/weapon/camera_test,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
+"cIa" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
 "cIb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
 "cIc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/centcom/evac)
 "cId" = (/obj/structure/stool/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
@@ -7184,7 +7184,7 @@
 "cIh" = (/obj/structure/table,/obj/item/weapon/lighter/zippo,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "cIi" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "cIj" = (/obj/structure/table,/obj/item/weapon/dice/d20,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
-"cIk" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
+"cIk" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
 "cIl" = (/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/unsimulated/wall,/area/centcom/control)
 "cIm" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
 "cIn" = (/obj/structure/rack,/obj/item/clothing/head/that,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/suit/storage/wcoat,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
@@ -7192,20 +7192,20 @@
 "cIp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
 "cIq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
 "cIr" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
-"cIs" = (/obj{anchored = 1; icon = 'shuttle.dmi'; icon_state = "floor"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{dir = 3; icon_state = "swall_f10"; layer = 2; tag = "icon-swall_f10"},/area/shuttle/escape/centcom)
+"cIs" = (/obj{anchored = 1; icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"; layer = 1; name = "floor"},/turf/simulated/shuttle/wall{dir = 3; icon_state = "swall_f10"; layer = 2; tag = "icon-swall_f10"},/area/shuttle/escape/centcom)
 "cIt" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cIu" = (/obj/structure/rack,/obj/item/weapon/storage/crayonbox,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cIv" = (/obj/machinery/vending/coffee,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
-"cIw" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding)
+"cIw" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding)
 "cIx" = (/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding)
 "cIy" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cIz" = (/obj/machinery/sleep_console{icon_state = "sleeperconsole-r"; orient = "RIGHT"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cIA" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cIB" = (/obj/structure/shuttle/window{icon_state = "3"},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
 "cIC" = (/obj/machinery/door/airlock/glass/glass_security{name = "Escape Shuttle Cell"; req_access_txt = "1"},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
-"cID" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/computer/security/telescreen{name = "Entertainment monitor"; desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; pixel_y = -30},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
+"cID" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/computer/security/telescreen{name = "Entertainment monitor"; desc = "Damn, they better have /tg/thechannel on these things."; icon = 'icons/obj/status_display.dmi'; icon_state = "entertainment"; pixel_y = -30},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cIE" = (/obj/machinery/vending/snack,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
-"cIF" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)
+"cIF" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)
 "cIG" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cIH" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
 "cII" = (/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
@@ -7213,7 +7213,7 @@
 "cIK" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cIL" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cIM" = (/obj/machinery/vending/cola,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
-"cIN" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)
+"cIN" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)
 "cIO" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon_state = "green"; dir = 9},/area/centcom/control)
 "cIP" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon_state = "green"; dir = 1},/area/centcom/control)
 "cIQ" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/machinery/light,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
@@ -7305,7 +7305,7 @@
 "cKy" = (/turf/unsimulated/floor{icon_state = "damaged4"},/area)
 "cKz" = (/turf/unsimulated/wall{icon = 'mineral_walls.dmi'; icon_state = "plasma5"},/area)
 "cKA" = (/turf/unsimulated/wall{dir = 2; icon = 'mineral_walls.dmi'; icon_state = "plasma11"},/area)
-"cKB" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor5"},/area)
+"cKB" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area)
 "cKC" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/unsimulated/floor{tag = "icon-asteroid8"; icon_state = "asteroid8"; dir = 2; heat_capacity = 1},/area/centcom/control)
 "cKD" = (/obj/structure/window/reinforced,/turf/unsimulated/floor{tag = "icon-asteroid2"; icon_state = "asteroid2"},/area/centcom/control)
 "cKE" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/unsimulated/floor{tag = "icon-asteroid4"; icon_state = "asteroid4"},/area/centcom/control)
@@ -7320,7 +7320,7 @@
 "cKN" = (/obj/structure/closet/bombcloset,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area)
 "cKO" = (/obj/structure/closet/secure_closet/ert/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area)
 "cKP" = (/obj/structure/closet/crate,/obj/item/weapon/storage/handcuff_kit,/obj/item/weapon/storage/handcuff_kit,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area)
-"cKQ" = (/obj/item/assembly/shock_kit{icon = 'assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/structure/closet/crate,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/assembly/shock_kit{icon = 'assemblies.dmi'},/obj/item/assembly/shock_kit{icon = 'assemblies.dmi'},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area)
+"cKQ" = (/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/structure/closet/crate,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area)
 "cKR" = (/turf/unsimulated/wall{icon = 'mineral_walls.dmi'; icon_state = "iron1"},/area)
 "cKS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "floor"},/area)
 "cKT" = (/obj/structure/closet/crate,/obj/item/device/analyzer,/obj/item/clothing/ears/earmuffs,/turf/unsimulated/floor{icon_state = "floor"},/area)
@@ -7353,7 +7353,7 @@
 "cLu" = (/turf/unsimulated/floor{icon_state = "damaged1"},/area)
 "cLv" = (/obj/effect/gibspawner/human,/turf/unsimulated/floor{icon_state = "floor"},/area)
 "cLw" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/unsimulated/floor{icon_state = "floor"},/area)
-"cLx" = (/obj/machinery/door/airlock/secure/centcom{name = "Secondary Control Room"; req_access_txt = "108"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor5"},/area)
+"cLx" = (/obj/machinery/door/airlock/secure/centcom{name = "Secondary Control Room"; req_access_txt = "108"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor5"},/area)
 "cLy" = (/obj/structure/table,/turf/unsimulated/floor{tag = "icon-asteroidfloor"; icon_state = "asteroidfloor"},/area/centcom/control)
 "cLz" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{tag = "icon-asteroidfloor"; icon_state = "asteroidfloor"},/area/centcom/control)
 "cLA" = (/turf/unsimulated/floor{tag = "icon-asteroidfloor"; icon_state = "asteroidfloor"},/area/centcom/control)
@@ -7662,8 +7662,8 @@
 "cRr" = (/obj/structure/bookcase{category = "Adult"; name = "bookcase (Adult)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station)
 "cRs" = (/turf/unsimulated/floor{dir = 9; icon_state = "carpetside"},/area/wizard_station)
 "cRt" = (/obj/structure/stool,/turf/unsimulated/floor{dir = 1; icon_state = "carpetside"},/area/wizard_station)
-"cRu" = (/turf/unsimulated/wall{icon = 'walls.dmi'; icon_state = "rock"; name = "grass"},/area/planet/clown)
-"cRv" = (/turf/unsimulated/wall{icon = 'floors.dmi'; icon_state = "grass3"; name = "grass"},/area/planet/clown)
+"cRu" = (/turf/unsimulated/wall{icon = 'icons/turf/walls.dmi'; icon_state = "rock"; name = "grass"},/area/planet/clown)
+"cRv" = (/turf/unsimulated/wall{icon = 'icons/turf/floors.dmi'; icon_state = "grass3"; name = "grass"},/area/planet/clown)
 "cRw" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{dir = 8; icon_state = "carpetside"},/area/wizard_station)
 "cRx" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/wizard_station)
 "cRy" = (/obj/effect/showcase,/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station)
@@ -7719,70 +7719,70 @@
 "cSw" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/derelict/ship)
 "cSx" = (/turf/simulated/shuttle/wall{icon_state = "swall14"; dir = 2},/area/derelict/ship)
 "cSy" = (/turf/simulated/shuttle/wall{icon_state = "swall_s10"; dir = 2},/area/derelict/ship)
-"cSz" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f9"; dir = 2},/area/derelict/ship)
-"cSA" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cSB" = (/obj/machinery/sleeper,/obj/machinery/light{dir = 1},/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cSC" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cSD" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area/derelict/ship)
+"cSz" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f9"; dir = 2},/area/derelict/ship)
+"cSA" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSB" = (/obj/machinery/sleeper,/obj/machinery/light{dir = 1},/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSC" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSD" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area/derelict/ship)
 "cSE" = (/turf/simulated/shuttle/wall{icon_state = "swall13"; dir = 2},/area/derelict/ship)
 "cSF" = (/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 8},/turf/space,/area/derelict/ship)
 "cSG" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area/derelict/ship)
-"cSH" = (/obj/machinery/computer/med_data,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cSI" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSH" = (/obj/machinery/computer/med_data,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSI" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cSJ" = (/turf/simulated/shuttle/wall{icon_state = "swall15"; dir = 2},/area/derelict/ship)
 "cSK" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "swall_f9"; dir = 2},/area/derelict/ship)
 "cSL" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cSM" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 8},/turf/space,/area/derelict/ship)
-"cSN" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f10"; dir = 2},/area/derelict/ship)
-"cSO" = (/obj/item/weapon/scalpel,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSN" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f10"; dir = 2},/area/derelict/ship)
+"cSO" = (/obj/item/weapon/scalpel,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cSP" = (/turf/simulated/shuttle/wall{icon_state = "swall7"; dir = 2},/area/derelict/ship)
 "cSQ" = (/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
-"cSR" = (/obj/structure/computerframe{anchored = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSR" = (/obj/structure/computerframe{anchored = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cSS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cST" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cSU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cSV" = (/obj/machinery/door/airlock/glass{name = "Hibernation Pods"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship)
-"cSW" = (/obj/structure/stool/bed/chair{dir = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cSX" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSW" = (/obj/structure/stool/bed/chair{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSX" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cSY" = (/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/derelict/ship)
-"cSZ" = (/obj/item/device/multitool,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTa" = (/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cSZ" = (/obj/item/device/multitool,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTa" = (/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cTb" = (/obj/machinery/door/unpowered/shuttle,/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cTc" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "swall_f6"; dir = 2},/area/derelict/ship)
 "cTd" = (/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"; dir = 8},/turf/space,/area/derelict/ship)
 "cTe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
-"cTf" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f6"; dir = 2},/area/derelict/ship)
-"cTg" = (/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTh" = (/obj/machinery/light_switch{pixel_x = 27},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTi" = (/obj/machinery/portable_atmospherics/scrubber,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTf" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f6"; dir = 2},/area/derelict/ship)
+"cTg" = (/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTh" = (/obj/machinery/light_switch{pixel_x = 27},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTi" = (/obj/machinery/portable_atmospherics/scrubber,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cTj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
-"cTk" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTl" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTm" = (/obj/machinery/door/window,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTn" = (/obj/machinery/light{dir = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTo" = (/obj/structure/table,/obj/item/weapon/gun/energy/laser/retro,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTk" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTl" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTm" = (/obj/machinery/door/window,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTn" = (/obj/machinery/light{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTo" = (/obj/structure/table,/obj/item/weapon/gun/energy/laser/retro,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cTp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
-"cTq" = (/obj/machinery/light/small{dir = 8},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTr" = (/obj/structure/table,/obj/item/weapon/tank/oxygen,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTq" = (/obj/machinery/light/small{dir = 8},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTr" = (/obj/structure/table,/obj/item/weapon/tank/oxygen,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cTs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cTt" = (/turf/simulated/shuttle/wall{icon_state = "swall_s6"; dir = 2},/area)
 "cTu" = (/turf/simulated/shuttle/wall{icon_state = "swall14"; dir = 2},/area)
 "cTv" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area)
 "cTw" = (/turf/simulated/shuttle/wall{icon_state = "swall_s10"; dir = 2},/area)
-"cTx" = (/obj/structure/table,/obj/item/device/analyzer,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTy" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTz" = (/obj/machinery/light/small{dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTx" = (/obj/structure/table,/obj/item/device/analyzer,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTy" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTz" = (/obj/machinery/light/small{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cTA" = (/obj/machinery/door/airlock/glass{name = "Living Module"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship)
-"cTB" = (/obj/machinery/door/unpowered/shuttle,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTB" = (/obj/machinery/door/unpowered/shuttle,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cTC" = (/turf/simulated/shuttle/wall{icon_state = "swall7"; dir = 2},/area)
 "cTD" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f9"; dir = 2},/area)
 "cTE" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
 "cTF" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area)
 "cTG" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area)
-"cTH" = (/obj/machinery/door/window/northright,/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTI" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTJ" = (/obj/machinery/light,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTK" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTH" = (/obj/machinery/door/window/northright,/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTI" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTJ" = (/obj/machinery/light,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTK" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cTL" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area)
 "cTM" = (/turf/simulated/shuttle/wall{icon_state = "swall_s9"; dir = 2},/area/derelict/ship)
 "cTN" = (/turf/simulated/shuttle/wall{icon_state = "swall_s5"; dir = 2},/area/derelict/ship)
@@ -7793,26 +7793,26 @@
 "cTS" = (/turf/simulated/shuttle/wall{icon_state = "swall_s5"; dir = 2},/area)
 "cTT" = (/turf/simulated/shuttle/wall{icon_state = "swall13"; dir = 2},/area)
 "cTU" = (/turf/simulated/shuttle/wall{icon_state = "swall_s9"; dir = 2},/area)
-"cTV" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTW" = (/obj/item/weapon/shard,/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTX" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTY" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cTZ" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/obj/item/weapon/cable_coil/cut,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUa" = (/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUb" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/item/clothing/mask/breath,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUc" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/syndicate,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUd" = (/obj/machinery/power/apc{cell_type = 5000; dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTV" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTW" = (/obj/item/weapon/shard,/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTX" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTY" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cTZ" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/obj/item/weapon/cable_coil/cut,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUa" = (/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUb" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/item/clothing/mask/breath,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUc" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/syndicate,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUd" = (/obj/machinery/power/apc{cell_type = 5000; dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cUe" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area/derelict/ship)
 "cUf" = (/obj/machinery/door/poddoor{id = "oldship_gun"; name = "Pod Bay Door"},/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cUg" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "oldship_gun"},/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
 "cUh" = (/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{name = "plating"},/area/derelict/ship)
-"cUi" = (/obj/machinery/door/airlock/glass{name = "Pod Bay"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUj" = (/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUi" = (/obj/machinery/door/airlock/glass{name = "Pod Bay"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUj" = (/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cUk" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "swall_f10"; dir = 2},/area/derelict/ship)
-"cUl" = (/obj/machinery/computer/pod{id = "oldship_gun"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUm" = (/obj/machinery/light/small,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUn" = (/obj/structure/table,/obj/item/weapon/screwdriver,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
-"cUo" = (/obj/structure/table,/obj/item/device/radio,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUl" = (/obj/machinery/computer/pod{id = "oldship_gun"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUm" = (/obj/machinery/light/small,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUn" = (/obj/structure/table,/obj/item/weapon/screwdriver,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
+"cUo" = (/obj/structure/table,/obj/item/device/radio,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/derelict/ship)
 "cUp" = (/obj/machinery/power/solar{name = "Communications Satellite solar panel"},/turf/simulated/floor{icon_state = "solarpanel"},/area)
 "cUq" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area)
 "cUr" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area)
@@ -8428,7 +8428,7 @@
 "dgd" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dge" = (/obj/machinery/door/window,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/derelict/bridge/access)
 "dgf" = (/turf/simulated/wall/r_wall,/area/derelict/bridge)
-"dgg" = (/obj/machinery/door/window{dir = 2; icon = 'windoor.dmi'; name = "Captain's Quarters"; req_access_txt = "20"},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/bridge)
+"dgg" = (/obj/machinery/door/window{dir = 2; icon = 'icons/obj/doors/windoor.dmi'; name = "Captain's Quarters"; req_access_txt = "20"},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/bridge)
 "dgh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dgi" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine)
 "dgj" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -8534,7 +8534,7 @@
 "dif" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/medical)
 "dig" = (/obj/machinery/door/airlock/external{name = "External Engineering"},/turf/simulated/floor/plating/airless,/area)
 "dih" = (/turf/simulated/floor/airless{icon_state = "damaged4"},/area/derelict/hallway/primary)
-"dii" = (/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 8},/turf/simulated/floor,/area/derelict/arrival)
+"dii" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/turf/simulated/floor,/area/derelict/arrival)
 "dij" = (/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "dik" = (/obj/item/weapon/firstaid_arm_assembly,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical)
 "dil" = (/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/medical)
@@ -8606,8 +8606,8 @@
 "djz" = (/obj/item/weapon/pen,/turf/simulated/floor,/area/derelict/arrival)
 "djA" = (/obj/machinery/door/poddoor{id = "derelict_gun"; name = "Derelict Mass Driver"},/turf/simulated/floor/plating,/area/derelict/medical/chapel)
 "djB" = (/turf/simulated/floor/plating,/area/derelict/medical/chapel)
-"djC" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "derelict_gun"},/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 4; req_access_txt = "25"},/obj/structure/closet/coffin,/turf/simulated/floor/plating,/area/derelict/medical/chapel)
-"djD" = (/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 8},/turf/simulated/floor/airless,/area/derelict/medical/chapel)
+"djC" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "derelict_gun"},/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 4; req_access_txt = "25"},/obj/structure/closet/coffin,/turf/simulated/floor/plating,/area/derelict/medical/chapel)
+"djD" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/turf/simulated/floor/airless,/area/derelict/medical/chapel)
 "djE" = (/turf/simulated/floor/airless,/area/derelict/medical/chapel)
 "djF" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless,/area/derelict/medical/chapel)
 "djG" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Worn-out APC"; pixel_x = 24; pixel_y = 0},/turf/simulated/floor/airless,/area/derelict/medical/chapel)

maps/reactor.dmm

@@ -12,7 +12,7 @@
 "l" = (/obj/structure/cable/heavyduty{tag = "icon-4-8"; icon_state = "4-8"},/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 1; icon_state = "intact_on"; name = "Gas filter (O2 tank)"; on = 1; pressure_resistance = 4500},/turf/simulated/floor,/area)
 "m" = (/obj/machinery/power/generator_type2{dir = 8},/obj/structure/cable/heavyduty{tag = "icon-0-8"; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/supply/visible{tag = "icon-intact-b (WEST)"; icon_state = "intact-b"; dir = 8},/turf/simulated/floor,/area)
 "n" = (/obj/machinery/atmospherics/pipe/manifold/supply/visible{icon_state = "manifold-b"; dir = 4},/turf/simulated/floor,/area)
-"o" = (/obj/machinery/atmospherics/pipe/tank{icon = 'orange_pipe_tank.dmi'},/turf/simulated/floor,/area)
+"o" = (/obj/machinery/atmospherics/pipe/tank{icon = 'icons/obj/atmospherics/orange_pipe_tank.dmi'},/turf/simulated/floor,/area)
 "p" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor,/area)
 "q" = (/obj/structure/cable/heavyduty,/obj/machinery/power/terminal{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/visible,/turf/simulated/floor,/area)
 "r" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; icon_state = "intact_on"; name = "Gas filter (Toxins tank)"; on = 1; pressure_resistance = 4500},/turf/simulated/floor,/area)

maps/tgstation.2.1.0.0.1.dmm

@@ -10202,7 +10202,7 @@
 "dOl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/vox,/area/vox_trading_post/hallway)
 "dOm" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area/mine/west_outpost)
 "dOn" = (/obj/machinery/light/small{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor,/area/mine/living_quarters)
-
+
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

tools/expand_filedir_paths.py

@@ -18,76 +18,73 @@ source_pattern = re.compile(r"^.*?\.(dm|dmm)$")
 
 # Open the .dme file and return a list of all FILE_DIR paths in it
 def read_filedirs(filename):
-    result = []
-    dme_file = file(filename, "rt")
-    
-    # Read each line from the file and check for regex pattern match
-    for row in dme_file:
-        match = filedir_pattern.match(row)
-        if match:
-            result.append(match.group(1))
-
-    dme_file.close()
-    return result
+	result = []
+	with open(filename, "rt") as dme_file:
+		# Read each line from the file and check for regex pattern match
+		for row in dme_file:
+			match = filedir_pattern.match(row)
+			if match:
+				result.append(match.group(1))
+	return result
 
 # Search through a list of directories, and build a dictionary which
 # maps every file to its full pathname (relative to the .dme file)
 # If the same filename appears in more than one directory, the earlier
 # directory in the list takes preference.
 def index_files(file_dirs):
-    result = {}
+	result = {}
 
-    # Reverse the directory list so the earlier directories take precedence
-    # by replacing the previously indexed file of the same name
-    for directory in reversed(file_dirs):
-        for name in os.listdir(directory):
-            # Replace backslash path separators on Windows with forward slash
-            # Force "name" to lowercase when used as a key since BYOND resource
-            # names are case insensitive, even on Linux.
-            if name.find(".") == -1:
-                continue
-            result[name.lower()] = directory.replace('\\', '/') + '/' + name
+	# Reverse the directory list so the earlier directories take precedence
+	# by replacing the previously indexed file of the same name
+	for directory in reversed(file_dirs):
+		for name in os.listdir(directory):
+			# Replace backslash path separators on Windows with forward slash
+			# Force "name" to lowercase when used as a key since BYOND resource
+			# names are case insensitive, even on Linux.
+			if name.find(".") == -1:
+				continue
+			result[name.lower()] = directory.replace('\\', '/') + '/' + name
 
-    return result
+	return result
 
 # Recursively search for every .dm/.dmm file in the .dme file directory. For
 # each file, search it for any resource names in single quotes, and replace
 # them with the full path previously found by index_files()
 def rewrite_sources(resources):
-    # Create a closure for the regex replacement function to capture the
-    # resources dictionary which can't be passed directly to this function
-    def replace_func(name):
-        key = name.group(1).lower()
-        if key in resources:
-            replacement = resources[key]
-        else:
-            replacement = name.group(1)
-        return "'" + replacement + "'"
-    
-    # Search recursively for all .dm and .dmm files
-    for (dirpath, dirs, files) in os.walk("."):
-        for name in files:
-            if source_pattern.match(name):
-                path = dirpath + '/' + name
-                source_file = file(path, "rt")
-                output_file = file(path + ".tmp", "wt")
+	# Create a closure for the regex replacement function to capture the
+	# resources dictionary which can't be passed directly to this function
+	def replace_func(name):
+		key = name.group(1).lower()
+		if key in resources:
+			replacement = resources[key]
+		else:
+			replacement = name.group(1)
+		return "'" + replacement + "'"
+	
+	# Search recursively for all .dm and .dmm files
+	for (dirpath, dirs, files) in os.walk("."):
+		for name in files:
+			if source_pattern.match(name):
+				path = dirpath + '/' + name
+				source_file = open(path, "rt")
+				output_file = open(path + ".tmp", "wt")
 
-                # Read file one line at a time and perform replacement of all
-                # single quoted resource names with the fullpath to that resource
-                # file. Write the updated text back out to a temporary file.
-                for row in source_file:
-                    row = rename_pattern.sub(replace_func, row)
-                    output_file.write(row)
+				# Read file one line at a time and perform replacement of all
+				# single quoted resource names with the fullpath to that resource
+				# file. Write the updated text back out to a temporary file.
+				for row in source_file:
+					row = rename_pattern.sub(replace_func, row)
+					output_file.write(row)
 
-                output_file.close()
-                source_file.close()
+				output_file.close()
+				source_file.close()
 
-                # Delete original source file and replace with the temporary
-                # output. On Windows, an atomic rename() operation is not
-                # possible like it is under POSIX.
-                os.remove(path)
-                os.rename(path + ".tmp", path)
+				# Delete original source file and replace with the temporary
+				# output. On Windows, an atomic rename() operation is not
+				# possible like it is under POSIX.
+				os.remove(path)
+				os.rename(path + ".tmp", path)
 
-dirs = read_filedirs("tgstation.dme");
+dirs = read_filedirs("baystation12.dme");
 resources = index_files(dirs)
 rewrite_sources(resources)