Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

code/game/objects/effects/decals/cleanable/gibs.dm

@@ -11,12 +11,12 @@
 	var/gibs_reagent_id = /datum/reagent/liquidgibs
 	var/gibs_bloodtype = "A+"
 
-/obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases)
+/obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases, list/blood_data)
 	. = ..()
 	if(random_icon_states && (icon_state == initial(icon_state)) && length(random_icon_states) > 0)
 		icon_state = pick(random_icon_states)
 	if(gibs_reagent_id)
-		reagents.add_reagent(gibs_reagent_id, 5)
+		reagents.add_reagent(gibs_reagent_id, 5, blood_data)
 	if(gibs_bloodtype)
 		add_blood_DNA(list("Non-human DNA" = gibs_bloodtype), diseases)
 	update_icon()

code/game/objects/effects/decals/crayon.dm

@@ -1,3 +1,5 @@
+GLOBAL_LIST(gang_tags)
+
 /obj/effect/decal/cleanable/crayon
 	name = "rune"
 	desc = "Graffiti. Damn kids."
@@ -45,6 +47,8 @@
 		data["pixel_x"] = pixel_x
 	if(pixel_y != initial(pixel_y))
 		data["pixel_y"] = pixel_y
+/obj/effect/decal/cleanable/crayon/NeverShouldHaveComeHere(turf/T)
+	return isgroundlessturf(T)
 
 /obj/effect/decal/cleanable/crayon/PersistenceLoad(list/data)
 	. = ..()
@@ -63,3 +67,18 @@
 		pixel_x = data["pixel_x"]
 	if(data["pixel_y"])
 		pixel_y = data["pixel_y"]
+
+/obj/effect/decal/cleanable/crayon/gang
+	name = "Leet Like Jeff K gang tag"
+	desc = "Looks like someone's claimed this area for Leet Like Jeff K."
+	icon = 'icons/obj/gang/tags.dmi'
+	layer = BELOW_MOB_LAYER
+	var/datum/team/gang/my_gang
+
+/obj/effect/decal/cleanable/crayon/gang/Initialize(mapload, main, type, e_name, graf_rot, alt_icon = null)
+	. = ..()
+	LAZYADD(GLOB.gang_tags, src)
+
+/obj/effect/decal/cleanable/crayon/gang/Destroy()
+	LAZYREMOVE(GLOB.gang_tags, src)
+	..()

code/game/objects/effects/spawners/gibspawner.dm

@@ -31,7 +31,10 @@
 
 	var/list/dna_to_add //find the dna to pass to the spawned gibs. do note this can be null if the mob doesn't have blood. add_blood_DNA() has built in null handling.
 	var/body_coloring = ""
+
+	var/list/blood_data_to_add
 	if(source_mob)
+		blood_data_to_add = source_mob.get_blood_data()
 		if(!issilicon(source_mob))
 			dna_to_add = blood_dna || source_mob.get_blood_dna_list() //ez pz
 		if(ishuman(source_mob))
@@ -65,7 +68,7 @@
 		if(gibamounts[i])
 			for(var/j = 1, j<= gibamounts[i], j++)
 				var/gibType = gibtypes[i]
-				gib = new gibType(loc, diseases)
+				gib = new gibType(loc, diseases, blood_data_to_add)
 				if(iscarbon(loc))
 					var/mob/living/carbon/digester = loc
 					digester.stomach_contents += gib

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -4,6 +4,7 @@
 	duration = 5
 	randomdir = FALSE
 	layer = BELOW_MOB_LAYER
+	color = BLOOD_COLOR_HUMAN // set it to red by default because the actual icons are white
 	var/splatter_type = "splatter"
 
 /obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir, new_color)