Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

Conflicts: baystation12.dme code/modules/projectiles/ammunition/bullets.dm
2026-02-03 12:50:36 +00:00 · 2013-09-02 23:32:33 +01:00
parent 33e17c6925 4cb945d921
commit 3b61ba850f
146 changed files with 287 additions and 334 deletions
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -354,13 +354,13 @@ var/list/admin_verbs_mod = list(
 			mob.invisibility = initial(mob.invisibility)
 			mob << "\red <b>Invisimin off. Invisibility reset.</b>"
 			mob.icon_state = "ghost"
-			mob.icon = 'human.dmi'
+			mob.icon = 'icons/mob/human.dmi'
 			mob.update_icons()
 		else
 			mob.invisibility = INVISIBILITY_OBSERVER
 			mob << "\blue <b>Invisimin on. You are now as invisible as a ghost.</b>"
 			mob.icon_state = "ghost"
-			mob.icon = 'mob.dmi'
+			mob.icon = 'icons/mob/mob.dmi'


 /client/proc/player_panel()
--- a/code/modules/admin/permissionverbs/permissionedit.dm
+++ b/code/modules/admin/permissionverbs/permissionedit.dm
@@ -12,8 +12,8 @@
 <html>
 <head>
 <title>Permissions Panel</title>
-<script type='text/javascript' src='search.js'></script>
-<link rel='stylesheet' type='text/css' href='panels.css'>
+<script type='text/javascript' src='html/search.js'></script>
+<link rel='stylesheet' type='text/css' href='html/panels.css'>
 </head>
 <body onload='selectTextField();updateSearch();'>
 <div id='main'><table id='searchable' cellspacing='0'>
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -62,7 +62,7 @@ client/proc/space_asshole()
 	for(var/mob/M in world)
 		if(M.client)
 			if(M.client.midis)
-				M << 'space_asshole.ogg'
+				M << 'sound/music/space_asshole.ogg'


 client/proc/honk_theme()
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -483,7 +483,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		if("No")
 			world << "\red New NanoTrasen Update available at all communication consoles."

-	world << sound('commandreport.ogg')
+	world << sound('sound/AI/commandreport.ogg')
 	log_admin("[key_name(src)] has created a command report: [input]")
 	message_admins("[key_name_admin(src)] has created a command report", 1)
 	feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -1,7 +1,7 @@

 /obj/item/clothing/glasses
 	name = "glasses"
-	icon = 'glasses.dmi'
+	icon = 'icons/obj/clothing/glasses.dmi'
 	//w_class = 2.0
 	//flags = GLASSESCOVERSEYES
 	//slot_flags = SLOT_EYES
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -616,7 +616,7 @@
 /obj/item/clothing/suit/fluff/oldscarf //Writerer2: Javaria Zara
 	name = "old scarf"
 	desc = "An old looking scarf, it seems to be fairly worn."
-	icon = 'clothing/suits.dmi'
+	icon = 'icons/obj/clothing/suits.dmi'
 	icon_state = "mantle-unathi"
 	item_state = "mantle-unathi"
 	body_parts_covered = UPPER_TORSO
--- a/code/modules/ext_scripts/github.dm
+++ b/code/modules/ext_scripts/github.dm
--- a/generation/Icon_color_animation.dm
+++ b/generation/Icon_color_animation.dm
@@ -83,7 +83,7 @@
 //----------------------------------------

 /proc/generate_color_animation(icon/icon, list/colors, list/frames)
-	var/icon/out = icon('uristrunes.dmi', "")
+	var/icon/out = icon('icons/effects/uristrunes.dmi', "")
 	var/frame_num = 1

 	for(var/frame in frames)
--- a/generation/Uristrunes.dm
+++ b/generation/Uristrunes.dm
@@ -9,7 +9,7 @@
 //----------------------------------------

 /proc/create_border_image(icon/input, border_color = "#000000", fill_color = "#000000", border_alpha = 255, fill_alpha = 255)
-	var/icon/I = icon('uristrunes.dmi', "blank")
+	var/icon/I = icon('icons/effects/uristrunes.dmi', "blank")
 	I.Blend(input, ICON_OVERLAY)

 	//Discard the image
@@ -176,11 +176,11 @@ var/list/rune_animation = list(
 	if(lookup in rune_cache)
 		return rune_cache[lookup]

-	var/icon/base = icon('uristrunes.dmi', "")
+	var/icon/base = icon('icons/effects/uristrunes.dmi', "")

 	for(var/i = 0, i < 10, i++)
 		if(rune_bits & (1 << i))
-			base.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY)
+			base.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY)

 	var/icon/result

@@ -214,23 +214,23 @@ var/list/rune_animation = list(

 /*
 /mob/verb/create_rune_custom(rune as num, color1 as color, border1 as color, color2 as color, border2 as color, alpha1 as num, alpha2 as num)
-	var/icon/I = icon('uristrunes.dmi', "blank")
+	var/icon/I = icon('icons/effects/uristrunes.dmi', "blank")

 	for(var/i = 0, i < 10, i++)
 		if(rune & (1 << i))
-			I.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY)
+			I.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY)

 	var/obj/o = new(locate(x, y, z))
 	o.icon = animate_rune(I, color1, border1, color2, border2, alpha1, alpha2)

 /mob/verb/spam()
 	for(var/turf/t in range(4))
-		var/icon/I = icon('uristrunes.dmi', "blank")
+		var/icon/I = icon('icons/effects/uristrunes.dmi', "blank")

 		var/rune = rand(1, 1023)
 		for(var/i = 0, i < 10, i++)
 			if(rune & (1 << i))
-				I.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY)
+				I.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY)

 		var/obj/o = new(t)
 		o.icon = animate_rune_full(I, rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255),
--- a/code/modules/mob/living/carbon/alien/special/snakeman.dm
+++ b/code/modules/mob/living/carbon/alien/special/snakeman.dm
@@ -43,7 +43,7 @@

 /obj/effect/snake_egg
 	name = "Egg"
-	icon = 'alien.dmi'
+	icon = 'icons/mob/alien.dmi'
 	icon_state = "egg"
 	density = 1
 	anchored = 1
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -164,7 +164,7 @@ var/global/list/damage_icon_parts = list()
 proc/get_damage_icon_part(damage_state, body_part)
 	if(damage_icon_parts["[damage_state]/[body_part]"] == null)
 		var/icon/DI = new /icon('icons/mob/dam_human.dmi', damage_state)			// the damage icon for whole human
-		DI.Blend(new /icon('dam_mask.dmi', body_part), ICON_MULTIPLY)		// mask with this organ's pixels
+		DI.Blend(new /icon('icons/mob/dam_mask.dmi', body_part), ICON_MULTIPLY)		// mask with this organ's pixels
 		damage_icon_parts["[damage_state]/[body_part]"] = DI
 		return DI
 	else
@@ -187,8 +187,8 @@ proc/get_damage_icon_part(damage_state, body_part)

 	previous_damage_appearance = damage_appearance

-	var/icon/standing = new /icon('dam_human.dmi', "00")
-	var/icon/lying = new /icon('dam_human.dmi', "00-2")
+	var/icon/standing = new /icon('icons/mob/dam_human.dmi', "00")
+	var/icon/lying = new /icon('icons/mob/dam_human.dmi', "00-2")

 	var/image/standing_image = new /image("icon" = standing)
 	var/image/lying_image = new /image("icon" = lying)
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -124,11 +124,11 @@

 /obj/item/broken_device
 	name = "broken component"
-	icon = 'robot_component.dmi'
+	icon = 'icons/robot_component.dmi'
 	icon_state = "broken"

 /obj/item/robot_parts/robot_component
-	icon = 'robot_component.dmi'
+	icon = 'icons/robot_component.dmi'
 	icon_state = "working"
 	construction_time = 200
 	construction_cost = list("metal"=5000)
@@ -214,4 +214,4 @@
 	if(H.emagged && prob(5))
 		user.show_message("\red \t ERROR: INTERNAL SYSTEMS COMPROMISED",1)
 	src.add_fingerprint(user)
-	return
+	return
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -191,7 +191,7 @@
 			if (istype(module,/obj/item/weapon/robot_module/security))
 				message = "<B>[src]</B> shows its legal authorization barcode."

-				playsound(src.loc, 'biamthelaw.ogg', 50, 0)
+				playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0)
 				m_type = 2
 			else
 				src << "You are not THE LAW, pal."
--- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm
+++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm
@@ -4,7 +4,7 @@
 /obj/item/borg/upgrade/
 	name = "A borg upgrade module."
 	desc = "Protected by FRM."
-	icon = 'module.dmi'
+	icon = 'icons/obj/module.dmi'
 	icon_state = "cyborg_upgrade"
 	var/construction_time = 120
 	var/construction_cost = list("metal"=10000)
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -472,4 +472,4 @@
 			spawn(0)
 				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 					dir = i
-					sleep(1)
+					sleep(1)
--- a/code/modules/mob/living/simple_animal/kobold.dm
+++ b/code/modules/mob/living/simple_animal/kobold.dm
@@ -2,7 +2,7 @@
 /mob/living/simple_animal/kobold
 	name = "kobold"
 	desc = "A small, rat-like creature."
-	icon = 'mob.dmi'
+	icon = 'icons/mob/mob.dmi'
 	icon_state = "kobold_idle"
 	icon_living = "kobold_idle"
 	icon_dead = "kobold_dead"
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -77,7 +77,7 @@

 /obj/screen/gun
 	name = "gun"
-	icon = 'screen1.dmi'
+	icon = 'icons/mob/screen1.dmi'
 	master = null
 	dir = 2

--- a/code/modules/power/antimatter/computer.dm
+++ b/code/modules/power/antimatter/computer.dm
@@ -6,7 +6,7 @@

 /obj/machinery/computer/am_engine
 	name = "Antimatter Engine Console"
-	icon = 'stationobjs.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "comm_computer"
 	req_access = list(ACCESS_ENGINE)
 	var/engine_id = 0
--- a/code/modules/power/antimatter/engine.dm
+++ b/code/modules/power/antimatter/engine.dm
@@ -1,5 +1,5 @@
 /obj/machinery/power/am_engine
-	icon = 'AM_Engine.dmi'
+	icon = 'icons/am_engine.dmi'
 	density = 1
 	anchored = 1.0
 	flags = ON_BORDER
--- a/code/modules/power/antimatter/fuel.dm
+++ b/code/modules/power/antimatter/fuel.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/fuel
 	name = "Magnetic Storage Ring"
 	desc = "A magnetic storage ring."
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "rcdammo"
 	opacity = 0
 	density = 0
--- a/code/modules/power/pacman2.dm
+++ b/code/modules/power/pacman2.dm
@@ -92,7 +92,7 @@
 		else if(!active)
 			if(istype(O, /obj/item/weapon/wrench))
 				anchored = !anchored
-				playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 				if(anchored)
 					user << "\blue You secure the generator to the floor."
 				else
@@ -100,7 +100,7 @@
 				makepowernets()
 			else if(istype(O, /obj/item/weapon/screwdriver))
 				open = !open
-				playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				if(open)
 					user << "\blue You open the access panel."
 				else
--- a/code/modules/projectiles/guns/energy.dm
+++ b/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]"
--- a/code/modules/projectiles/targeting.dm
+++ b/code/modules/projectiles/targeting.dm
@@ -157,7 +157,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory.
 	else
 		return
 	for(var/mob/living/K in viewers(usr))
-		K << 'TargetOn.ogg'
+		K << 'sound/weapons/TargetOn.ogg'

 	if(!targeted_by) targeted_by = list()
 	targeted_by += I
@@ -214,7 +214,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory.
 mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I)
 	if(!I.silenced)
 		for(var/mob/living/M in viewers(src))
-			M << 'TargetOff.ogg'
+			M << 'sound/weapons/TargetOff.ogg'
 	targeted_by -= I
 	I.target.Remove(src) //De-target them
 	if(!I.target.len)
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -405,9 +405,9 @@
 		spawn()
 			has_sprites += user.client
 			for(var/i = 1 to MAX_PILL_SPRITE)
-				usr << browse_rsc(icon('chemical.dmi', "pill" + num2text(i)), "pill[i].png")
+				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>"
--- a/code/modules/research/research_shuttle.dm
+++ b/code/modules/research/research_shuttle.dm
@@ -62,7 +62,7 @@ proc/move_research_shuttle()

 /obj/machinery/computer/research_shuttle
 	name = "Research Shuttle Console"
-	icon = 'computer.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
 	req_access = list(access_research)
 	circuit = "/obj/item/weapon/circuitboard/research_shuttle"
@@ -105,7 +105,7 @@ proc/move_research_shuttle()
 		usr << "You fried the consoles ID checking system. It's now available to everyone!"

 	else if(istype(W, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 			var/obj/item/weapon/circuitboard/research_shuttle/M = new /obj/item/weapon/circuitboard/research_shuttle( A )
--- a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm
@@ -1,7 +1,7 @@

 /obj/structure/crystal
 	name = "large crystal"
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "crystal"
 	density = 1

--- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
@@ -2,7 +2,7 @@
 /obj/machinery/replicator
 	name = "alien machine"
 	desc = "It's some kind of pod with strange wires and gadgets all over it."
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "borgcharger0(old)"
 	density = 1

--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
@@ -60,7 +60,7 @@ var/list/valid_secondary_effect_types = list(\
 /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
 	density = 1
--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm
+++ b/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
--- a/code/modules/research/xenoarchaeology/finds/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds.dm
@@ -26,7 +26,7 @@
 /obj/item/weapon/ore/strangerock
 	name = "Strange rock"
 	desc = "Seems to have some unusal strata evident throughout it."
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "strange"
 	var/obj/item/weapon/inside
 	var/method = 0// 0 = fire, 1 = brush, 2 = pick
@@ -80,7 +80,7 @@

 /obj/item/weapon/archaeological_find
 	name = "object"
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "ano01"
 	var/find_type = 0

@@ -114,7 +114,7 @@
 		if(1)
 			item_type = "bowl"
 			new_item = new /obj/item/weapon/reagent_containers/glass(src.loc)
-			new_item.icon = 'xenoarchaeology.dmi'
+			new_item.icon = 'icons/obj/xenoarchaeology.dmi'
 			new_item.icon_state = "bowl"
 			apply_image_decorations = 1
 			if(prob(20))
@@ -122,7 +122,7 @@
 		if(2)
 			item_type = "urn"
 			new_item = new /obj/item/weapon/reagent_containers/glass(src.loc)
-			new_item.icon = 'xenoarchaeology.dmi'
+			new_item.icon = 'icons/obj/xenoarchaeology.dmi'
 			new_item.icon_state = "urn"
 			apply_image_decorations = 1
 			if(prob(20))
@@ -192,7 +192,7 @@
 		if(11)
 			item_type = "box"
 			new_item = new /obj/item/weapon/storage/box(src.loc)
-			new_item.icon = 'xenoarchaeology.dmi'
+			new_item.icon = 'icons/obj/xenoarchaeology.dmi'
 			new_item.icon_state = "box"
 			if(prob(30))
 				apply_image_decorations = 1
@@ -271,7 +271,7 @@
 			new_item = new /obj/item/device/radio/beacon(src.loc)
 			talkative = 0
 			new_item.icon_state = "unknown[rand(1,4)]"
-			new_item.icon = 'xenoarchaeology.dmi'
+			new_item.icon = 'icons/obj/xenoarchaeology.dmi'
 			new_item.desc = ""
 		if(19)
 			apply_prefix = 0
@@ -351,7 +351,7 @@
 			var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc)
 			new_item = new_gun
 			new_item.icon_state = "gun[rand(1,4)]"
-			new_item.icon = 'xenoarchaeology.dmi'
+			new_item.icon = 'icons/obj/xenoarchaeology.dmi'

 			//33% chance to be able to reload the gun with human ammunition
 			if(prob(66))
@@ -420,7 +420,7 @@
 			//humanoid remains
 			apply_prefix = 0
 			item_type = "humanoid [pick("remains","skeleton")]"
-			icon = 'blood.dmi'
+			icon = 'icons/effects/blood.dmi'
 			icon_state = "remains"
 			additional_desc = pick("They appear almost human.",\
 			"They are contorted in a most gruesome way.",\
@@ -435,7 +435,7 @@
 			//robot remains
 			apply_prefix = 0
 			item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]"
-			icon = 'blood.dmi'
+			icon = 'icons/effects/blood.dmi'
 			icon_state = "remainsrobot"
 			additional_desc = pick("Almost mistakeable for the remains of a modern cyborg.",\
 			"They are barely recognisable as anything other than a pile of waste metals.",\
@@ -450,7 +450,7 @@
 			//xenos remains
 			apply_prefix = 0
 			item_type = "alien [pick("remains","skeleton")]"
-			icon = 'blood.dmi'
+			icon = 'icons/effects/blood.dmi'
 			icon_state = "remainsxeno"
 			additional_desc = pick("It looks vaguely reptilian, but with more teeth.",\
 			"They are faintly unsettling.",\
--- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
@@ -4,7 +4,7 @@

 /obj/item/weapon/fossil
 	name = "Fossil"
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "bone"
 	desc = "It's a fossil."

@@ -44,7 +44,7 @@

 /obj/skeleton
 	name = "Incomplete skeleton"
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "uskel"
 	desc = "Incomplete skeleton."
 	var/bnum = 1
--- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
@@ -40,7 +40,7 @@
 //legacy crystal
 /obj/machinery/crystal
 	name = "Crystal"
-	icon = 'mining.dmi'
+	icon = 'icons/obj/mining.dmi'
 	icon_state = "crystal"

 /obj/machinery/crystal/New()
--- a/code/modules/research/xenoarchaeology/geosample.dm
+++ b/code/modules/research/xenoarchaeology/geosample.dm
@@ -17,7 +17,7 @@
 /obj/item/weapon/rocksliver
 	name = "rock sliver"
 	desc = "It looks extremely delicate."
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "sliver1"	//0-4
 	w_class = 1
 	//item_state = "electronic"
--- a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm
+++ b/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()
--- a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm
+++ b/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()
--- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm
+++ b/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
--- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+++ b/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
--- a/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm
+++ b/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
--- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
@@ -18,7 +18,7 @@

 /obj/item/weapon/anodevice
 	name = "Anomaly power utilizer"
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "anodev"
 	var/cooldown = 0
 	var/activated = 0
--- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
@@ -1,7 +1,7 @@
 /obj/machinery/suspension_gen
 	name = "suspension field generator"
 	desc = "It has stubby legs bolted up against it's body for stabilising."
-	icon = 'xenoarchaeology.dmi'
+	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "suspension2"
 	density = 1
 	req_access = list(access_research)
--- a/code/modules/research/xenoarchaeology/tools/tools.dm
+++ b/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
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/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
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/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
--- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm
+++ b/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
--- a/code/modules/virus2/analyser.dm
+++ b/code/modules/virus2/analyser.dm
@@ -1,6 +1,6 @@
 /obj/machinery/disease2/diseaseanalyser
 	name = "Disease Analyser"
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "analyser"
 	anchored = 1
 	density = 1
--- a/code/modules/virus2/biohazard
+++ b/code/modules/virus2/biohazard
@@ -1,6 +1,6 @@
 /obj/machinery/disease2/biodestroyer
 	name = "Biohazard destroyer"
-	icon = 'disposal.dmi'
+	icon = 'icons/obj/pipes/disposal.dmi'
 	icon_state = "disposalbio"
 	var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers)
 	density = 1
@@ -11,7 +11,7 @@
 		if(I.type in typesof(path))
 			user.drop_item()
 			del(I)
-			overlays += image('disposal.dmi', "dispover-handle")
+			overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle")
 			return
 	user.drop_item()
 	I.loc = src.loc
--- a/code/modules/virus2/diseasesplicer.dm
+++ b/code/modules/virus2/diseasesplicer.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/diseasesplicer
 	name = "Disease Splicer"
-	icon = 'computer.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_state = "crew"

 	var/datum/disease2/effectholder/memorybank = null
--- a/code/modules/virus2/dishincubator.dm
+++ b/code/modules/virus2/dishincubator.dm
@@ -2,7 +2,7 @@
 	name = "Pathogenic incubator"
 	density = 1
 	anchored = 1
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "incubator"
 	var/obj/item/weapon/virusdish/dish
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
--- a/code/modules/virus2/isolator.dm
+++ b/code/modules/virus2/isolator.dm
@@ -2,7 +2,7 @@
 	name = "Pathogenic Isolator"
 	density = 1
 	anchored = 1
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "isolator"
 	var/datum/disease2/disease/virus2 = null
 	var/isolating = 0
--- a/code/modules/virus2/items_devices.dm
+++ b/code/modules/virus2/items_devices.dm
@@ -28,7 +28,7 @@

 /obj/item/weapon/virusdish
 	name = "Virus containment/growth dish"
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "implantcase-b"
 	var/datum/disease2/disease/virus2 = null
 	var/growth = 0
@@ -69,7 +69,7 @@

 /obj/item/weapon/diseasedisk
 	name = "Blank GNA disk"
-	icon = 'cloning.dmi'
+	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk0"
 	var/datum/disease2/effectholder/effect = null
 	var/stage = 1