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

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

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