From 4ebeed965c5bb38af677cfe13f24a51df96737e8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 28 Sep 2022 12:12:47 +0200 Subject: [PATCH] [MIRROR] Adds Support For Exotic Bloodtypes To Operating Computer [MDB IGNORE] (#16500) * Adds Support For Exotic Bloodtypes To Operating Computer (#70149) Hey there, So basically, whenever you had an ethereal or some other species with an exotic blood type (ethereals bleed liquid electricity)- you would get a standard blood type that came from... somewhere? No idea what that was reading. Anyways, this PR just fixes the DM-side code to pass either the actual Rhesus blood type if it's genuine blood, or if it's something special (like a clown on April Fool's day)- it'll say that instead. Splendid! * Adds Support For Exotic Bloodtypes To Operating Computer Co-authored-by: san7890 --- code/game/machinery/computer/Operating.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index ae7d19d8580..f1ada284754 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -110,7 +110,15 @@ data["patient"]["stat"] = "Dead" data["patient"]["statstate"] = "bad" data["patient"]["health"] = patient.health - data["patient"]["blood_type"] = patient.dna?.blood_type + + // check here to see if the patient has standard blood reagent, or special blood (like how ethereals bleed liquid electricity) to show the proper name in the computer + var/blood_id = patient.get_blood_id() + if(blood_id == /datum/reagent/blood) + data["patient"]["blood_type"] = patient.dna?.blood_type + else + var/datum/reagent/special_blood = GLOB.chemical_reagents_list[blood_id] + data["patient"]["blood_type"] = special_blood ? special_blood.name : blood_id + data["patient"]["maxHealth"] = patient.maxHealth data["patient"]["minHealth"] = HEALTH_THRESHOLD_DEAD data["patient"]["bruteLoss"] = patient.getBruteLoss()