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

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

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

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

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

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