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

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

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/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)