From 7b17bf2acdc7ade5a182fcbce1d5083c2ef77822 Mon Sep 17 00:00:00 2001
From: Thalpy <48600475+ThalpySci@users.noreply.github.com>
Date: Thu, 21 Nov 2019 20:30:49 +0000
Subject: [PATCH] god damn bitflags ARGH

---
 code/game/objects/items/devices/scanners.dm    | 18 +++++++++---------
 .../chemistry/reagents/medicine_reagents.dm    |  7 ++++---
 .../reagents/chemistry/reagents/healing.dm     |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index e6636ad92c..ed2ee333ab 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -226,7 +226,7 @@ SLIME SCANNER
 			//BRAIN
 			else if(istype(O, /obj/item/organ/brain))
 				if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 200)
-					damage_message += " <span class='alert'>Subject's brain function is non-existent. Neurine injection recomended.</span>"
+					damage_message += " <span class='alert'>Subject's brain non-functional. Neurine injection recomended.</span>"
 				else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 120)
 					damage_message += " <span class='alert'>Severe brain damage detected. Subject likely to have mental traumas.</span>"
 				else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 45)
@@ -314,7 +314,7 @@ SLIME SCANNER
 					damage_message += " <font color='red'>Acute [O.name] failure detected.</span>"
 
 			if(temp_message || damage_message)
-				msg += "<b><span class='info'>[uppertext(O.name)]:</b></span> [damage_message] [temp_message]\n"
+				msg += "\t<b><span class='info'>[uppertext(O.name)]:</b></span> [damage_message] [temp_message]\n"
 
 
 
@@ -329,19 +329,19 @@ SLIME SCANNER
 		var/has_liver = (!(NOLIVER in C.dna.species.species_traits))
 		var/has_stomach = (!(NOSTOMACH in C.dna.species.species_traits))
 		if(!M.getorganslot(ORGAN_SLOT_EYES))
-			msg += "\t<span class='alert'>Subject does not have eyes.</span>\n"
+			msg += "\t<span class='alert'><b>Subject does not have eyes.</b></span>\n"
 		if(!M.getorganslot(ORGAN_SLOT_EARS))
-			msg += "\t<span class='alert'>Subject does not have ears.</span>\n"
+			msg += "\t<span class='alert'><b>Subject does not have ears.</b></span>\n"
 		if(!M.getorganslot(ORGAN_SLOT_BRAIN))
-			msg += "\t<span class='alert'>Subject's brain function is non-existent!</span>\n"
+			msg += "\t<span class='alert'><b>Subject's brain function is non-existent!</b></span>\n"
 		if(has_liver && !M.getorganslot(ORGAN_SLOT_LIVER))
-			msg += "\t<span class='alert'>Subject's liver is missing!/span>\n"
+			msg += "\t<span class='alert'><b>Subject's liver is missing!</b></span>\n"
 		if(blooded && !M.getorganslot(ORGAN_SLOT_HEART))
-			msg += "\t<span class='alert'>Subject's heart is missing!</span>\n"
+			msg += "\t<span class='alert'><b>Subject's heart is missing!</b></span>\n"
 		if(breathes && !M.getorganslot(ORGAN_SLOT_LUNGS))
-			msg += "\t<span class='alert'>Subject's lungs have collapsed from trauma!</span>\n"
+			msg += "\t<span class='alert'><b>Subject's lungs have collapsed from trauma!</b></span>\n"
 		if(has_stomach && !M.getorganslot(ORGAN_SLOT_STOMACH))
-			msg += "\t<span class='alert'>Subject's stomach is missing!</span>\n"
+			msg += "\t<span class='alert'><b>Subject's stomach is missing!</span>\n"
 
 
 		if(M.radiation)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index e380d96921..de3e46355c 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -940,11 +940,11 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas."
 	color = "#EEFF8F"
 
-/datum/reagent/neurine/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
-	if(method != INJECT)
+/datum/reagent/medicine/neurine/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+	if(!(method == INJECT))
 		return
 	var/obj/item/organ/brain/B = M.getorganslot(ORGAN_SLOT_BRAIN)
-	if(!B || !(B.organ_flags & ORGAN_FAILING))
+	if(!B || (B.organ_flags & ORGAN_FAILING))
 		return
 	B.applyOrganDamage(-20)
 	if(prob(80))
@@ -953,6 +953,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 		B.gain_trauma_type(BRAIN_TRAUMA_SEVERE)
 	else
 		B.gain_trauma_type(BRAIN_TRAUMA_SPECIAL)
+	message_admins("Trauma'd")
 
 /datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/C)
 	if(holder.has_reagent("neurotoxin"))
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
index 8ac5e1a192..363ee58649 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
@@ -103,6 +103,7 @@
 	metabolization_rate = 0.05 //Give them time to graft
 	data = list("grown_volume" = 0, "injected_vol" = 0)
 	var/borrowed_health
+	color = "#FFDADA"
 
 /datum/reagent/synthtissue/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
 	if(iscarbon(M))