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

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

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/double/barsign
-	icon = 'barsigns.dmi'
+	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
 

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -87,7 +87,7 @@
 	name = "drips of blood"
 	desc = "It's red."
 	gender = PLURAL
-	icon = 'drip.dmi'
+	icon = 'icons/effects/drip.dmi'
 	icon_state = "1"
 	amount = 0
 
@@ -141,7 +141,7 @@
 	density = 0
 	anchored = 1
 	layer = 2
-	icon = 'blood.dmi'
+	icon = 'icons/effects/blood.dmi'
 	icon_state = "mucus"
 	random_icon_states = list("mucus")
 	var/list/datum/disease2/disease/virus2 = list()

code/game/objects/explosion.dm

@@ -28,7 +28,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 		for(var/mob/M in world) if(M.z == epicenter.z) if(!(M in close))
 			// check if the mob can hear
 			if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space))
-				M << 'explosionfar.ogg'
+				M << 'sound/effects/explosionfar.ogg'
 		if(adminlog)
 			message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[epicenter.x];Y=[epicenter.y];Z=[epicenter.z]'>JMP</a>)")
 			log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ")

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

@@ -113,7 +113,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
 
@@ -121,7 +121,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/stacks/sheets/mineral.dm

@@ -253,4 +253,4 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
 	throw_speed = 3
 	throw_range = 3
 	origin_tech = "materials=4"
-	perunit = 2000
+	perunit = 2000

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/implants/implant.dm

@@ -2,7 +2,7 @@
 #define MALFUNCTION_PERMANENT 2
 /obj/item/weapon/implant
 	name = "implant"
-	icon = 'device.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "implant"
 	var/implanted = null
 	var/mob/imp_in = null

code/game/objects/items/weapons/implants/implantcase.dm

@@ -121,7 +121,7 @@
 /obj/item/weapon/implantcase/death_alarm
 	name = "Glass Case- 'Death Alarm'"
 	desc = "A case containing a death alarm implant."
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "implantcase-b"
 
 	New()

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

@@ -5,7 +5,7 @@ var/global/list/cached_icons = list()
 /obj/item/weapon/reagent_containers/glass/paint
 	desc = "It's a paint bucket."
 	name = "paint bucket"
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "paint_neutral"
 	item_state = "paintcan"
 	m_amt = 200

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

@@ -111,4 +111,4 @@
 	maxcharge = 10000
 	maxcharge = 10000
 	m_amt = 0
-	g_amt = 0
+	g_amt = 0

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

@@ -794,7 +794,7 @@ 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
 	w_class = 2.0
@@ -802,7 +802,7 @@ LOOK FOR SURGERY.DM*/
 
 /obj/item/weapon/FixOVein
 	name = "FixOVein"
-	icon = 'surgery.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "fixovein"
 	force = 0
 	throwforce = 1.0
@@ -812,7 +812,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/double/barsign
-	icon = 'barsigns.dmi'
+	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
 	New()

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

@@ -112,7 +112,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

@@ -105,12 +105,12 @@
 		if(reinf) new /obj/item/stack/rods(loc)
 		del(src)
 	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.")