From 34c3465e0af587b954248d1995bb6f7867070cb3 Mon Sep 17 00:00:00 2001
From: Migratingcocofruit
<69551563+Migratingcocofruit@users.noreply.github.com>
Date: Mon, 29 Jul 2024 18:07:02 +0300
Subject: [PATCH] Changes the reagent scanner to show blood species. Removes
the word blood from species descriptors (#26309)
---
code/game/objects/items/devices/scanners.dm | 2 +-
code/modules/reagents/chemistry/reagents/water.dm | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 3260884c7f3..0a0d634c193 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -746,7 +746,7 @@ SLIME SCANNER
dat += "
[TAB][R] [details ? ":([R.volume / one_percent]%)" : ""]"
else
blood_type = R.data["blood_type"]
- dat += "
[TAB][blood_type ? "[blood_type]" : ""] [R.name] [details ? ":([R.volume / one_percent]%)" : ""]"
+ dat += "
[TAB][blood_type ? "[blood_type]" : ""] [R.data["species"]] [R.name] [details ? ":([R.volume / one_percent]%)" : ""]"
if(dat)
to_chat(user, "Chemicals found: [dat]")
datatoprint = dat
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index c5c811b7a67..9c5388ac929 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -141,11 +141,11 @@
data["cloneable"] = 0 // On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned
if(type_mismatch || species_mismatch)
- data["species"] = "Coagulated blood"
+ data["species"] = "Coagulated"
data["blood_type"] = "UNUSABLE!"
data["species_only"] = species_unique
else if(!same_species) // Same blood type, species-agnostic, but we're still mixing blood of different species
- data["species"] = "Mixed humanoid blood"
+ data["species"] = "Mixed Humanoid"
if(data["viruses"] || mix_data["viruses"])
var/list/mix1 = data["viruses"]