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

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

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

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)

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

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."

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)

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)

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"

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