Merge pull request #7802 from Fox-McCloud/gunshot-splatter

Adds Gunshot Blood Splatter

code/game/objects/effects/overlays.dm

@@ -16,9 +16,9 @@
 	var/tmp/atom/BeamSource
 	New()
 		..()
-		spawn(10) 
+		spawn(10)
 			qdel(src)
-			
+
 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
 	icon = 'icons/misc/beach2.dmi'
@@ -56,7 +56,7 @@
 /obj/effect/overlay/temp/New()
 	if(randomdir)
 		dir = pick(cardinal)
-		
+
 	flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation.
 
 	spawn(duration)
@@ -81,7 +81,7 @@
 
 /obj/effect/overlay/temp/guardian/phase/out
 	icon_state = "phaseout"
-	
+
 /obj/effect/overlay/temp/emp
 	name = "emp sparks"
 	icon = 'icons/effects/effects.dmi'
@@ -92,7 +92,7 @@
 	icon_state = "emppulse"
 	duration = 8
 	randomdir = 0
-	
+
 /obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
 	name = "healing glow"
 	icon = 'icons/effects/effects.dmi'
@@ -112,7 +112,7 @@
 	icon_state = "kinetic_blast"
 	layer = 4.1
 	duration = 4
-	
+
 /obj/effect/overlay/temp/explosion
 	name = "explosion"
 	icon = 'icons/effects/96x96.dmi'
@@ -124,7 +124,7 @@
 /obj/effect/overlay/temp/explosion/fast
 	icon_state = "explosionfast"
 	duration = 4
-	
+
 /obj/effect/overlay/temp/decoy
 	desc = "It's a decoy!"
 	duration = 15
@@ -150,14 +150,14 @@
 /obj/effect/overlay/temp/cult/sparks
 	randomdir = 1
 	name = "blood sparks"
-	icon_state = "bloodsparkles"	
-	
+	icon_state = "bloodsparkles"
+
 /obj/effect/overlay/temp/dir_setting
 	randomdir = FALSE
 
 /obj/effect/overlay/temp/dir_setting/New(loc, set_dir)
 	if(set_dir)
-		dir = set_dir
+		setDir(set_dir)
 	..()
 
 /obj/effect/overlay/temp/dir_setting/bloodsplatter
@@ -165,9 +165,12 @@
 	duration = 5
 	randomdir = FALSE
 	layer = MOB_LAYER - 0.1
+	color = "#C80000"
 	var/splatter_type = "splatter"
 
-/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir)
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir, blood_color)
+	if(blood_color)
+		color = blood_color
 	if(set_dir in diagonals)
 		icon_state = "[splatter_type][pick(1, 2, 6)]"
 	else
@@ -247,7 +250,7 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "heal"
 	duration = 15
-	
+
 /obj/effect/overlay/temp/heal/New(loc, colour)
 	..()
 	pixel_x = rand(-12, 12)

code/modules/projectiles/projectile.dm

@@ -67,10 +67,26 @@
 	qdel(src)
 
 /obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone)
+	var/turf/target_loca = get_turf(target)
 	if(!isliving(target))
 		return 0
 	var/mob/living/L = target
 	if(blocked < 100) // not completely blocked
+		if(damage && L.blood_volume && damage_type == BRUTE)
+			var/splatter_dir = dir
+			if(starting)
+				splatter_dir = get_dir(starting, target_loca)
+			if(isalien(L))
+				new /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir)
+			else
+				var/blood_color = "#C80000"
+				if(ishuman(target))
+					var/mob/living/carbon/human/H = target
+					blood_color = H.species.blood_color
+				new /obj/effect/overlay/temp/dir_setting/bloodsplatter(target_loca, splatter_dir, blood_color)
+			if(prob(33))
+				L.add_splatter_floor(target_loca)
+
 		var/organ_hit_text = ""
 		if(L.has_limbs)
 			organ_hit_text = " in \the [parse_zone(def_zone)]"