Merge pull request #9047 from Poojawa/syntheticbloods

RGB Blood Reworks + Blood generator

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -31,6 +31,15 @@
 		/obj/item/stock_parts/manipulator = 1,
 		/obj/item/stack/sheet/glass = 1)
 
+/obj/item/circuitboard/machine/bloodbankgen
+	name = "Blood Bank Generator (Machine Board)"
+	build_path = /obj/machinery/bloodbankgen
+	req_components = list(
+		/obj/item/stock_parts/matter_bin = 1,
+		/obj/item/stock_parts/manipulator = 1,
+		/obj/item/stack/cable_coil = 5,
+		/obj/item/stack/sheet/glass = 1)
+
 /obj/item/circuitboard/machine/clonepod
 	name = "Clone Pod (Machine Board)"
 	build_path = /obj/machinery/clonepod

code/game/objects/items/devices/scanners.dm

@@ -410,7 +410,7 @@ SLIME SCANNER
 					msg += "<span class='danger'>Subject is bleeding!</span>\n"
 			var/blood_percent =  round((C.blood_volume / (BLOOD_VOLUME_NORMAL * C.blood_ratio))*100)
 			var/blood_type = C.dna.blood_type
-			if(blood_id != "blood")//special blood substance
+			if(blood_id != ("blood" || "jellyblood"))//special blood substance
 				var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id]
 				if(R)
 					blood_type = R.name

code/game/objects/items/mop.dm

@@ -27,6 +27,7 @@
 /obj/item/mop/proc/clean(turf/A)
 	if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1) || reagents.has_reagent("vodka", 1) || reagents.has_reagent("cleaner", 1))
 		SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
+		A.clean_blood()
 		for(var/obj/effect/O in A)
 			if(is_cleanable(O))
 				qdel(O)

code/game/objects/items/stacks/medical.dm

@@ -17,7 +17,6 @@
 	var/self_delay = 50
 
 /obj/item/stack/medical/attack(mob/living/M, mob/user)
-
 	if(M.stat == DEAD && !stop_bleeding)
 		var/t_him = "it"
 		if(M.gender == MALE)

code/game/objects/items/stacks/stack.dm

@@ -390,9 +390,9 @@
 		. = ..()
 
 /obj/item/stack/proc/copy_evidences(obj/item/stack/from)
-	add_blood_DNA(from.return_blood_DNA())
-	add_fingerprint_list(from.return_fingerprints())
-	add_hiddenprint_list(from.return_hiddenprints())
+	blood_DNA = from.blood_DNA
+	fingerprints  = from.fingerprints
+	fingerprintshidden  = from.fingerprintshidden
 	fingerprintslast  = from.fingerprintslast
 	//TODO bloody overlay
 
@@ -437,4 +437,4 @@
 
 /datum/stack_recipe_list/New(title, recipes)
 	src.title = title
-	src.recipes = recipes
+	src.recipes = recipes

code/game/objects/items/storage/toolbox.dm

@@ -35,6 +35,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 /obj/item/storage/toolbox/update_icon()
 	..()
 	cut_overlays()
+	if(blood_DNA && blood_DNA.len)
+		add_blood_overlay()
 	if(has_latches)
 		var/icon/I = icon('icons/obj/storage.dmi', latches)
 		add_overlay(I)

code/game/objects/items/twohanded.dm

@@ -346,7 +346,8 @@
 		icon_state = "dualsaber[item_color][wielded]"
 	else
 		icon_state = "dualsaber0"
-	SEND_SIGNAL(src, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+
+	clean_blood()
 
 /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/carbon/human/user)
 	if(user.has_dna())
@@ -891,4 +892,4 @@
 		var/client/C = user.client
 		C.change_view(CONFIG_GET(string/default_view))
 		user.client.pixel_x = 0
-		user.client.pixel_y = 0
+		user.client.pixel_y = 0