Merge branch 'master' into heart_damage

code/modules/reagents/Chemistry-Holder.dm

@@ -383,7 +383,7 @@
 			return trans_to_holder(R, amount, multiplier, copy)
 		if(type == CHEM_INGEST)
 			var/datum/reagents/R = C.ingested
-			return trans_to_holder(R, amount, multiplier, copy)
+			return C.ingest(src, R, amount, multiplier, copy)
 		if(type == CHEM_TOUCH)
 			var/datum/reagents/R = C.touching
 			return trans_to_holder(R, amount, multiplier, copy)

code/modules/reagents/Chemistry-Reagents.dm

@@ -14,6 +14,8 @@
 	var/name = "Reagent"
 	var/id = "reagent"
 	var/description = "A non-descript chemical."
+	var/taste_description = "bitterness"
+	var/taste_mult = 1 //how this taste compares to others. Higher values means it is more noticable
 	var/datum/reagents/holder = null
 	var/reagent_state = SOLID
 	var/list/data = null

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -2,6 +2,8 @@
 	data = new/list("donor" = null, "viruses" = null, "species" = "Human", "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, "antibodies" = list())
 	name = "Blood"
 	id = "blood"
+	taste_description = "iron"
+	taste_mult = 1.3
 	reagent_state = LIQUID
 	metabolism = REM * 5
 	mrate_static = TRUE
@@ -74,6 +76,7 @@
 /datum/reagent/antibodies
 	data = list("antibodies"=list())
 	name = "Antibodies"
+	taste_description = "slime"
 	id = "antibodies"
 	reagent_state = LIQUID
 	color = "#0050F0"
@@ -88,6 +91,7 @@
 /datum/reagent/water
 	name = "Water"
 	id = "water"
+	taste_description = "water"
 	description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
 	reagent_state = LIQUID
 	color = "#0064C877"
@@ -150,6 +154,7 @@
 	name = "Welding fuel"
 	id = "fuel"
 	description = "Required for welders. Flamable."
+	taste_description = "gross metal"
 	reagent_state = LIQUID
 	color = "#660000"
 

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm

@@ -2,13 +2,17 @@
 	name = "Aluminum"
 	id = "aluminum"
 	description = "A silvery white and ductile member of the boron group of chemical elements."
+	taste_description = "metal"
+	taste_mult = 1.1
 	reagent_state = SOLID
 	color = "#A8A8A8"
 
 /datum/reagent/carbon
 	name = "Carbon"
 	id = "carbon"
-	description = "A chemical element, the builing block of life."
+	description = "A chemical element, the building block of life."
+	taste_description = "sour chalk"
+	taste_mult = 1.5
 	reagent_state = SOLID
 	color = "#1C1300"
 	ingest_met = REM * 5
@@ -37,6 +41,7 @@
 	name = "Chlorine"
 	id = "chlorine"
 	description = "A chemical element with a characteristic odour."
+	taste_description = "pool water"
 	reagent_state = GAS
 	color = "#808080"
 
@@ -50,12 +55,14 @@
 	name = "Copper"
 	id = "copper"
 	description = "A highly ductile metal."
+	taste_description = "pennies"
 	color = "#6E3B08"
 
 /datum/reagent/ethanol
 	name = "Ethanol" //Parent class for all alcoholic reagents.
 	id = "ethanol"
 	description = "A well-known alcohol with a variety of applications."
+	taste_description = "pure alcohol"
 	reagent_state = LIQUID
 	color = "#404030"
 	var/nutriment_factor = 0
@@ -142,6 +149,7 @@
 	name = "Fluorine"
 	id = "fluorine"
 	description = "A highly-reactive chemical element."
+	taste_description = "acid"
 	reagent_state = GAS
 	color = "#808080"
 
@@ -155,6 +163,7 @@
 	name = "Hydrogen"
 	id = "hydrogen"
 	description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
+	taste_mult = 0 //no taste
 	reagent_state = GAS
 	color = "#808080"
 
@@ -162,6 +171,7 @@
 	name = "Iron"
 	id = "iron"
 	description = "Pure iron is a metal."
+	taste_description = "metal"
 	reagent_state = SOLID
 	color = "#353535"
 
@@ -173,6 +183,7 @@
 	name = "Lithium"
 	id = "lithium"
 	description = "A chemical element, used as antidepressant."
+	taste_description = "metal"
 	reagent_state = SOLID
 	color = "#808080"
 
@@ -187,6 +198,7 @@
 	name = "Mercury"
 	id = "mercury"
 	description = "A chemical element."
+	taste_mult = 0 //mercury apparently is tasteless. IDK
 	reagent_state = LIQUID
 	color = "#484848"
 
@@ -202,6 +214,7 @@
 	name = "Nitrogen"
 	id = "nitrogen"
 	description = "A colorless, odorless, tasteless gas."
+	taste_mult = 0 //no taste
 	reagent_state = GAS
 	color = "#808080"
 
@@ -209,6 +222,7 @@
 	name = "Oxygen"
 	id = "oxygen"
 	description = "A colorless, odorless gas."
+	taste_mult = 0
 	reagent_state = GAS
 	color = "#808080"
 
@@ -220,6 +234,7 @@
 	name = "Phosphorus"
 	id = "phosphorus"
 	description = "A chemical element, the backbone of biological energy carriers."
+	taste_description = "vinegar"
 	reagent_state = SOLID
 	color = "#832828"
 
@@ -227,6 +242,7 @@
 	name = "Potassium"
 	id = "potassium"
 	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
 	color = "#A0A0A0"
 
@@ -234,6 +250,7 @@
 	name = "Radium"
 	id = "radium"
 	description = "Radium is an alkaline earth metal. It is extremely radioactive."
+	taste_mult = 0	//Apparently radium is tasteless
 	reagent_state = SOLID
 	color = "#C7C7C7"
 
@@ -266,6 +283,7 @@
 	name = "Sulphuric acid"
 	id = "sacid"
 	description = "A very corrosive mineral acid with the molecular formula H2SO4."
+	taste_description = "acid"
 	reagent_state = LIQUID
 	color = "#DB5008"
 	metabolism = REM * 2
@@ -352,6 +370,7 @@
 	name = "Silicon"
 	id = "silicon"
 	description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
+	taste_mult = 0
 	reagent_state = SOLID
 	color = "#A8A8A8"
 
@@ -359,6 +378,7 @@
 	name = "Sodium"
 	id = "sodium"
 	description = "A chemical element, readily reacts with water."
+	taste_description = "salty metal"
 	reagent_state = SOLID
 	color = "#808080"
 
@@ -366,6 +386,8 @@
 	name = "Sugar"
 	id = "sugar"
 	description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
+	taste_description = "sugar"
+	taste_mult = 1.8
 	reagent_state = SOLID
 	color = "#FFFFFF"
 
@@ -398,6 +420,7 @@
 	name = "Sulfur"
 	id = "sulfur"
 	description = "A chemical element with a pungent smell."
+	taste_description = "old eggs"
 	reagent_state = SOLID
 	color = "#BF8C00"
 
@@ -405,5 +428,7 @@
 	name = "Tungsten"
 	id = "tungsten"
 	description = "A chemical element, and a strong oxidising agent."
+	taste_description = "metal"
+	taste_mult = 0 //no taste
 	reagent_state = SOLID
 	color = "#DCDCDC"

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm

@@ -4,6 +4,7 @@
 	name = "Inaprovaline"
 	id = "inaprovaline"
 	description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#00BFFF"
 	overdose = REAGENTS_OVERDOSE * 2
@@ -20,6 +21,8 @@
 	name = "Bicaridine"
 	id = "bicaridine"
 	description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
+	taste_description = "bitterness"
+	taste_mult = 3
 	reagent_state = LIQUID
 	color = "#BF0000"
 	overdose = REAGENTS_OVERDOSE
@@ -33,6 +36,7 @@
 	name = "Kelotane"
 	id = "kelotane"
 	description = "Kelotane is a drug used to treat burns."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#FFA800"
 	overdose = REAGENTS_OVERDOSE
@@ -46,6 +50,8 @@
 	name = "Dermaline"
 	id = "dermaline"
 	description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
+	taste_description = "bitterness"
+	taste_mult = 1.5
 	reagent_state = LIQUID
 	color = "#FF8000"
 	overdose = REAGENTS_OVERDOSE * 0.5
@@ -59,6 +65,7 @@
 	name = "Dylovene"
 	id = "anti_toxin"
 	description = "Dylovene is a broad-spectrum antitoxin."
+	taste_description = "a roll of gauze"
 	reagent_state = LIQUID
 	color = "#00A000"
 	scannable = 1
@@ -96,6 +103,7 @@
 	name = "Dexalin"
 	id = "dexalin"
 	description = "Dexalin is used in the treatment of oxygen deprivation."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#0080FF"
 	overdose = REAGENTS_OVERDOSE
@@ -113,6 +121,7 @@
 	name = "Dexalin Plus"
 	id = "dexalinp"
 	description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#0040FF"
 	mrate_static = TRUE	//Until it's not crazy strong, at least
@@ -131,6 +140,7 @@
 	name = "Tricordrazine"
 	id = "tricordrazine"
 	description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#8040FF"
 	scannable = 1
@@ -145,6 +155,7 @@
 	name = "Cryoxadone"
 	id = "cryoxadone"
 	description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
+	taste_description = "overripe bananas"
 	reagent_state = LIQUID
 	color = "#8080FF"
 	metabolism = REM * 0.5
@@ -162,6 +173,7 @@
 	name = "Clonexadone"
 	id = "clonexadone"
 	description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube."
+	taste_description = "rotten bananas"
 	reagent_state = LIQUID
 	color = "#80BFFF"
 	metabolism = REM * 0.5
@@ -181,6 +193,7 @@
 	name = "Paracetamol"
 	id = "paracetamol"
 	description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = 60
@@ -199,6 +212,7 @@
 	name = "Tramadol"
 	id = "tramadol"
 	description = "A simple, yet effective painkiller."
+	taste_description = "sourness"
 	reagent_state = LIQUID
 	color = "#CB68FC"
 	overdose = 30
@@ -217,6 +231,7 @@
 	name = "Oxycodone"
 	id = "oxycodone"
 	description = "An effective and very addictive painkiller."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#800080"
 	overdose = 20
@@ -239,6 +254,7 @@
 	name = "Synaptizine"
 	id = "synaptizine"
 	description = "Synaptizine is used to treat various diseases."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#99CCFF"
 	metabolism = REM * 0.05
@@ -261,6 +277,7 @@
 	name = "Alkysine"
 	id = "alkysine"
 	description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#FFFF66"
 	metabolism = REM * 0.25
@@ -277,6 +294,7 @@
 	name = "Imidazoline"
 	id = "imidazoline"
 	description = "Heals eye damage"
+	taste_description = "dull toxin"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE
@@ -300,6 +318,7 @@
 	name = "Peridaxon"
 	id = "peridaxon"
 	description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#561EC3"
 	overdose = 10
@@ -371,6 +390,7 @@
 	name = "Ryetalyn"
 	id = "ryetalyn"
 	description = "Ryetalyn can cure all genetic abnomalities via a catalytic process."
+	taste_description = "acid"
 	reagent_state = SOLID
 	color = "#004000"
 	overdose = REAGENTS_OVERDOSE
@@ -391,6 +411,7 @@
 	name = "Ethylredoxrazine"
 	id = "ethylredoxrazine"
 	description = "A powerful oxidizer that reacts with ethanol."
+	taste_description = "bitterness"
 	reagent_state = SOLID
 	color = "#605048"
 	overdose = REAGENTS_OVERDOSE
@@ -411,6 +432,7 @@
 	name = "Hyronalin"
 	id = "hyronalin"
 	description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#408000"
 	metabolism = REM * 0.25
@@ -426,6 +448,7 @@
 	name = "Arithrazine"
 	id = "arithrazine"
 	description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#008000"
 	metabolism = REM * 0.25
@@ -444,6 +467,7 @@
 	name = "Spaceacillin"
 	id = "spaceacillin"
 	description = "An all-purpose antiviral agent."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#C1C1C1"
 	metabolism = REM * 0.05
@@ -455,6 +479,7 @@
 	name = "Sterilizine"
 	id = "sterilizine"
 	description = "Sterilizes wounds in preparation for surgery and thoroughly removes blood."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	touch_met = 5
@@ -480,6 +505,7 @@
 	name = "Leporazine"
 	id = "leporazine"
 	description = "Leporazine can be use to stabilize an individuals body temperature."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE
@@ -523,6 +549,7 @@
 	name = "Methylphenidate"
 	id = "methylphenidate"
 	description = "Improves the ability to concentrate."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#BF80BF"
 	metabolism = 0.01
@@ -544,6 +571,7 @@
 	name = "Citalopram"
 	id = "citalopram"
 	description = "Stabilizes the mind a little."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#FF80FF"
 	metabolism = 0.01
@@ -565,6 +593,7 @@
 	name = "Paroxetine"
 	id = "paroxetine"
 	description = "Stabilizes the mind greatly, but has a chance of adverse effects."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#FF80BF"
 	metabolism = 0.01
@@ -584,4 +613,25 @@
 				M << "<span class='notice'>Your mind feels much more stable.</span>"
 			else
 				M << "<span class='warning'>Your mind breaks apart...</span>"
-				M.hallucination += 200
+				M.hallucination += 200
+
+/datum/reagent/rezadone
+	name = "Rezadone"
+	id = "rezadone"
+	description = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
+	taste_description = "bitterness"
+	reagent_state = SOLID
+	color = "#669900"
+	overdose = REAGENTS_OVERDOSE
+	scannable = 1
+
+/datum/reagent/rezadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	M.adjustCloneLoss(-20 * removed)
+	M.adjustOxyLoss(-2 * removed)
+	M.heal_organ_damage(20 * removed, 20 * removed)
+	M.adjustToxLoss(-20 * removed)
+	if(dose > 3)
+		M.status_flags &= ~DISFIGURED
+	if(dose > 10)
+		M.make_dizzy(5)
+		M.make_jittery(5)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm

@@ -4,6 +4,7 @@
 	name = "Crayon dust"
 	id = "crayon_dust"
 	description = "Intensely coloured powder obtained by grinding crayons."
+	taste_description = "powdered wax"
 	reagent_state = LIQUID
 	color = "#888888"
 	overdose = 5
@@ -52,6 +53,7 @@
 	name = "Paint"
 	id = "paint"
 	description = "This paint will stick to almost any object."
+	taste_description = "chalk"
 	reagent_state = LIQUID
 	color = "#808080"
 	overdose = REAGENTS_OVERDOSE * 0.5
@@ -108,6 +110,7 @@
 	name = "Adminordrazine"
 	id = "adminordrazine"
 	description = "It's magic. We don't have to explain it."
+	taste_description = "bwoink"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	affects_dead = 1 //This can even heal dead people.
@@ -146,6 +149,7 @@
 	name = "Gold"
 	id = "gold"
 	description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
+	taste_description = "metal"
 	reagent_state = SOLID
 	color = "#F7C430"
 
@@ -153,6 +157,7 @@
 	name = "Silver"
 	id = "silver"
 	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
 	color = "#D0D0D0"
 
@@ -160,6 +165,7 @@
 	name ="Uranium"
 	id = "uranium"
 	description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
+	taste_description = "metal"
 	reagent_state = SOLID
 	color = "#B8B8C0"
 
@@ -181,6 +187,7 @@
 	name = "Adrenaline"
 	id = "adrenaline"
 	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
 	color = "#C8A5DC"
 	mrate_static = TRUE
@@ -196,6 +203,7 @@
 	name = "Holy Water"
 	id = "holywater"
 	description = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality."
+	taste_description = "water"
 	color = "#E0E8EF"
 	mrate_static = TRUE
 
@@ -217,6 +225,8 @@
 	name = "Ammonia"
 	id = "ammonia"
 	description = "A caustic substance commonly used in fertilizer or household cleaners."
+	taste_description = "mordant"
+	taste_mult = 2
 	reagent_state = GAS
 	color = "#404030"
 
@@ -224,6 +234,7 @@
 	name = "Diethylamine"
 	id = "diethylamine"
 	description = "A secondary amine, mildly corrosive."
+	taste_description = "iron"
 	reagent_state = LIQUID
 	color = "#604030"
 
@@ -231,6 +242,7 @@
 	name = "Fluorosurfactant"
 	id = "fluorosurfactant"
 	description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
+	taste_description = "metal"
 	reagent_state = LIQUID
 	color = "#9E6B38"
 
@@ -238,6 +250,7 @@
 	name = "Foaming agent"
 	id = "foaming_agent"
 	description = "A agent that yields metallic foam when mixed with light metal and a strong acid."
+	taste_description = "metal"
 	reagent_state = SOLID
 	color = "#664B63"
 
@@ -245,6 +258,7 @@
 	name = "Thermite"
 	id = "thermite"
 	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
 	color = "#673910"
 	touch_met = 50
@@ -269,6 +283,7 @@
 	name = "Space cleaner"
 	id = "cleaner"
 	description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
+	taste_description = "sourness"
 	reagent_state = LIQUID
 	color = "#A5F0EE"
 	touch_met = 50
@@ -317,6 +332,7 @@
 	name = "Space Lube"
 	id = "lube"
 	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
 	color = "#009CA8"
 
@@ -330,6 +346,7 @@
 	name = "Silicate"
 	id = "silicate"
 	description = "A compound that can be used to reinforce glass."
+	taste_description = "plastic"
 	reagent_state = LIQUID
 	color = "#C7FFFF"
 
@@ -344,6 +361,7 @@
 	name = "Glycerol"
 	id = "glycerol"
 	description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
+	taste_description = "sweetness"
 	reagent_state = LIQUID
 	color = "#808080"
 
@@ -351,6 +369,7 @@
 	name = "Nitroglycerin"
 	id = "nitroglycerin"
 	description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
+	taste_description = "oil"
 	reagent_state = LIQUID
 	color = "#808080"
 
@@ -358,6 +377,8 @@
 	name = "Coolant"
 	id = "coolant"
 	description = "Industrial cooling substance."
+	taste_description = "sourness"
+	taste_mult = 1.1
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 
@@ -365,12 +386,14 @@
 	name = "Ultra Glue"
 	id = "glue"
 	description = "An extremely powerful bonding agent."
+	taste_description = "a special education class"
 	color = "#FFFFCC"
 
 /datum/reagent/woodpulp
 	name = "Wood Pulp"
 	id = "woodpulp"
 	description = "A mass of wood fibers."
+	taste_description = "wood"
 	reagent_state = LIQUID
 	color = "#B97A57"
 
@@ -378,6 +401,7 @@
 	name = "Luminol"
 	id = "luminol"
 	description = "A compound that interacts with blood on the molecular level."
+	taste_description = "metal"
 	reagent_state = LIQUID
 	color = "#F2F3F4"
 

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

@@ -1,13 +1,14 @@
 /* Toxins, poisons, venoms */
 
 /datum/reagent/toxin
-	name = "Toxin"
+	name = "toxin"
 	id = "toxin"
 	description = "A toxic chemical."
+	taste_description = "bitterness"
+	taste_mult = 1.2
 	reagent_state = LIQUID
 	color = "#CF3600"
 	metabolism = REM * 0.25 // 0.05 by default. Hopefully enough to get some help, or die horribly, whatever floats your boat
-	mrate_static = TRUE
 	var/strength = 4 // How much damage it deals per unit
 
 /datum/reagent/toxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
@@ -19,6 +20,7 @@
 	name = "Plasticide"
 	id = "plasticide"
 	description = "Liquid plastic, do not eat."
+	taste_description = "plastic"
 	reagent_state = LIQUID
 	color = "#CF3600"
 	strength = 5
@@ -27,6 +29,7 @@
 	name = "Amatoxin"
 	id = "amatoxin"
 	description = "A powerful poison derived from certain species of mushroom."
+	taste_description = "mushroom"
 	reagent_state = LIQUID
 	color = "#792300"
 	strength = 10
@@ -35,6 +38,7 @@
 	name = "Carpotoxin"
 	id = "carpotoxin"
 	description = "A deadly neurotoxin produced by the dreaded space carp."
+	taste_description = "fish"
 	reagent_state = LIQUID
 	color = "#003333"
 	strength = 10
@@ -50,6 +54,7 @@
 	name = "Phoron"
 	id = "phoron"
 	description = "Phoron in its liquid form."
+	taste_mult = 1.5
 	reagent_state = LIQUID
 	color = "#9D14DB"
 	strength = 30
@@ -84,6 +89,8 @@
 	name = "Cyanide"
 	id = "cyanide"
 	description = "A highly toxic chemical."
+	taste_description = "almond"
+	taste_mult = 0.6
 	reagent_state = LIQUID
 	color = "#CF3600"
 	strength = 20
@@ -98,6 +105,7 @@
 	name = "Hyperzine"
 	id = "hyperzine"
 	description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#FF3300"
 	overdose = REAGENTS_OVERDOSE * 0.5
@@ -115,6 +123,8 @@
 	name = "Stimm"
 	id = "stimm"
 	description = "A homemade stimulant with some serious side-effects."
+	taste_description = "sweetness"
+	taste_mult = 1.8
 	color = "#d0583a"
 	metabolism = REM * 3
 	overdose = 10
@@ -135,6 +145,7 @@
 	name = "Potassium Chloride"
 	id = "potassium_chloride"
 	description = "A delicious salt that stops the heart when injected into cardiac muscle."
+	taste_description = "salt"
 	reagent_state = SOLID
 	color = "#FFFFFF"
 	strength = 0
@@ -154,6 +165,7 @@
 	name = "Potassium Chlorophoride"
 	id = "potassium_chlorophoride"
 	description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!"
+	taste_description = "salt"
 	reagent_state = SOLID
 	color = "#FFFFFF"
 	strength = 10
@@ -173,6 +185,7 @@
 	name = "Zombie Powder"
 	id = "zombiepowder"
 	description = "A strong neurotoxin that puts the subject into a death-like state."
+	taste_description = "numbness"
 	reagent_state = SOLID
 	color = "#669900"
 	metabolism = REM
@@ -198,6 +211,8 @@
 	name = "fertilizer"
 	id = "fertilizer"
 	description = "A chemical mix good for growing plants with."
+	taste_description = "plant food"
+	taste_mult = 0.5
 	reagent_state = LIQUID
 	strength = 0.5 // It's not THAT poisonous.
 	color = "#664330"
@@ -218,6 +233,7 @@
 	name = "Plant-B-Gone"
 	id = "plantbgone"
 	description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
+	taste_mult = 1
 	reagent_state = LIQUID
 	color = "#49002E"
 	strength = 4
@@ -246,6 +262,7 @@
 	name = "Polytrinic acid"
 	id = "pacid"
 	description = "Polytrinic acid is a an extremely corrosive chemical substance."
+	taste_description = "acid"
 	reagent_state = LIQUID
 	color = "#8E18A9"
 	power = 10
@@ -255,6 +272,7 @@
 	name = "Lexorin"
 	id = "lexorin"
 	description = "Lexorin temporarily stops respiration. Causes tissue damage."
+	taste_description = "acid"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE
@@ -275,6 +293,8 @@
 	name = "Unstable mutagen"
 	id = "mutagen"
 	description = "Might cause unpredictable mutations. Keep away from children."
+	taste_description = "slime"
+	taste_mult = 0.9
 	reagent_state = LIQUID
 	color = "#13BC5E"
 
@@ -310,6 +330,8 @@
 	name = "Slime Jelly"
 	id = "slimejelly"
 	description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
+	taste_description = "slime"
+	taste_mult = 1.3
 	reagent_state = LIQUID
 	color = "#801E28"
 
@@ -326,6 +348,7 @@
 	name = "Soporific"
 	id = "stoxin"
 	description = "An effective hypnotic used to treat insomnia."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#009CA8"
 	metabolism = REM * 0.5
@@ -360,6 +383,7 @@
 	name = "Chloral Hydrate"
 	id = "chloralhydrate"
 	description = "A powerful sedative."
+	taste_description = "bitterness"
 	reagent_state = SOLID
 	color = "#000067"
 	metabolism = REM * 0.5
@@ -393,6 +417,7 @@
 	name = "Beer"
 	id = "beer2"
 	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
 	color = "#FFD300"
 
@@ -404,6 +429,8 @@
 	name = "Space drugs"
 	id = "space_drugs"
 	description = "An illegal chemical compound used as drug."
+	taste_description = "bitterness"
+	taste_mult = 0.4
 	reagent_state = LIQUID
 	color = "#60A584"
 	metabolism = REM * 0.5
@@ -427,6 +454,7 @@
 	name = "Serotrotium"
 	id = "serotrotium"
 	description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#202040"
 	metabolism = REM * 0.25
@@ -443,6 +471,7 @@
 	name = "Cryptobiolin"
 	id = "cryptobiolin"
 	description = "Cryptobiolin causes confusion and dizzyness."
+	taste_description = "sourness"
 	reagent_state = LIQUID
 	color = "#000055"
 	metabolism = REM * 0.5
@@ -461,6 +490,7 @@
 	name = "Impedrezene"
 	id = "impedrezene"
 	description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
+	taste_description = "numbness"
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE
@@ -480,6 +510,7 @@
 	name = "Mindbreaker Toxin"
 	id = "mindbreaker"
 	description = "A powerful hallucinogen, it can cause fatal effects in users."
+	taste_description = "sourness"
 	reagent_state = LIQUID
 	color = "#B31008"
 	metabolism = REM * 0.25
@@ -498,6 +529,7 @@
 	name = "Psilocybin"
 	id = "psilocybin"
 	description = "A strong psycotropic derived from certain species of mushroom."
+	taste_description = "mushroom"
 	color = "#E700E7"
 	overdose = REAGENTS_OVERDOSE
 	metabolism = REM * 0.5
@@ -538,6 +570,7 @@
 	name = "Nicotine"
 	id = "nicotine"
 	description = "A highly addictive stimulant extracted from the tobacco plant."
+	taste_description = "bitterness"
 	reagent_state = LIQUID
 	color = "#181818"
 
@@ -547,6 +580,7 @@
 	name = "Mutation Toxin"
 	id = "mutationtoxin"
 	description = "A corruptive toxin produced by slimes."
+	taste_description = "sludge"
 	reagent_state = LIQUID
 	color = "#13BC5E"
 
@@ -573,6 +607,7 @@
 	name = "Docility Toxin"
 	id = "docilitytoxin"
 	description = "A corruptive toxin produced by slimes."
+	taste_description = "sludge"
 	reagent_state = LIQUID
 	color = "#FF69B4"
 

code/modules/reagents/reagent_containers/dropper.dm

@@ -57,7 +57,7 @@
 						safe_thing = victim.glasses
 
 				if(safe_thing)
-					trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this)
+					trans = reagents.splash(safe_thing, amount_per_transfer_from_this, max_spill=30)
 					user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='notice'>You transfer [trans] units of the solution.</span>")
 					return
 
@@ -67,14 +67,15 @@
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]</font>")
 			msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
-			trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_INGEST)
+			trans += reagents.splash(target, reagents.total_volume/2, max_spill=30)
+			trans += reagents.trans_to_mob(target, reagents.total_volume/2, CHEM_BLOOD) //I guess it gets into the bloodstream through the eyes or something
 			user.visible_message("<span class='warning'>[user] squirts something into [target]'s eyes!</span>", "<span class='notice'>You transfer [trans] units of the solution.</span>")
 
 
 			return
 
 		else
-			trans = reagents.trans_to(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
+			trans = reagents.splash(target, amount_per_transfer_from_this, max_spill=30) //sprinkling reagents on generic non-mobs
 			user << "<span class='notice'>You transfer [trans] units of the solution.</span>"
 
 	else // Taking from something

code/modules/reagents/reagent_containers/syringes.dm

@@ -23,6 +23,7 @@
 	var/image/filling //holds a reference to the current filling overlay
 	var/visible_name = "a syringe"
 	var/time = 30
+	var/drawing = 0
 
 /obj/item/weapon/reagent_containers/syringe/on_reagent_change()
 	update_icon()
@@ -98,7 +99,12 @@
 						user << "<span class='warning'>You are unable to locate any blood.</span>"
 						return
 
+					if(drawing)
+						user << "<span class='warning'>You are already drawing blood from [T.name].</span>"
+						return
+
 					var/datum/reagent/B
+					drawing = 1
 					if(istype(T, /mob/living/carbon/human))
 						var/mob/living/carbon/human/H = T
 						if(H.species && !H.should_have_organ(O_HEART))
@@ -106,12 +112,16 @@
 						else
 							if(ismob(H) && H != user)
 								if(!do_mob(user, target, time))
+									drawing = 0
 									return
 							B = T.take_blood(src, amount)
+							drawing = 0
 					else
 						if(!do_mob(user, target, time))
+							drawing = 0
 							return
 						B = T.take_blood(src,amount)
+						drawing = 0
 
 					if (B)
 						reagents.reagent_list += B
@@ -200,7 +210,10 @@
 				admin_inject_log(user, target, src, contained, trans)
 			else
 				trans = reagents.trans_to(target, amount_per_transfer_from_this)
-			user << "<span class='notice'>You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>"
+			if(trans)
+				user << "<span class='notice'>You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>"
+			else
+				user << "<span class='notice'>The syringe is empty.</span>"
 			if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
 				mode = SYRINGE_DRAW
 				update_icon()