Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into rainbowlood

code/modules/detectivework/footprints_and_rag.dm

@@ -4,6 +4,7 @@
 	var/track_blood = 0
 	var/list/feet_blood_DNA
 	var/track_blood_type
+	var/feet_blood_color
 
 /obj/item/clothing/gloves
 	var/transfer_blood = 0

code/modules/mob/living/carbon/human/human.dm

@@ -1326,5 +1326,7 @@ mob/living/carbon/human/yank_out_object()
 			src << "<span class='warning'>You ran out of blood to write with!</span>"
 
 		var/obj/effect/decal/cleanable/blood/writing/W = new(T)
+		W.basecolor = (hand_blood_color) ? hand_blood_color : "#A10808"
+		W.update_icon()
 		W.message = message
-		W.add_fingerprint(src)
+		W.add_fingerprint(src)

code/modules/mob/living/carbon/human/human_defines.dm

@@ -56,3 +56,4 @@
 	var/xylophone = 0 //For the spoooooooky xylophone cooldown
 
 	var/mob/remoteview_target = null
+	var/hand_blood_color

code/modules/mob/living/carbon/species.dm

@@ -39,6 +39,8 @@
 
 	var/list/abilities = list()	// For species-derived or admin-given powers
 
+	var/blood_color = "#A10808" //Red.
+
 /datum/species/human
 	name = "Human"
 	language = "Sol Common"
@@ -128,6 +130,7 @@
 	punch_damage = 5
 	primitive = /mob/living/carbon/monkey/diona
 
+	blood_color = "rainbow"
 	warning_low_pressure = 50
 	hazard_low_pressure = -1
 
@@ -139,4 +142,4 @@
 	heat_level_2 = 3000
 	heat_level_3 = 4000
 
-	flags = WHITELISTED | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB
+	flags = WHITELISTED | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -47,7 +47,7 @@
 /mob/living/simple_animal/hostile/hivebot/Die()
 	..()
 	visible_message("<b>[src]</b> blows apart!")
-	new /obj/effect/decal/cleanable/robot_debris(src.loc)
+	new /obj/effect/decal/cleanable/blood/robot(src.loc)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()

code/modules/paperwork/photocopier.dm

@@ -152,12 +152,12 @@
 					del(src)
 				else
 					if(toner > 0)
-						new /obj/effect/decal/cleanable/oil(get_turf(src))
+						new /obj/effect/decal/cleanable/blood/oil(get_turf(src))
 						toner = 0
 			else
 				if(prob(50))
 					if(toner > 0)
-						new /obj/effect/decal/cleanable/oil(get_turf(src))
+						new /obj/effect/decal/cleanable/blood/oil(get_turf(src))
 						toner = 0
 		return
 
@@ -166,7 +166,7 @@
 			del(src)
 		else
 			if(toner > 0)
-				new /obj/effect/decal/cleanable/oil(get_turf(src))
+				new /obj/effect/decal/cleanable/blood/oil(get_turf(src))
 				toner = 0
 		return
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -153,7 +153,7 @@ datum
 						newVirus.holder = blood_prop
 
 				else if(istype(self.data["donor"], /mob/living/carbon/alien))
-					var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T
+					var/obj/effect/decal/cleanable/blood/xeno/blood_prop = locate() in T
 					if(!blood_prop)
 						blood_prop = new(T)
 						blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -671,7 +671,7 @@
 
 	throw_impact(atom/hit_atom)
 		..()
-		new/obj/effect/decal/cleanable/oil(src.loc)
+		new/obj/effect/decal/cleanable/blood/oil(src.loc)
 		src.visible_message("<span class='notice'>The [src.name] has been squashed.</span>","<span class='moderate'>You hear a smack.</span>")
 		src.reagents.reaction(get_turf(hit_atom))
 		for(var/atom/A in get_turf(hit_atom))
@@ -1003,7 +1003,7 @@
 		var/list/turfs = new/list()
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		if(inner_teleport_radius < 1) //Wasn't potent enough, it just splats.
-			new/obj/effect/decal/cleanable/oil(src.loc)
+			new/obj/effect/decal/cleanable/blood/oil(src.loc)
 			src.visible_message("<span class='notice'>The [src.name] has been squashed.</span>","<span class='moderate'>You hear a smack.</span>")
 			del(src)
 			return
@@ -1040,7 +1040,7 @@
 					sleep(1)
 					s.set_up(3, 1, A)
 					s.start()
-		new/obj/effect/decal/cleanable/oil(src.loc)
+		new/obj/effect/decal/cleanable/blood/oil(src.loc)
 		src.visible_message("<span class='notice'>The [src.name] has been squashed, causing a distortion in space-time.</span>","<span class='moderate'>You hear a splat and a crackle.</span>")
 		del(src)
 		return

code/modules/recycling/disposal.dm

@@ -1325,7 +1325,7 @@
 
 	src.streak(dirs)
 
-/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(var/direction)
+/obj/effect/decal/cleanable/blood/robot/gib/pipe_eject(var/direction)
 	var/list/dirs
 	if(direction)
 		dirs = list( direction, turn(direction, -45), turn(direction, 45))