[MIRROR] Scannable chems and fixes (#12162)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/modules/reagents/reagents/_reagents.dm

@@ -18,7 +18,7 @@
 	var/overdose = 0		//Amount at which overdose starts
 	var/overdose_mod = 1	//Modifier to overdose damage
 	var/can_overdose_touch = FALSE	// Can the chemical OD when processing on touch?
-	var/scannable = 0 // Shows up on health analyzers.
+	var/scannable = SCANNABLE_SECRETIVE // Shows up on health analyzers.
 
 	var/affects_dead = 0	// Does this chem process inside a corpse without outside intervention required?
 	var/affects_robots = 0	// Does this chem process inside a Synth?
@@ -49,6 +49,11 @@
 
 	var/coolant_modifier = -0.5 // this is multiplied by the volume of the reagent. Most things are not good coolant. EX: Water is 1, coolant is 2. -1 would be a bad reagent for cooling.
 
+	var/glass_icon_file = null
+	var/glass_icon_state = null
+	var/glass_center_of_mass_x = 0
+	var/glass_center_of_mass_y = 0
+
 /datum/reagent/proc/remove_self(var/amount) // Shortcut
 	if(holder)
 		holder.remove_reagent(id, amount)

code/modules/reagents/reagents/core.dm

@@ -247,6 +247,7 @@
 	taste_description = REAGENT_ID_WATER
 	description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
 	reagent_state = LIQUID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#0064C877"
 	metabolism = REM * 10
 
@@ -349,6 +350,7 @@
 	description = "Required for welders. Flamable."
 	taste_description = "gross metal"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#660000"
 
 	glass_name = "welder fuel"

code/modules/reagents/reagents/dispenser.dm

@@ -6,6 +6,7 @@
 	taste_mult = 1.1
 	reagent_state = SOLID
 	color = "#A8A8A8"
+	scannable = SCANNABLE_ADVANCED
 	supply_conversion_value = 1  // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_RAW
 
@@ -16,6 +17,7 @@
 	taste_description = "metallic chalk" // Apparently, calcium tastes like calcium.
 	taste_mult = 1.3
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#e9e6e4"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -39,6 +41,7 @@
 	taste_description = "sour chalk"
 	taste_mult = 1.5
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#1C1300"
 	ingest_met = REM * 5
 	supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
@@ -71,6 +74,7 @@
 	taste_description = "pool water"
 	reagent_state = GAS
 	color = "#808080"
+	scannable = SCANNABLE_ADVANCED
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
 	coolant_modifier = 0.15
@@ -87,6 +91,7 @@
 	description = "A highly ductile metal."
 	taste_description = "pennies"
 	color = "#6E3B08"
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = 0.5 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
 
@@ -96,6 +101,7 @@
 	description = "A well-known alcohol with a variety of applications."
 	taste_description = "pure alcohol"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#404030"
 	cup_prefix = "alcoholic"
 
@@ -303,6 +309,7 @@
 	description = "A highly-reactive chemical element."
 	taste_description = "acid"
 	reagent_state = GAS
+	scannable = SCANNABLE_ADVANCED
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -319,6 +326,7 @@
 	description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
 	taste_mult = 0 //no taste
 	reagent_state = GAS
+	scannable = SCANNABLE_ADVANCED
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_NO
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -329,6 +337,7 @@
 	description = "Pure iron is a metal."
 	taste_description = "metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#353535"
 	supply_conversion_value = 1 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -339,6 +348,7 @@
 	description = "A chemical element, used as antidepressant."
 	taste_description = "metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -357,6 +367,7 @@
 	description = "A chemical element."
 	taste_mult = 0 //mercury apparently is tasteless. IDK
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#484848"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -375,6 +386,7 @@
 	description = "A colorless, odorless, tasteless gas."
 	taste_mult = 0 //no taste
 	reagent_state = GAS
+	scannable = SCANNABLE_ADVANCED
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -386,6 +398,7 @@
 	description = "A colorless, odorless gas."
 	taste_mult = 0
 	reagent_state = GAS
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -401,6 +414,7 @@
 	description = "A chemical element, the backbone of biological energy carriers."
 	taste_description = "vinegar"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#832828"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -411,6 +425,7 @@
 	description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
 	taste_description = "sweetness" //potassium is bitter in higher doses but sweet in lower ones.
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#A0A0A0"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -421,6 +436,7 @@
 	description = "Radium is an alkaline earth metal. It is extremely radioactive."
 	taste_mult = 0	//Apparently radium is tasteless
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#C7C7C7"
 	supply_conversion_value = REFINERYEXPORT_VALUE_RARE
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -444,6 +460,7 @@
 	description = "Concentrated Radium is a more potent variant of regular radium, able to pierce and irradiate a subject through their skin."
 	taste_mult = 0	//Apparently radium is tasteless
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#C7C7C7"
 	supply_conversion_value = REFINERYEXPORT_VALUE_RARE
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -462,6 +479,7 @@
 	description = "A very corrosive mineral acid with the molecular formula H2SO4."
 	taste_description = "acid"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#DB5008"
 	metabolism = REM * 2
 	touch_met = 50 // It's acid!
@@ -598,6 +616,7 @@
 	description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
 	taste_mult = 0
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#A8A8A8"
 	supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -608,6 +627,7 @@
 	description = "A chemical element, readily reacts with water."
 	taste_description = "salty metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -620,6 +640,7 @@
 	taste_description = "sugar"
 	taste_mult = 1.8
 	reagent_state = SOLID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#FFFFFF"
 
 	glass_name = REAGENT_ID_SUGAR
@@ -657,6 +678,7 @@
 	description = "A chemical element with a pungent smell."
 	taste_description = "old eggs"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#BF8C00"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -669,6 +691,7 @@
 	taste_description = "metal"
 	taste_mult = 0 //no taste
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#DCDCDC"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -680,6 +703,7 @@
 	taste_description = "metal"
 	taste_mult = 0 //no taste
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#cadcef"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_COSMETIC
@@ -691,6 +715,7 @@
 	taste_description = "metal"
 	taste_mult = 0 //no taste
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#cadcef"
 	supply_conversion_value = REFINERYEXPORT_VALUE_RARE
 	industrial_use = REFINERYEXPORT_REASON_INDUSTRY
@@ -702,6 +727,7 @@
 	taste_description = "metal"
 	taste_mult = 0 //no taste
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#efe9ca"
 	supply_conversion_value = 0.5 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -711,6 +737,7 @@
 	id = REAGENT_ID_MIASMA
 	description = "Not necessarily a gas, miasma refers to biological pollutants found in the atmosphere."
 	reagent_state = GAS
+	scannable = SCANNABLE_ADVANCED
 	taste_description = "indescribable"
 	color = "#808000"
 	supply_conversion_value = REFINERYEXPORT_VALUE_NO

code/modules/reagents/reagents/drugs.dm

@@ -10,6 +10,7 @@
 	taste_description = "a bad investment"
 	taste_mult = 1.2 /// The overwhelming flavor of a good(?) time!
 	color = "#f2f2f2"
+	scannable = SCANNABLE_ADVANCED
 	var/high_messages = TRUE
 	var/list/high_message_list = list("You feel great! For now...", "You feel a wave of happiness!")
 	var/list/sober_message_list = list("You feel like garbage...", "Your head aches.")
@@ -48,6 +49,7 @@
 	description = "Known for providing a euphoric high, this psychoactive drug is often used recreationally."
 	taste_description = "unpleasant bitterness"
 	taste_mult = 0.4
+	scannable = SCANNABLE_ADVANCED
 	high_message_list = list("You don't quite know what up or down is anymore...",
 	"Colors just seem much more amazing.",
 	"You feel incredibly confident. No one can stop you.",
@@ -268,6 +270,7 @@
 	high_message_list = list("You feel focused.", "Your attention is undivided.")
 	sober_message_list = list("It becomes harder to focus...", "You feel distractible.")
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
+	scannable = SCANNABLE_BENEFICIAL
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
 /datum/reagent/drugs/citalopram
@@ -276,6 +279,7 @@
 	description = "Stabilizes the mind a little."
 	taste_description = "mild peppermint"
 	color = "#FF80FF"
+	scannable = SCANNABLE_BENEFICIAL
 	high_message_list = list("Everything feels a bit more steady.", "Your mind feels stable.")
 	sober_message_list = list("You feel a little tired.", "You feel a little more listless...")
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -292,6 +296,7 @@
 	description = "Stabilizes the mind greatly, but has a chance of adverse effects."
 	taste_description = "mild oranges"
 	color = "#FF80BF"
+	scannable = SCANNABLE_BENEFICIAL
 	high_message_list = list("Everything feels good, stable.", "You feel grounded.")
 	sober_message_list = list("The stability is gone...", "Everything is much less stable.")
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
@@ -312,6 +317,7 @@
 	description = "A potent sedative and anti-anxiety medication, made for the Qerr-Katish."
 	taste_description = "mint"
 	color = "#e6efe3"
+	scannable = SCANNABLE_BENEFICIAL
 	high_message_list = list("You feel sluggish...", "You feel calm and collected.")
 	sober_message_list = list("You feel so much more antsy...", "Your concentration wavers.")
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED

code/modules/reagents/reagents/food_drinks.dm

@@ -14,6 +14,7 @@
 	affects_robots = 1	//VOREStation Edit
 	wiki_flag = WIKI_FOOD
 	coolant_modifier = -1
+	scannable = SCANNABLE_BENEFICIAL
 
 	supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
 	industrial_use = REFINERYEXPORT_REASON_FOOD
@@ -867,6 +868,7 @@
 /datum/reagent/condensedcapsaicin
 	name = REAGENT_CONDENSEDCAPSAICIN
 	id = REAGENT_ID_CONDENSEDCAPSAICIN
+	scannable = SCANNABLE_ADVANCED
 	description = "A chemical agent used for self-defense and in police work."
 	taste_description = "fire"
 	taste_mult = 10

code/modules/reagents/reagents/medicine.dm

@@ -9,7 +9,7 @@
 	color = "#00BFFF"
 	overdose = REAGENTS_OVERDOSE * 2
 	metabolism = REM * 0.2
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -28,7 +28,7 @@
 	color = "#00BFFF"
 	overdose = REAGENTS_OVERDOSE * 2
 	metabolism = REM * 0.2
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	touch_met = REM * 0.3
 	can_overdose_touch = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -54,7 +54,7 @@
 	color = "#BF0000"
 	overdose = REAGENTS_OVERDOSE
 	overdose_mod = 0.25
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -91,7 +91,7 @@
 	reagent_state = LIQUID
 	color = "#BF0000"
 	overdose = REAGENTS_OVERDOSE * 0.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	touch_met = REM * 0.75
 	can_overdose_touch = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -121,7 +121,7 @@
 	color = "#eae6e3"
 	overdose = REAGENTS_OVERDOSE * 0.8
 	metabolism = REM * 0.4
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -141,7 +141,7 @@
 	reagent_state = LIQUID
 	color = "#FFA800"
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -163,7 +163,7 @@
 	reagent_state = LIQUID
 	color = "#FF8000"
 	overdose = REAGENTS_OVERDOSE * 0.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -183,7 +183,7 @@
 	reagent_state = LIQUID
 	color = "#FF8000"
 	overdose = REAGENTS_OVERDOSE * 0.4
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	touch_met = REM * 0.75
 	can_overdose_touch = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -211,7 +211,7 @@
 	taste_description = "a roll of gauze"
 	reagent_state = LIQUID
 	color = "#00A000"
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -234,7 +234,7 @@
 	description = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
 	reagent_state = LIQUID
 	color = "#225722"
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	overdose = REAGENTS_OVERDOSE * 0.5
 	overdose_mod = 0 // Not used, but it shouldn't deal toxin damage anyways. Carth heals toxins!
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -273,7 +273,7 @@
 	reagent_state = LIQUID
 	color = "#0080FF"
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	metabolism = REM * 0.25
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_DRUG
@@ -301,7 +301,7 @@
 	color = "#0040FF"
 	overdose = REAGENTS_OVERDOSE * 0.5
 	overdose_mod = 1.25
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -326,8 +326,8 @@
 	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#8040FF"
-	scannable = 1
 	overdose = REAGENTS_OVERDOSE * 4 //YW EDIT - TRICORD FUCKING KILLS YOU
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -356,7 +356,7 @@
 	taste_description = "bitterness"
 	reagent_state = SOLID
 	color = "#B060FF"
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	can_overdose_touch = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
@@ -396,7 +396,7 @@
 	color = "#8080FF"
 	metabolism = REM * 0.5
 	mrate_static = TRUE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
 
@@ -423,7 +423,7 @@
 	color = "#80BFFF"
 	metabolism = REM * 0.5
 	mrate_static = TRUE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
 
@@ -452,7 +452,7 @@
 	metabolism = REM * 0.5
 	mrate_static = TRUE
 	affects_dead = FALSE //Clarifying this here since the original intent was this ONLY works on people that have the bloodpump_corpse modifier.
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
 	industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
 
@@ -492,7 +492,7 @@
 	color = "#94B21C"
 	metabolism = REM * 0.5
 	mrate_static = TRUE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	affects_dead = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
@@ -529,7 +529,7 @@
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE * 2
 	overdose_mod = 0.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	metabolism = 0.02
 	mrate_static = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
@@ -556,7 +556,7 @@
 	color = "#CB68FC"
 	overdose = REAGENTS_OVERDOSE
 	overdose_mod = 0.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	metabolism = 0.02
 	mrate_static = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -582,7 +582,7 @@
 	color = "#800080"
 	overdose = 20
 	overdose_mod = 0.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	metabolism = 0.02
 	mrate_static = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
@@ -612,8 +612,9 @@
 	reagent_state = LIQUID
 	color = "#99CCFF"
 	metabolism = REM * 0.05
+	mrate_static = TRUE
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -644,6 +645,7 @@
 	reagent_state = LIQUID
 	color = "#FF3300"
 	overdose = REAGENTS_OVERDOSE * 0.5
+	scannable = SCANNABLE_ADVANCED
 	overdose_mod = 0.25
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_COMSTIM
@@ -677,7 +679,7 @@
 	color = "#FFFF66"
 	metabolism = REM * 0.25
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -702,7 +704,7 @@
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -729,7 +731,7 @@
 	color = "#561EC3"
 	overdose = 10
 	overdose_mod = 1.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -764,7 +766,7 @@
 	metabolism = REM * 0.5
 	overdose = REAGENTS_OVERDOSE * 0.5
 	overdose_mod = 1.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -798,7 +800,7 @@
 	metabolism = REM * 0.75
 	overdose = REAGENTS_OVERDOSE * 0.5
 	overdose_mod = 1.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	var/repair_strength = 6
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
@@ -848,7 +850,7 @@
 	metabolism = REM * 1.5
 	overdose = 10
 	overdose_mod = 1.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -882,7 +884,7 @@
 	metabolism = REM * 1.5
 	overdose = 10
 	overdose_mod = 1.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -916,7 +918,7 @@
 	metabolism = REM * 1.5
 	overdose = 10
 	overdose_mod = 1.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -952,7 +954,7 @@
 	metabolism = REM * 1.5
 	overdose = 10
 	overdose_mod = 1.75
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -982,7 +984,7 @@
 	color = "#7B4D4F"
 	overdose = 20
 	overdose_mod = 1.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	metabolism = REM * 0.06
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
@@ -1040,7 +1042,7 @@
 	metabolism = REM * 0.06
 	overdose = 20
 	overdose_mod = 1.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -1081,6 +1083,7 @@
 	description = REAGENT_RYETALYN + " can cure DNA, Cloning, and genetic damage via a catalytic process."
 	taste_description = "acid"
 	reagent_state = SOLID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#004000"
 	overdose = REAGENTS_OVERDOSE
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
@@ -1116,6 +1119,7 @@
 	description = "A powerful oxidizer that reacts with ethanol."
 	taste_description = "bitterness"
 	reagent_state = SOLID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#605048"
 	overdose = REAGENTS_OVERDOSE
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
@@ -1154,7 +1158,7 @@
 	color = "#408000"
 	metabolism = REM * 0.25
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
 
@@ -1174,7 +1178,7 @@
 	metabolism = REM * 0.25
 	overdose = REAGENTS_OVERDOSE
 	overdose_mod = 1.25
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
 
@@ -1197,7 +1201,7 @@
 	metabolism = REM * 0.25
 	mrate_static = TRUE
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	data = 0
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_DRUG
@@ -1228,7 +1232,7 @@
 	mrate_static = TRUE
 	overdose = 10
 	overdose_mod = 1.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	data = 0
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
@@ -1298,7 +1302,7 @@
 	metabolism = REM * 0.4
 	mrate_static = TRUE
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	data = 0
 	can_overdose_touch = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -1345,6 +1349,7 @@
 	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
+	scannable = SCANNABLE_BENEFICIAL
 	touch_met = 5
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_CLEAN
@@ -1398,7 +1403,7 @@
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
 	coolant_modifier = 0.5 // Okay substitute coolant
@@ -1424,7 +1429,7 @@
 	color = "#669900"
 	overdose = REAGENTS_OVERDOSE
 	overdose_mod = 2
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
 	industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
 
@@ -1474,7 +1479,7 @@
 	reagent_state = SOLID
 	color = "#555555"
 	metabolism = REM * 4 // Nanomachines gotta go fast.
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	affects_robots = TRUE
 	wiki_flag = WIKI_SPOILER
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -1495,7 +1500,7 @@
 	color = "#80af9c"
 	metabolism = REM * 0.002
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_FOOD
 
@@ -1509,7 +1514,7 @@
 	overdose = REAGENTS_OVERDOSE * 0.50
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
-
+	scannable = SCANNABLE_BENEFICIAL
 
 /datum/reagent/earthsblood/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.heal_organ_damage (4 * removed, 4 * removed)
@@ -1531,7 +1536,7 @@
 	color = "#31d422"
 	overdose = 15
 	overdose_mod = 1.2
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -1588,6 +1593,7 @@
 	id = REAGENT_ID_TERCOZOLAM
 	color = "#afeb17"
 	metabolism = 0.05
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A well respected drug used for treatment of schizophrenia in specific."
 	overdose = REAGENTS_OVERDOSE * 2
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED

code/modules/reagents/reagents/medicine_ch.dm

@@ -6,6 +6,7 @@
 	id = REAGENT_ID_CLARIDYL
 	description = "Claridyl is an advanced medicine that cures all of your problems. Notice: Clarydil does not claim to fix marriages, car loans, student debt or insomnia and may cause severe pain."
 	taste_description = "sugar"
+	scannable = SCANNABLE_BENEFICIAL
 	reagent_state = LIQUID
 	color = "#AAAAFF"
 	overdose = REAGENTS_OVERDOSE * 100
@@ -62,6 +63,7 @@
 	id = REAGENT_ID_EDEN
 	description = "The ultimate anti toxin unrivaled, it corrects impurities within the body but punishes those who attain them with a burning sensation"
 	taste_description = "peace"
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#00FFBE"
 	overdose = REAGENTS_OVERDOSE * 1
 	metabolism = 0
@@ -92,6 +94,7 @@
 /datum/reagent/tercozolam
 	name = REAGENT_TERCOZOLAM
 	id = REAGENT_ID_TERCOZOLAM
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#afeb17"
 	metabolism = 0.05
 	description = "A well respected drug used for treatment of schizophrenia in specific."
@@ -105,6 +108,7 @@
 /datum/reagent/hannoa
 	name = REAGENT_HANNOA
 	id = REAGENT_ID_HANNOA
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A powerful clotting agent that treats brute damage very quickly but takes a long time to be metabolised. Overdoses easily, reacts badly with other chemicals."
 	taste_description = "paint"
 	reagent_state = LIQUID
@@ -150,6 +154,7 @@
 /datum/reagent/bullvalene //This is for the third sap. It converts Brute Oxy and burn into slightly less toxins.
 	name = REAGENT_BULLVALENE
 	id = REAGENT_ID_BULLVALENE
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A catalytic chemical that can treat a wide variety of ailments at the cost of toxifying the host's body."
 	taste_description = "sulfur"
 	reagent_state = LIQUID
@@ -174,6 +179,7 @@
 /datum/reagent/serazine
 	name = REAGENT_SERAZINE
 	id = REAGENT_ID_SERAZINE
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A sweet tasting flower extract, it has very mild anti toxic properties, help with hallucinations and drowsyness, and can be used to make potent drugs."
 	taste_description = "sweet nectar"
 	reagent_state = LIQUID
@@ -192,6 +198,7 @@
 /datum/reagent/alizene
 	name = REAGENT_ALIZENE
 	id = REAGENT_ID_ALIZENE
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A derivative from bicaridine enhanced by serazine to more effectively mend flesh, but is ineffective against internal hemorrhage."
 	taste_description = "bittersweet"
 	taste_mult = 3

code/modules/reagents/reagents/medicine_vr.dm

@@ -5,7 +5,7 @@
 	taste_description = "milk"
 	reagent_state = LIQUID
 	color = "#d5e2e5"
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -28,7 +28,7 @@
 	metabolism = 0.1 //Lasts up to 200 seconds if you give 20u which is OD.
 	mrate_static = TRUE
 	overdose = 20 //High OD. This is to make numbing bites have somewhat of a downside if you get bit too much. Have to go to medical for dialysis.
-	scannable = 0 //Let's not have medical mechs able to make an extremely strong organic painkiller
+	scannable = SCANNABLE_ADVANCED //Let's not have medical mechs able to make an extremely strong organic painkiller
 	wiki_flag = WIKI_SPOILER
 	supply_conversion_value = REFINERYEXPORT_VALUE_RARE
 	industrial_use = REFINERYEXPORT_REASON_DRUG
@@ -73,7 +73,7 @@
 	reagent_state = LIQUID
 	color = "#750404"
 	overdose = REAGENTS_OVERDOSE * 0.5
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -94,7 +94,7 @@
 	reagent_state = LIQUID
 	color = "#b4dcdc"
 	overdose = 5
-	scannable = 0
+	scannable = SCANNABLE_BENEFICIAL
 
 	supply_conversion_value = REFINERYEXPORT_VALUE_RARE
 	industrial_use = REFINERYEXPORT_REASON_DRUG
@@ -115,7 +115,7 @@
 	color = "#003153" //Blue!
 	metabolism = REM * 0.25//20 ticks to do things per unit injected. This means injecting 30u will give you 10 minutes to do what you need.
 	overdose = REAGENTS_OVERDOSE
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_DRUG
 
@@ -131,6 +131,7 @@
 	description = "A chemical compound that causes a dangerously powerful fat-burning reaction."
 	taste_description = "blandness"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#47AD6D"
 	overdose = REAGENTS_OVERDOSE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
@@ -148,6 +149,7 @@
 	taste_description = "blubber"
 	reagent_state = LIQUID
 	color = "#61731C"
+	scannable = SCANNABLE_BENEFICIAL
 	overdose = REAGENTS_OVERDOSE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_DIET
@@ -163,6 +165,7 @@
 	description = "A chemical that instantly transforms the consumer into another creature."
 	taste_description = "luck"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_SECRETIVE
 	color = "#a754de"
 	scannable = 1
 	var/tf_type = /mob/living/simple_mob/animal/passive/mouse
@@ -276,7 +279,7 @@
 	taste_description = "change"
 	reagent_state = LIQUID
 	color = "#ffffff"
-	scannable = 1
+	scannable = SCANNABLE_SECRETIVE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_COSMETIC
 

code/modules/reagents/reagents/modifiers.dm

@@ -10,6 +10,7 @@
 	reagent_state = LIQUID
 	color = "#ff5555"
 	metabolism = REM
+	scannable = SCANNABLE_SECRETIVE
 
 	var/modifier_to_add = /datum/modifier/berserk
 	var/modifier_duration = 3 SECONDS	// How long, per unit dose, will this last?

code/modules/reagents/reagents/other.dm

@@ -8,6 +8,7 @@
 	reagent_state = LIQUID
 	color = "#888888"
 	overdose = 10
+	scannable = SCANNABLE_ADVANCED
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_COSMETIC
 
@@ -59,6 +60,7 @@
 	reagent_state = LIQUID
 	color = "#888888"
 	overdose = 10
+	scannable = SCANNABLE_ADVANCED
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_COSMETIC
 
@@ -116,6 +118,7 @@
 	color = "#808080"
 	overdose = REAGENTS_OVERDOSE * 0.5
 	color_weight = 20
+	scannable = SCANNABLE_ADVANCED
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_COSMETIC
 
@@ -178,6 +181,7 @@
 	color = "#C8A5DC"
 	affects_dead = TRUE //This can even heal dead people.
 	metabolism = 0.1
+	scannable = SCANNABLE_UNSCANNABLE
 	mrate_static = TRUE //Just in case
 
 	glass_name = "liquid gold"
@@ -247,6 +251,7 @@
 	description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
 	taste_description = "metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#F7C430"
 	supply_conversion_value = 2 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -257,6 +262,7 @@
 	description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
 	taste_description = "metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#D0D0D0"
 	supply_conversion_value = 1 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -267,6 +273,7 @@
 	description = "Platinum is a dense, malleable, ductile, highly unreactive, precious, gray-white transition metal.  It is very resistant to corrosion."
 	taste_description = "metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#777777"
 	supply_conversion_value = 5 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -277,6 +284,7 @@
 	description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
 	taste_description = "metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#B8B8C0"
 	supply_conversion_value = 2 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -345,6 +353,7 @@
 	reagent_state = SOLID
 	affects_dead = TRUE
 	affects_robots = TRUE
+	scannable = SCANNABLE_UNSCANNABLE
 	description = "The immense power of a supermatter crystal, in liquid form. You're not entirely sure how that's possible, but it's probably best handled with care."
 	taste_description = "taffy" // 0. The supermatter is tasty, tasty taffy.
 	wiki_flag = WIKI_SPOILER
@@ -368,6 +377,7 @@
 	description = "Adrenaline is a hormone used as a drug to treat cardiac arrest and other cardiac dysrhythmias resulting in diminished or absent cardiac output."
 	taste_description = "bitterness"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_BENEFICIAL
 	color = "#C8A5DC"
 	mrate_static = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
@@ -387,6 +397,7 @@
 	taste_description = "water"
 	color = "#E0E8EF"
 	mrate_static = TRUE
+	scannable = SCANNABLE_BENEFICIAL
 
 	glass_name = "holy water"
 	glass_desc = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality."
@@ -431,6 +442,7 @@
 	taste_description = "mordant"
 	taste_mult = 2
 	reagent_state = GAS
+	scannable = SCANNABLE_ADVANCED
 	color = "#404030"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_RAW
@@ -442,6 +454,7 @@
 	description = "A secondary amine, mildly corrosive."
 	taste_description = REAGENT_ID_IRON
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#604030"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -452,6 +465,7 @@
 	description = "Also known as sodium hydroxide. As a profession making this is somewhat underwhelming."
 	taste_description = "acid"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#FFFFD6" // very very light yellow"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -462,6 +476,7 @@
 	description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
 	taste_description = "metal"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#9E6B38"
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -472,6 +487,7 @@
 	description = "A agent that yields metallic foam when mixed with light metal and a strong acid."
 	taste_description = "metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#664B63"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -482,6 +498,7 @@
 	description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
 	taste_description = "sweet tasting metal"
 	reagent_state = SOLID
+	scannable = SCANNABLE_ADVANCED
 	color = "#673910"
 	touch_met = 50
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
@@ -511,6 +528,7 @@
 	description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
 	taste_description = "sourness"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#A5F0EE"
 	touch_met = 50
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
@@ -603,6 +621,7 @@
 	description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
 	taste_description = "slime"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#009CA8"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_LUBE
@@ -620,6 +639,7 @@
 	description = "A compound that can be used to reinforce glass."
 	taste_description = "plastic"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#C7FFFF"
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -638,6 +658,7 @@
 	description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
 	taste_description = "sweetness"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -649,6 +670,7 @@
 	description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
 	taste_description = "oil"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_UNSCANNABLE
 	color = "#808080"
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
@@ -660,6 +682,7 @@
 	taste_description = "sourness"
 	taste_mult = 1.1
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#C8A5DC"
 
 	affects_robots = TRUE
@@ -686,6 +709,7 @@
 /datum/reagent/ultraglue
 	name = REAGENT_GLUE
 	id = REAGENT_ID_GLUE
+	scannable = SCANNABLE_ADVANCED
 	description = "An extremely powerful bonding agent."
 	taste_description = "a special education class"
 	color = "#FFFFCC"
@@ -695,6 +719,7 @@
 /datum/reagent/woodpulp
 	name = REAGENT_WOODPULP
 	id = REAGENT_ID_WOODPULP
+	scannable = SCANNABLE_ADVANCED
 	description = "A mass of wood fibers."
 	taste_description = "wood"
 	reagent_state = LIQUID
@@ -705,6 +730,7 @@
 /datum/reagent/luminol
 	name = REAGENT_LUMINOL
 	id = REAGENT_ID_LUMINOL
+	scannable = SCANNABLE_ADVANCED
 	description = "A compound that interacts with blood on the molecular level."
 	taste_description = "metal"
 	reagent_state = LIQUID
@@ -734,6 +760,7 @@
 /datum/reagent/mineralfluid
 	name = REAGENT_MINERALIZEDFLUID
 	id = REAGENT_ID_MINERALIZEDFLUID
+	scannable = SCANNABLE_ADVANCED
 	description = "A warm, mineral-rich fluid."
 	taste_description = "salt"
 	reagent_state = LIQUID
@@ -746,6 +773,7 @@
 /datum/reagent/defective_nanites
 	name = REAGENT_DEFECTIVENANITES
 	id = REAGENT_ID_DEFECTIVENANITES
+	scannable = SCANNABLE_DIFFICULT
 	description = "Miniature medical robots that are malfunctioning and cause bodily harm. Fortunately, they cannot self-replicate."
 	taste_description = "metal"
 	reagent_state = SOLID
@@ -787,6 +815,7 @@
 /datum/reagent/carpet
 	name = REAGENT_LIQUIDCARPET
 	id = REAGENT_ID_LIQUIDCARPET
+	scannable = SCANNABLE_ADVANCED
 	description = "Liquified carpet fibers, ready for dyeing."
 	reagent_state = LIQUID
 	color = "#b51d05"
@@ -794,10 +823,6 @@
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
 
-/datum/reagent/carpet
-	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
-	industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-
 /datum/reagent/carpet/black
 	name = REAGENT_LIQUIDCARPETB
 	id = REAGENT_ID_LIQUIDCARPETB
@@ -857,6 +882,7 @@
 /datum/reagent/essential_oil
 	name = REAGENT_ESSENTIALOIL
 	id = REAGENT_ID_ESSENTIALOIL
+	scannable = SCANNABLE_ADVANCED
 	description = "A slurry of compounds that contains the basic requirements for life."
 	taste_description = "a mixture of thick, sweet, salty, salty and spicy flavours that all blend together to not be very nice at all"
 	reagent_state = LIQUID

code/modules/reagents/reagents/other_vr.dm

@@ -4,6 +4,7 @@
 	description = "A corruptive toxin produced by slimes. Turns the subject of the chemical into a Promethean."
 	reagent_state = LIQUID
 	color = "#13BC5E"
+	scannable = SCANNABLE_ADVANCED
 	supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
 	industrial_use = REFINERYEXPORT_REASON_MATSCI
 
@@ -39,7 +40,7 @@
 	taste_description = "metallic"
 	reagent_state = LIQUID
 	color = "#333333"
-	scannable = 1
+	scannable = SCANNABLE_BENEFICIAL
 	affects_robots = TRUE
 	wiki_flag = WIKI_SPOILER
 
@@ -61,6 +62,7 @@
 	description = "A historical fire suppressant. Originally believed to simply displace oxygen to starve fires, it actually interferes with the combustion reaction itself. Vastly superior to the cheap water-based extinguishers found on most NT vessels."
 	reagent_state = LIQUID
 	color = "#A6FAFF"
+	scannable = SCANNABLE_ADVANCED
 	taste_description = "the inside of a fire extinguisher"
 	supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
 	industrial_use = REFINERYEXPORT_REASON_INDUSTRY
@@ -111,7 +113,7 @@
 	taste_description = "wiggly peanutbutter"
 	reagent_state = LIQUID
 	color = "#1d1d1d"
-	scannable = 0
+	scannable = SCANNABLE_BENEFICIAL
 	metabolism = REM * 0.5
 	affects_robots = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
@@ -142,6 +144,7 @@
 	reagent_state = LIQUID
 	color = "#E4EC2F"
 	metabolism = 2.50
+	scannable = SCANNABLE_ADVANCED
 	var/power = 9
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_PRECURSOR

code/modules/reagents/reagents/toxins.dm

@@ -10,6 +10,7 @@
 	color = "#CF3600"
 	metabolism = REM * 0.25 // 0.05 by default. Hopefully enough to get some help, or die horribly, whatever floats your boat
 	filtered_organs = list(O_LIVER, O_KIDNEYS)
+	scannable = SCANNABLE_DIFFICULT
 	var/strength = 4 // How much damage it deals per unit
 	var/skin_danger = 0.2 // The multiplier for how effective the toxin is when making skin contact.
 	supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
@@ -54,8 +55,9 @@
 
 /datum/reagent/toxin/amatoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	// Trojan horse. Waits until most of the toxin has gone through the body before dealing the bulk of it in one big strike.
-	if(volume < max_dose * 0.2)
-		M.adjustToxLoss(max_dose * strength * removed / (max_dose * 0.2))
+	if(volume < max_dose * 0.1)
+		M.adjustToxLoss(max_dose * strength) //Get hit all at once.
+		M.reagents.del_reagent(REAGENT_ID_AMATOXIN) //Remove the rest of ourselves.
 
 /datum/reagent/toxin/carpotoxin
 	name = REAGENT_CARPOTOXIN
@@ -364,7 +366,7 @@
 	metabolism = REM
 	strength = 3
 	mrate_static = TRUE
-	scannable = FALSE
+	scannable = SCANNABLE_SECRETIVE
 	supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
 	industrial_use = REFINERYEXPORT_REASON_MEDSCI
 
@@ -374,11 +376,12 @@
 		return
 	if(!(M.status_flags & FAKEDEATH))
 		M.emote("deathgasp")
+		M.tod = stationtime2text()
+		M.timeofdeath = world.time
 	M.status_flags |= FAKEDEATH
 	M.adjustOxyLoss(1 * removed)
 	M.silent = max(M.silent, 10)
 	M.paralysis = max(M.paralysis, 10)
-	M.tod = stationtime2text()
 
 /datum/reagent/toxin/zombiepowder/Destroy()
 	if(holder && holder.my_atom && ismob(holder.my_atom))
@@ -394,7 +397,7 @@
 	color = "#666666"
 	metabolism = REM * 0.75
 	mrate_static = TRUE
-	scannable = FALSE
+	scannable = SCANNABLE_SECRETIVE
 	supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
 	industrial_use = REFINERYEXPORT_REASON_MEDSCI
 
@@ -403,10 +406,11 @@
 		return
 	if(!(M.status_flags & FAKEDEATH))
 		M.emote("deathgasp")
+		M.tod = stationtime2text()
+		M.timeofdeath = world.time
 	M.status_flags |= FAKEDEATH
 	M.silent = max(M.silent, 10)
 	M.paralysis = max(M.paralysis, 10)
-	M.tod = stationtime2text()
 
 	if(prob(0.1))
 		M.visible_message("[M] wheezes.", "You wheeze sharply... it's cold.")
@@ -534,6 +538,7 @@
 	description = "Polytrinic acid is a an extremely corrosive chemical substance."
 	taste_description = "acid"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#8E18A9"
 	power = 10
 	meltdose = 4
@@ -546,6 +551,7 @@
 	description = "Some form of digestive slurry."
 	taste_description = "vomit"
 	reagent_state = LIQUID
+	scannable = SCANNABLE_ADVANCED
 	color = "#664330"
 	power = 2
 	meltdose = 30
@@ -619,6 +625,7 @@
 /datum/reagent/lexorin
 	name = REAGENT_LEXORIN
 	id = REAGENT_ID_LEXORIN
+	scannable = SCANNABLE_DIFFICULT
 	description = "Lexorin temporarily stops respiration. Causes tissue damage."
 	taste_description = "acid"
 	reagent_state = LIQUID
@@ -644,6 +651,7 @@
 /datum/reagent/mutagen
 	name = REAGENT_MUTAGEN
 	id = REAGENT_ID_MUTAGEN
+	scannable = SCANNABLE_ADVANCED
 	description = "Might cause unpredictable mutations. Keep away from children."
 	taste_description = "slime"
 	taste_mult = 0.9
@@ -711,6 +719,7 @@
 /datum/reagent/slimejelly
 	name = REAGENT_SLIMEJELLY
 	id = REAGENT_ID_SLIMEJELLY
+	scannable = SCANNABLE_ADVANCED
 	description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
 	taste_description = "slime"
 	taste_mult = 1.3
@@ -739,6 +748,7 @@
 /datum/reagent/soporific
 	name = REAGENT_STOXIN
 	id = REAGENT_ID_STOXIN
+	scannable = SCANNABLE_ADVANCED
 	description = "An effective hypnotic used to treat insomnia."
 	taste_description = "bitterness"
 	reagent_state = LIQUID
@@ -789,6 +799,7 @@
 /datum/reagent/chloralhydrate
 	name = REAGENT_CHLORALHYDRATE
 	id = REAGENT_ID_CHLORALHYDRATE
+	scannable = SCANNABLE_ADVANCED
 	description = "A powerful sedative."
 	taste_description = "bitterness"
 	reagent_state = SOLID
@@ -843,6 +854,7 @@
 /datum/reagent/chloralhydrate/beer2 //disguised as normal beer for use by emagged brobots
 	name = REAGENT_BEER2
 	id = REAGENT_ID_BEER2
+	scannable = SCANNABLE_SECRETIVE
 	description = "An alcoholic beverage made from malted grains, hops, yeast, and water. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong.
 	taste_description = "beer"
 	reagent_state = LIQUID
@@ -859,6 +871,7 @@
 	id = REAGENT_ID_SEROTROTIUM
 	description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
 	taste_description = "bitterness"
+	scannable = SCANNABLE_ADVANCED
 	reagent_state = LIQUID
 	color = "#202040"
 	metabolism = REM * 0.25
@@ -895,6 +908,7 @@
 /datum/reagent/cryptobiolin
 	name = REAGENT_CRYPTOBIOLIN
 	id = REAGENT_ID_CRYPTOBIOLIN
+	scannable = SCANNABLE_ADVANCED
 	description = "Cryptobiolin causes confusion and dizzyness."
 	taste_description = "sourness"
 	reagent_state = LIQUID
@@ -920,6 +934,7 @@
 /datum/reagent/impedrezene
 	name = REAGENT_IMPEDREZENE
 	id = REAGENT_ID_IMPEDREZENE
+	scannable = SCANNABLE_ADVANCED
 	description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
 	taste_description = "numbness"
 	reagent_state = LIQUID
@@ -943,6 +958,7 @@
 /datum/reagent/mindbreaker
 	name = REAGENT_MINDBREAKER
 	id = REAGENT_ID_MINDBREAKER
+	scannable = SCANNABLE_DIFFICULT
 	description = "A powerful hallucinogen that causes immediate, prolonged hallucinations in its users."
 	taste_description = "sourness"
 	reagent_state = LIQUID
@@ -972,6 +988,7 @@
 /datum/reagent/slimetoxin
 	name = REAGENT_MUTATIONTOXIN
 	id = REAGENT_ID_MUTATIONTOXIN
+	scannable = SCANNABLE_DIFFICULT
 	description = "A corruptive toxin produced by slimes."
 	taste_description = "sludge"
 	reagent_state = LIQUID
@@ -1001,6 +1018,7 @@
 /datum/reagent/aslimetoxin
 	name = REAGENT_DOCILITYTOXIN
 	id = REAGENT_ID_DOCILITYTOXIN
+	scannable = SCANNABLE_DIFFICULT
 	description = "A corruptive toxin produced by slimes."
 	taste_description = "sludge"
 	reagent_state = LIQUID
@@ -1035,6 +1053,7 @@
 /datum/reagent/shredding_nanites
 	name = REAGENT_SHREDDINGNANITES
 	id = REAGENT_ID_SHREDDINGNANITES
+	scannable = SCANNABLE_SECRETIVE
 	description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be malfunctioning."
 	taste_description = "metal"
 	reagent_state = SOLID
@@ -1052,6 +1071,7 @@
 /datum/reagent/irradiated_nanites
 	name = REAGENT_IRRADIATEDNANITES
 	id = REAGENT_ID_IRRADIATEDNANITES
+	scannable = SCANNABLE_SECRETIVE
 	description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be malfunctioning."
 	taste_description = "metal"
 	reagent_state = SOLID
@@ -1069,6 +1089,7 @@
 /datum/reagent/neurophage_nanites
 	name = REAGENT_NEUROPHAGENANITES
 	id = REAGENT_ID_NEUROPHAGENANITES
+	scannable = SCANNABLE_SECRETIVE
 	description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be completely hostile."
 	taste_description = "metal"
 	reagent_state = SOLID
@@ -1087,6 +1108,7 @@
 /datum/reagent/salmonella
 	name = REAGENT_SALMONELLA
 	id = REAGENT_ID_SALMONELLA
+	scannable = SCANNABLE_ADVANCED
 	description = "A nasty bacteria found in spoiled food."
 	reagent_state = LIQUID
 	color = "#1E4600"

code/modules/reagents/reagents/virology.dm

@@ -3,6 +3,7 @@
 	id = REAGENT_ID_VACCINE
 	description = "Liquid vaccine against some type of virus."
 	color = "#C81040"
+	scannable = SCANNABLE_BENEFICIAL
 	taste_description = "antibodies"
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_MEDSCI

code/modules/reagents/reagents/vore_ch.dm

@@ -5,6 +5,7 @@
 	description = "A frothy green liquid, for causing cellular-level hetrogenous structure merging."
 	reagent_state = LIQUID
 	color = "#10881A"
+	scannable = SCANNABLE_BENEFICIAL
 	overdose = REAGENTS_OVERDOSE
 	supply_conversion_value = REFINERYEXPORT_VALUE_RARE
 	industrial_use = REFINERYEXPORT_REASON_ILLDRUG

code/modules/reagents/reagents/vore_vr.dm

@@ -10,6 +10,7 @@
 	reagent_state = LIQUID
 	color = "#FFFF00" // rgb: 255, 255, 0
 	metabolism = 0.01
+	scannable = SCANNABLE_BENEFICIAL
 	mrate_static = TRUE
 	supply_conversion_value = REFINERYEXPORT_VALUE_GODTIER
 	industrial_use = REFINERYEXPORT_REASON_MEDSCI
@@ -22,6 +23,7 @@
 /datum/reagent/microcillin
 	name = REAGENT_MICROCILLIN
 	id = REAGENT_ID_MICROCILLIN
+	scannable = SCANNABLE_BENEFICIAL
 	description = "Murky purple liquid."
 	reagent_state = LIQUID
 	color = "#800080"
@@ -39,6 +41,7 @@
 /datum/reagent/normalcillin
 	name = REAGENT_NORMALCILLIN
 	id = REAGENT_ID_NORMALCILLIN
+	scannable = SCANNABLE_BENEFICIAL
 	description = "Translucent cyan liquid."
 	reagent_state = LIQUID
 	color = "#00FFFF"
@@ -58,6 +61,7 @@
 /datum/reagent/sizeoxadone
 	name = REAGENT_SIZEOXADONE
 	id = REAGENT_ID_SIZEOXADONE
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A volatile liquid used as a precursor to size-altering chemicals. Causes dizziness if taken unprocessed."
 	reagent_state = LIQUID
 	color = "#1E90FF"
@@ -77,6 +81,7 @@
 /datum/reagent/ickypak
 	name = REAGENT_ICKYPAK
 	id = REAGENT_ID_ICKYPAK
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
 	reagent_state = LIQUID
 	color = "#0E900E"
@@ -101,6 +106,7 @@
 /datum/reagent/unsorbitol
 	name = REAGENT_UNSORBITOL
 	id = REAGENT_ID_UNSORBITOL
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A frothy pink liquid, for causing cellular-level hetrogenous structure separation."
 	reagent_state = LIQUID
 	color = "#EF77E5"
@@ -134,6 +140,7 @@
 /datum/reagent/amorphorovir
 	name = REAGENT_AMORPHOROVIR
 	id = REAGENT_ID_AMORPHOROVIR
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A base medical concoction, capable of rapidly altering genetic and physical structure of the body. Requires extra processing to allow for a targeted transformation."
 	reagent_state = LIQUID
 	color = "#AAAAAA"
@@ -143,6 +150,7 @@
 /datum/reagent/androrovir
 	name = REAGENT_ANDROROVIR
 	id = REAGENT_ID_ANDROROVIR
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be male."
 	reagent_state = LIQUID
 	color = "#00BBFF"
@@ -166,6 +174,7 @@
 /datum/reagent/gynorovir
 	name = REAGENT_GYNOROVIR
 	id = REAGENT_ID_GYNOROVIR
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be female."
 	reagent_state = LIQUID
 	color = "#FF00AA"
@@ -189,6 +198,7 @@
 /datum/reagent/androgynorovir
 	name = REAGENT_ANDROGYNOROVIR
 	id = REAGENT_ID_ANDROGYNOROVIR
+	scannable = SCANNABLE_BENEFICIAL
 	description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be mixed."
 	reagent_state = LIQUID
 	color = "#6600FF"
@@ -240,6 +250,7 @@
 /datum/reagent/paralysis_toxin
 	name = REAGENT_PARALYSISTOXIN
 	id = REAGENT_ID_PARALYSISTOXIN
+	scannable = SCANNABLE_ADVANCED
 	description = "A potent toxin commonly found in a plethora of species. When exposed to the toxin, causes extreme, paralysis for a prolonged period, with only essential functions of the body being unhindered. Commonly used by covert operatives and used as a crowd control tool."
 	taste_description = "bitterness"
 	reagent_state = LIQUID
@@ -258,6 +269,7 @@
 /datum/reagent/pain_enzyme
 	name = REAGENT_PAINENZYME
 	id = REAGENT_ID_PAINENZYME
+	scannable = SCANNABLE_ADVANCED
 	description = "An enzyme found in a variety of species. When exposed to the toxin, will cause severe, agonizing pain. The effects can last for hours depending on the dose. Only known cure is an equally strong painkiller or dialysis."
 	taste_description = "sourness"
 	reagent_state = LIQUID
@@ -277,6 +289,7 @@
 /datum/reagent/aphrodisiac
 	name = REAGENT_APHRODISIAC
 	id = REAGENT_ID_APHRODISIAC
+	scannable = SCANNABLE_ADVANCED
 	description = "You so horny."
 	taste_description = "sweetness"
 	reagent_state = LIQUID