massive burndown (#29894)

2026-07-14 08:34:16 +01:00 · 2025-07-27 13:52:39 -07:00
parent a596fba80d
commit 1504ed98be
1043 changed files with 0 additions and 3598 deletions
@@ -1,8 +1,6 @@
 /obj/machinery/computer/pandemic
 	name = "PanD.E.M.I.C 2200"
 	desc = "Used to work with viruses."
-	density = TRUE
-	anchored = TRUE
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "pandemic0"
 	circuit = /obj/item/circuitboard/pandemic
@@ -3,7 +3,6 @@
 	desc = "A chef's 9th most powerful weapon, right after the grill. Used for grinding items into reagents."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "juicer1"
-	layer = 2.9
 	anchored = TRUE
 	idle_power_consumption = 5
 	active_power_consumption = 100
@@ -84,7 +84,6 @@
 	id = "gin"
 	description = "It's gin. In space. I say, good sir."
 	color = "#664300" // rgb: 102, 67, 0
-	dizzy_adj = 6 SECONDS
 	alcohol_perc = 0.5
 	drink_icon = "ginvodkaglass"
 	drink_name = "Glass of gin"
@@ -121,7 +120,6 @@
 	description = "Either someone's failure at cocktail making or attempt in alcohol production. In any case, do you really want to drink that?"
 	color = "#664300" // rgb: 102, 67, 0
 	dizzy_adj = 14 SECONDS
-	alcohol_perc = 1
 	drink_icon = "glass_brown2"
 	drink_name = "Hooch"
 	drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
@@ -240,7 +238,6 @@
 	description = "An unbelievably strong and potent variety of Cider."
 	color = "#CF3811"
 	dizzy_adj = 40 SECONDS
-	alcohol_perc = 1 //because that's a thing it's supposed to do, I guess
 	drink_icon = "suicider"
 	drink_name = "Suicider"
 	drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
@@ -262,7 +259,6 @@
 	name = "Thirteen Loko"
 	id = "thirteenloko"
 	description = "A potent mixture of caffeine and alcohol."
-	reagent_state = LIQUID
 	color = "#102000" // rgb: 16, 32, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	alcohol_perc = 0.3
@@ -287,7 +283,6 @@
 	name = "Bilk"
 	id = "bilk"
 	description = "This appears to be beer mixed with milk. Disgusting."
-	reagent_state = LIQUID
 	color = "#895C4C" // rgb: 137, 92, 76
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	alcohol_perc = 0.2
@@ -301,7 +296,6 @@
 	name = "Atomic Bomb"
 	id = "atomicbomb"
 	description = "Nuclear proliferation never tasted so good."
-	reagent_state = LIQUID
 	color = "#666300" // rgb: 102, 99, 0
 	alcohol_perc = 0.2
 	drink_icon = "atomicbombglass"
@@ -314,7 +308,6 @@
 	name = "Three Mile Island Iced Tea"
 	id = "threemileisland"
 	description = "Made for a woman, strong enough for a man."
-	reagent_state = LIQUID
 	color = "#666340" // rgb: 102, 99, 64
 	alcohol_perc = 0.2
 	drink_icon = "threemileislandglass"
@@ -327,7 +320,6 @@
 	name = "Goldschlager"
 	id = "goldschlager"
 	description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "ginvodkaglass"
@@ -339,7 +331,6 @@
 	name = "Patron"
 	id = "patron"
 	description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
-	reagent_state = LIQUID
 	color = "#585840" // rgb: 88, 88, 64
 	alcohol_perc = 0.4
 	drink_icon = "patronglass"
@@ -351,7 +342,6 @@
 	name = "Gin and Tonic"
 	id = "gintonic"
 	description = "An all time classic, mild cocktail."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "gintonicglass"
@@ -364,7 +354,6 @@
 	name = "Cuba Libre"
 	id = "cubalibre"
 	description = "Rum, mixed with cola. Viva la revolution."
-	reagent_state = LIQUID
 	color = "#3E1B00" // rgb: 62, 27, 0
 	alcohol_perc = 0.2
 	drink_icon = "cubalibreglass"
@@ -377,7 +366,6 @@
 	name = "Whiskey Cola"
 	id = "whiskeycola"
 	description = "Whiskey, mixed with cola. Surprisingly refreshing."
-	reagent_state = LIQUID
 	color = "#3E1B00" // rgb: 62, 27, 0
 	alcohol_perc = 0.3
 	drink_icon = "whiskeycolaglass"
@@ -390,7 +378,6 @@
 	name = "Daiquiri"
 	id = "daiquiri"
 	description = "Lime juice and sugar mixed with rum. A sweet and refreshing mix."
-	reagent_state = LIQUID
 	color = "#61d961" // rgb: 38, 85, 38
 	alcohol_perc = 0.4
 	drink_icon = "daiquiriglass"
@@ -403,7 +390,6 @@
 	name = "Classic Martini"
 	id = "martini"
 	description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.5
 	drink_icon = "martiniglass"
@@ -416,7 +402,6 @@
 	name = "Vodka Martini"
 	id = "vodkamartini"
 	description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "martiniglass"
@@ -429,7 +414,6 @@
 	name = "White Russian"
 	id = "whiterussian"
 	description = "That's just, like, your opinion, man..."
-	reagent_state = LIQUID
 	color = "#A68340" // rgb: 166, 131, 64
 	alcohol_perc = 0.3
 	drink_icon = "whiterussianglass"
@@ -442,7 +426,6 @@
 	name = "Screwdriver"
 	id = "screwdrivercocktail"
 	description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
-	reagent_state = LIQUID
 	color = "#A68310" // rgb: 166, 131, 16
 	alcohol_perc = 0.3
 	drink_icon = "screwdriverglass"
@@ -455,7 +438,6 @@
 	name = "Booger"
 	id = "booger"
 	description = "Eww..."
-	reagent_state = LIQUID
 	color = "#A68310" // rgb: 166, 131, 16
 	alcohol_perc = 0.2
 	drink_icon = "booger"
@@ -468,7 +450,6 @@
 	name = "Bloody Mary"
 	id = "bloodymary"
 	description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "bloodymaryglass"
@@ -481,7 +462,6 @@
 	name = "Pan-Galactic Gargle Blaster"
 	id = "gargleblaster"
 	description = "Whoah, this stuff looks volatile!"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.7 //ouch
 	drink_icon = "gargleblasterglass"
@@ -494,7 +474,6 @@
 	name = "Flaming Moe"
 	id = "flamingmoe"
 	description = "This appears to be a mixture of various alcohols blended with prescription medicine. It is lightly toasted..."
-	reagent_state = LIQUID
 	color = "#58447f" //rgb: 88, 66, 127
 	alcohol_perc = 0.5
 	drink_icon = "flamingmoeglass"
@@ -507,7 +486,6 @@
 	name = "Brave Bull"
 	id = "bravebull"
 	description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.3
 	drink_icon = "bravebullglass"
@@ -519,7 +497,6 @@
 	name = "Tequila Sunrise"
 	id = "tequilasunrise"
 	description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.3
 	drink_icon = "tequilasunriseglass"
@@ -532,7 +509,6 @@
 	name = "Toxins Special"
 	id = "toxinsspecial"
 	description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.5
 	drink_icon = "toxinsspecialglass"
@@ -550,7 +526,6 @@
 	name = "Beepsky Smash"
 	id = "beepskysmash"
 	description = "Deny drinking this and prepare for THE LAW."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.5
 	drink_icon = "beepskysmashglass"
@@ -563,7 +538,6 @@
 	name = "Irish Cream"
 	id = "irishcream"
 	description = "Whiskey-imbued cream, what else would you expect from the Irish."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.3
 	drink_icon = "irishcreamglass"
@@ -575,7 +549,6 @@
 	name = "The Manly Dorf"
 	id = "manlydorf"
 	description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "manlydorfglass"
@@ -588,7 +561,6 @@
 	name = "Long Island Iced Tea"
 	id = "longislandicedtea"
 	description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.5
 	drink_icon = "longislandicedteaglass"
@@ -601,7 +573,6 @@
 	name = "Moonshine"
 	id = "moonshine"
 	description = "You've really hit rock bottom now... your liver packed its bags and left last night."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.8 //yeeehaw
 	drink_icon = "glass_clear"
@@ -614,7 +585,6 @@
 	name = "B-52"
 	id = "b52"
 	description = "Coffee, Irish Cream, and congac. You will get bombed."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.3
 	drink_icon = "b52glass"
@@ -627,7 +597,6 @@
 	name = "Irish Coffee"
 	id = "irishcoffee"
 	description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "irishcoffeeglass"
@@ -640,7 +609,6 @@
 	name = "Margarita"
 	id = "margarita"
 	description = "On the rocks with salt on the rim. Arriba~!"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.3
 	drink_icon = "margaritaglass"
@@ -653,7 +621,6 @@
 	name = "Black Russian"
 	id = "blackrussian"
 	description = "For the lactose-intolerant. Still as classy as a White Russian."
-	reagent_state = LIQUID
 	color = "#360000" // rgb: 54, 0, 0
 	alcohol_perc = 0.4
 	drink_icon = "blackrussianglass"
@@ -666,7 +633,6 @@
 	name = "Manhattan"
 	id = "manhattan"
 	description = "The Detective's undercover drink of choice. He never could stomach gin..."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "manhattanglass"
@@ -678,7 +644,6 @@
 	name = "Manhattan Project"
 	id = "manhattan_proj"
 	description = "A scientist's drink of choice, for pondering ways to blow up the station."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "proj_manhattanglass"
@@ -691,7 +656,6 @@
 	name = "Whiskey Soda"
 	id = "whiskeysoda"
 	description = "Ultimate refreshment."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.3
 	drink_icon = "whiskeysodaglass2"
@@ -704,7 +668,6 @@
 	name = "Anti-freeze"
 	id = "antifreeze"
 	description = "Ultimate refreshment."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "antifreeze"
@@ -722,7 +685,6 @@
 	name = "Admin Freeze"
 	id = "adminfreeze"
 	description = "Ultimate Punishment."
-	reagent_state = LIQUID
 	color = "#30F0FF" // rgb: 048, 240, 255
 	dizzy_adj = 8 SECONDS
 	alcohol_perc = 1.5 // oof
@@ -742,7 +704,6 @@
 	name = "Barefoot"
 	id = "barefoot"
 	description = "Barefoot and pregnant"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "b&p"
@@ -755,7 +716,6 @@
 	name = "Snow White"
 	id = "snowwhite"
 	description = "A cold refreshment"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "snowwhite"
@@ -768,7 +728,6 @@
 	name = "Demons Blood"
 	id = "demonsblood"
 	description = "AHHHH!!!!"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	dizzy_adj = 20 SECONDS
 	alcohol_perc = 0.4
@@ -782,7 +741,6 @@
 	name = "Vodka and Tonic"
 	id = "vodkatonic"
 	description = "For when a gin and tonic isn't russian enough."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	dizzy_adj = 8 SECONDS
 	alcohol_perc = 0.3
@@ -796,7 +754,6 @@
 	name = "Gin Fizz"
 	id = "ginfizz"
 	description = "Refreshingly lemony, deliciously dry."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	dizzy_adj = 8 SECONDS
 	alcohol_perc = 0.4
@@ -810,7 +767,6 @@
 	name = "Bahama mama"
 	id = "bahama_mama"
 	description = "Tropic cocktail."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "bahama_mama"
@@ -823,7 +779,6 @@
 	name = "Singulo"
 	id = "singulo"
 	description = "The edge of eternity, contained in a glass."
-	reagent_state = LIQUID
 	color = "#2E6671" // rgb: 46, 102, 113
 	dizzy_adj = 30 SECONDS
 	alcohol_perc = 0.7
@@ -837,7 +792,6 @@
 	name = "Sbiten"
 	id = "sbiten"
 	description = "A spicy Vodka! Might be a little hot for the little guys!"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "sbitenglass"
@@ -855,7 +809,6 @@
 	name = "Devils Kiss"
 	id = "devilskiss"
 	description = "Creepy time!"
-	reagent_state = LIQUID
 	color = "#A68310" // rgb: 166, 131, 16
 	alcohol_perc = 0.3
 	drink_icon = "devilskiss"
@@ -868,7 +821,6 @@
 	name = "Red Mead"
 	id = "red_mead"
 	description = "The true Viking drink! Even though it has a strange red color."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "red_meadglass"
@@ -881,7 +833,6 @@
 	name = "Mead"
 	id = "mead"
 	description = "A Vikings drink, though a cheap one."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	alcohol_perc = 0.2
@@ -894,7 +845,6 @@
 	name = "Iced Beer"
 	id = "iced_beer"
 	description = "A beer which is so cold the air around it freezes."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "iced_beerglass"
@@ -911,7 +861,6 @@
 	name = "Grog"
 	id = "grog"
 	description = "Watered down rum, Nanotrasen approves!"
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "grogglass"
@@ -924,7 +873,6 @@
 	name = "Aloe"
 	id = "aloe"
 	description = "So very, very, very good."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.2
 	drink_icon = "aloe"
@@ -937,7 +885,6 @@
 	name = "Andalusia"
 	id = "andalusia"
 	description = "A nice, strange named drink."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.4
 	drink_icon = "andalusia"
@@ -950,7 +897,6 @@
 	name = "Allies Cocktail"
 	id = "alliescocktail"
 	description = "A drink made from your allies."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.5
 	drink_icon = "alliescocktail"
@@ -963,7 +909,6 @@
 	name = "Acid Spit"
 	id = "acidspit"
 	description = "A drink by Nanotrasen. Made from live aliens."
-	reagent_state = LIQUID
 	color = "#365000" // rgb: 54, 80, 0
 	alcohol_perc = 0.3
 	drink_icon = "acidspitglass"
@@ -976,7 +921,6 @@
 	name = "Amasec"
 	id = "amasec"
 	description = "Official drink of the Imperium."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	alcohol_perc = 0.3
 	drink_icon = "amasecglass"
@@ -989,7 +933,6 @@
 	name = "Neuro-toxin"
 	id = "neurotoxin"
 	description = "A strong neurotoxin that puts the subject into a death-like state."
-	reagent_state = LIQUID
 	color = "#2E2E61" // rgb: 46, 46, 97
 	dizzy_adj = 12 SECONDS
 	alcohol_perc = 0.7
@@ -1014,7 +957,6 @@
 	name = "Hippie's Delight"
 	id = "hippiesdelight"
 	description = "You just don't get it maaaan."
-	reagent_state = LIQUID
 	color = "#664300" // rgb: 102, 67, 0
 	metabolization_rate = 0.2 * REAGENTS_METABOLISM
 	drink_icon = "hippiesdelightglass"
@@ -1052,7 +994,6 @@
 	name = "Changeling Sting"
 	id = "changelingsting"
 	description = "A stingy drink."
-	reagent_state = LIQUID
 	color = "#2E6671" // rgb: 46, 102, 113
 	alcohol_perc = 0.7
 	dizzy_adj = 10 SECONDS
@@ -1066,7 +1007,6 @@
 	name = "Dublin Drop"
 	id = "dublindrop"
 	description = "Mmm, tastes like chocolate cake..."
-	reagent_state = LIQUID
 	color = "#2E6671" // rgb: 46, 102, 113
 	alcohol_perc = 0.3
 	dizzy_adj = 10 SECONDS
@@ -1080,7 +1020,6 @@
 	name = "Syndicate Bomb"
 	id = "syndicatebomb"
 	description = "A Syndicate bomb"
-	reagent_state = LIQUID
 	color = "#2E6671" // rgb: 46, 102, 113
 	alcohol_perc = 0.2
 	drink_icon = "syndicatebomb"
@@ -1093,7 +1032,6 @@
 	name = "Erika Surprise"
 	id = "erikasurprise"
 	description = "The surprise is, it's green!"
-	reagent_state = LIQUID
 	color = "#2E6671" // rgb: 46, 102, 113
 	alcohol_perc = 0.2
 	drink_icon = "erikasurprise"
@@ -1222,9 +1160,7 @@
 	name = "Dragon's Breath"
 	id = "dragonsbreath"
 	description = "Possessing this stuff probably breaks the Geneva convention."
-	reagent_state = LIQUID
 	color = "#DC0000"
-	alcohol_perc = 1
 	taste_description = "<span class='userdanger'>LIQUID FUCKING DEATH OH GOD WHAT THE FUCK</span>"

 /datum/reagent/consumable/ethanol/dragons_breath/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -1270,7 +1206,6 @@
 	name = "Synthanol"
 	id = "synthanol"
 	description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
-	reagent_state = LIQUID
 	color = "#1BB1FF"
 	process_flags = ORGANIC | SYNTHETIC
 	alcohol_perc = 0.5
@@ -1298,7 +1233,6 @@
 	name = "Robot Tears"
 	id = "robottears"
 	description = "An oily substance that an IPC could technically consider a 'drink'."
-	reagent_state = LIQUID
 	color = "#363636"
 	alcohol_perc = 0.25
 	drink_icon = "robottearsglass"
@@ -1310,7 +1244,6 @@
 	name = "Trinary"
 	id = "trinary"
 	description = "A fruit drink meant only for synthetics, however that works."
-	reagent_state = LIQUID
 	color = "#adb21f"
 	alcohol_perc = 0.2
 	drink_icon = "trinaryglass"
@@ -1323,7 +1256,6 @@
 	name = "Servo"
 	id = "servo"
 	description = "A drink containing some organic ingredients, but meant only for synthetics."
-	reagent_state = LIQUID
 	color = "#5b3210"
 	alcohol_perc = 0.25
 	drink_icon = "servoglass"
@@ -1336,7 +1268,6 @@
 	name = "Uplink"
 	id = "uplink"
 	description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
-	reagent_state = LIQUID
 	color = "#e7ae04"
 	alcohol_perc = 0.15
 	drink_icon = "uplinkglass"
@@ -1349,7 +1280,6 @@
 	name = "Synth 'n Soda"
 	id = "synthnsoda"
 	description = "The classic drink adjusted for a robot's tastes."
-	reagent_state = LIQUID
 	color = "#7204e7"
 	alcohol_perc = 0.25
 	drink_icon = "synthnsodaglass"
@@ -1362,7 +1292,6 @@
 	name = "Synthignon"
 	id = "synthignon"
 	description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
-	reagent_state = LIQUID
 	color = "#d004e7"
 	alcohol_perc = 0.25
 	drink_icon = "synthignonglass"
@@ -1,7 +1,6 @@
 // These can only be applied by blobs. They are what blobs are made out of.
 // The 4 damage
 /datum/reagent/blob
-	description = ""
 	var/complementary_color = COLOR_BLACK
 	var/message = "The blob strikes you" //message sent to any mob hit by the blob
 	var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
@@ -2,7 +2,6 @@
 	name = "Spider eggs"
 	id = "spidereggs"
 	description = "A fine dust containing spider eggs. Oh gosh."
-	reagent_state = SOLID
 	color = "#FFFFFF"
 	taste_mult = 0

@@ -53,7 +52,6 @@
 	name = "Jagged Crystals"
 	id = "jagged_crystals"
 	description = "Rapid chemical decomposition has warped these crystals into twisted spikes."
-	reagent_state = SOLID
 	color = "#FA0000" // rgb: 250, 0, 0
 	taste_mult = 0

@@ -116,7 +114,6 @@
 	name = "Space heartworms"
 	id = "heartworms"
 	description = "Aww, gross! These things can't be good for your heart. They're gunna eat it!"
-	reagent_state = SOLID
 	color = "#925D6C"
 	taste_mult = 0

@@ -4,7 +4,6 @@
 	description = "Uh, some kind of drink."
 	reagent_state = LIQUID
 	color = "#E78108" // rgb: 231, 129, 8
-	harmless = TRUE
 	taste_description = "something which should not exist"
 	var/adj_dizzy = 0
 	var/adj_drowsy = 0
@@ -2,7 +2,6 @@
 	name = "Orange juice"
 	id = "orangejuice"
 	description = "Both delicious AND rich in Vitamin C, what more do you need?"
-	color = "#E78108" // rgb: 231, 129, 8
 	drink_icon = "glass_orange"
 	drink_name = "Glass of Orange juice"
 	drink_desc = "Vitamins! Yay!"
@@ -78,7 +77,6 @@
 	name = "The Doctor's Delight"
 	id = "doctorsdelight"
 	description = "A gulp a day keeps the MediBot away. That's probably for the best."
-	reagent_state = LIQUID
 	color = "#FF8CFF" // rgb: 255, 140, 255
 	drink_icon = "doctorsdelightglass"
 	drink_name = "Doctor's Delight"
@@ -95,7 +93,6 @@
 	name = "Triple Citrus"
 	id = "triple_citrus"
 	description = "A refreshing mixed drink of orange, lemon and lime juice."
-	reagent_state = LIQUID
 	color = "#B5FF00"
 	drink_icon = "triplecitrus"
 	drink_name = "Glass of Triplecitrus Juice"
@@ -256,7 +253,6 @@
 	name = "Cream"
 	id = "cream"
 	description = "The fatty, still liquid part of milk. Why don't you mix this with some scotch, eh?"
-	color = "#F1F1F1"
 	drink_name = "Glass of cream"
 	drink_desc = "Ewwww..."
 	taste_description = "cream"
@@ -592,7 +588,6 @@
 	name = "Cola"
 	id = "cola"
 	description = "A refreshing beverage."
-	reagent_state = LIQUID
 	color = "#100800" // rgb: 16, 8, 0
 	adj_drowsy = -10 SECONDS
 	drink_icon = "glass_brown"
@@ -9,7 +9,6 @@
 	name = "Lithium"
 	id = "lithium"
 	description = "A chemical element."
-	reagent_state = SOLID
 	color = "#808080" // rgb: 128, 128, 128
 	taste_description = "metal"

@@ -248,7 +247,6 @@
 	name = "Pump Up"
 	id = "pump_up"
 	description = "An awful smelling mixture which acts as a makeshift stimulant"
-	reagent_state = SOLID
 	color = COLOR_HALF_TRANSPARENT_BLACK
 	taste_description = "poorly mixed coffee"
 	metabolization_rate = 1
@@ -443,7 +441,6 @@
 	name = "Bath Salts"
 	id = "bath_salts"
 	description = "Sometimes packaged as a refreshing bathwater additive, these crystals are definitely not for human consumption."
-	reagent_state = SOLID
 	color = "#FAFAFA"
 	overdose_threshold = 20
 	addiction_chance = 15
@@ -1134,7 +1131,6 @@
 	name = "Ultra-Lube"
 	id = "ultralube"
 	description = "Ultra-Lube is an enhanced lubricant which induces effect similar to Methamphetamine in synthetic users by drastically reducing internal friction and increasing cooling capabilities."
-	reagent_state = LIQUID
 	color = "#1BB1FF"
 	process_flags = SYNTHETIC
 	overdose_threshold = 20
@@ -23,7 +23,6 @@
 	name = "Nutriment"
 	id = "nutriment"
 	description = "A questionable mixture of various pure nutrients commonly found in processed foods."
-	reagent_state = SOLID
 	nutriment_factor = 15 * REAGENTS_METABOLISM
 	color = "#664330" // rgb: 102, 67, 48
 	var/brute_heal = 1
@@ -79,9 +78,6 @@
 	name = "Vitamin"
 	id = "vitamin"
 	description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
-	reagent_state = SOLID
-	color = "#664330" // rgb: 102, 67, 48
-	brute_heal = 1
 	burn_heal = 1

 /datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/M)
@@ -93,7 +89,6 @@
 	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."
-	reagent_state = SOLID
 	color = "#FFFFFF" // rgb: 255, 255, 255
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	overdose_threshold = 200 // Hyperglycaemic shock
@@ -282,7 +277,6 @@
 	name = "Salt"
 	id = "sodiumchloride"
 	description = "Sodium chloride, common table salt."
-	reagent_state = SOLID
 	color = "#B1B0B0"
 	harmless = FALSE
 	overdose_threshold = 100
@@ -299,14 +293,12 @@
 	name = "Black Pepper"
 	id = "blackpepper"
 	description = "A powder ground from peppercorns. *AAAACHOOO*"
-	reagent_state = SOLID
 	taste_description = "pepper"

 /datum/reagent/consumable/cocoa
 	name = "Cocoa Powder"
 	id = "cocoa"
 	description = "A fatty, bitter paste made from cocoa beans."
-	reagent_state = SOLID
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#5F3A13"
 	taste_description = "bitter cocoa"
@@ -315,7 +307,6 @@
 	name = "Vanilla"
 	id = "vanilla"
 	description = "A fatty, bitter paste made from vanilla pods."
-	reagent_state = SOLID
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#FEFEFE"
 	taste_description = "bitter vanilla"
@@ -400,7 +391,6 @@
 	name = "Dry Ramen"
 	id = "dry_ramen"
 	description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
-	reagent_state = SOLID
 	color = "#302000" // rgb: 48, 32, 0
 	taste_description = "dry ramen coated with what might just be your tears"

@@ -435,7 +425,6 @@
 	name = "Flour"
 	id = "flour"
 	description = "This is what you rub all over yourself to pretend to be a ghost."
-	reagent_state = SOLID
 	color = "#FFFFFF" // rgb: 0, 0, 0
 	taste_description = "flour"

@@ -447,7 +436,6 @@
 	name = "Rice"
 	id = "rice"
 	description = "Enjoy the great taste of nothing."
-	reagent_state = SOLID
 	nutriment_factor = 3 * REAGENTS_METABOLISM
 	color = "#FFFFFF" // rgb: 0, 0, 0
 	taste_description = "rice"
@@ -577,7 +565,6 @@
 	color = "#21170E"
 	process_flags = ORGANIC | SYNTHETIC
 	taste_description = "tea"
-	harmless = TRUE

 /datum/reagent/consumable/mugwort/on_mob_life(mob/living/M)
 	var/update_flags = STATUS_UPDATE_NONE
@@ -624,7 +611,6 @@
 	name = "Cheese"
 	id = "cheese"
 	description = "Some cheese. Pour it out to make it solid."
-	reagent_state = SOLID
 	color = "#FFFF00"
 	taste_description = "cheese"

@@ -662,7 +648,6 @@
 	name = "Weird cheese"
 	id = "weird_cheese"
 	description = "Hell, I don't even know if this IS cheese. Whatever it is, it ain't normal. If you want to, pour it out to make it solid."
-	reagent_state = SOLID
 	color = "#50FF00"
 	addiction_chance = 1
 	addiction_chance_additional = 10
@@ -683,7 +668,6 @@
 	name = "Cheese Curds"
 	id = "cheese_curds"
 	description = "Some mushed up cheese curds. You're not quite sure why you did this."
-	reagent_state = SOLID
 	color = "#FFFF00"
 	taste_description = "salty cheese"

@@ -707,7 +691,6 @@
 	name = "Bread"
 	id = "bread"
 	description = "Bread! Yep, bread."
-	reagent_state = SOLID
 	color = "#9C5013"
 	taste_description = "bread"

@@ -785,7 +768,6 @@
 	name = "Mashed potatoes"
 	id = "mashedpotatoes"
 	description = "A starchy food paste made from boiled potatoes."
-	reagent_state = SOLID
 	color = "#D6D9C1"
 	taste_description = "potatoes"

@@ -932,7 +914,6 @@
 	name = "Soap"
 	id = "soapreagent"
 	description = "Soap, fit to clean the mouth of a sailor."
-	reagent_state = SOLID
 	color = "#FFFFFF"
 	taste_description = "soap"

@@ -103,10 +103,7 @@
 	id = "recal"
 	description = "An oily insulating liquid that passively regulates electrical activity on sensitive electronic components, allowing them to recover from decalibrating events faster. \
 	Overdosing will cause under-voltage errors and hamper component heat dissipation, potentially causing heat damage."
-	reagent_state = LIQUID
 	color = "#85845d"
-	overdose_threshold = 40
-	harmless = FALSE
 	taste_description = "mineral oil and toothpaste"
 	process_flags = SYNTHETIC

@@ -179,7 +176,6 @@
 	name = "Rezadone"
 	id = "rezadone"
 	description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage."
-	reagent_state = SOLID
 	color = "#669900" // rgb: 102, 153, 0
 	overdose_threshold = 30
 	harmless = FALSE
@@ -422,7 +418,6 @@
 	id = "charcoal"
 	description = "Activated charcoal helps to absorb toxins."
 	reagent_state = LIQUID
-	color = "#000000"
 	taste_description = "dust"
 	goal_difficulty = REAGENT_GOAL_EASY

@@ -836,7 +831,6 @@
 	id = "atropine"
 	description = "Atropine is a potent cardiac resuscitant but it can causes confusion, dizzyness and hyperthermia."
 	reagent_state = LIQUID
-	color = "#000000"
 	metabolization_rate = 0.2
 	overdose_threshold = 25
 	harmless = FALSE
@@ -1362,7 +1356,6 @@
 	name = "Restorative Nanites"
 	id = "syndicate_nanites"
 	description = "Miniature medical robots that swiftly restore bodily damage. May begin to attack their host's cells in high amounts."
-	reagent_state = SOLID
 	color = "#555555"
 	taste_description = "bodily perfection"

@@ -26,7 +26,6 @@
 	name = "Potassium"
 	id = "potassium"
 	description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
-	reagent_state = SOLID
 	color = "#A0A0A0" // rgb: 160, 160, 160
 	taste_description = "bad ideas"

@@ -34,7 +33,6 @@
 	name = "Sulfur"
 	id = "sulfur"
 	description = "A chemical element."
-	reagent_state = SOLID
 	color = "#BF8C00" // rgb: 191, 140, 0
 	taste_description = "impulsive decisions"

@@ -42,7 +40,6 @@
 	name = "Sodium"
 	id = "sodium"
 	description = "A chemical element."
-	reagent_state = SOLID
 	color = "#808080" // rgb: 128, 128, 128
 	taste_description = "horrible misjudgement"

@@ -50,7 +47,6 @@
 	name = "Phosphorus"
 	id = "phosphorus"
 	description = "A chemical element."
-	reagent_state = SOLID
 	color = "#832828" // rgb: 131, 40, 40
 	taste_description = "misguided choices"

@@ -58,7 +54,6 @@
 	name = "Carbon"
 	id = "carbon"
 	description = "A chemical element."
-	reagent_state = SOLID
 	color = "#1C1300" // rgb: 30, 20, 0
 	taste_description = "like a pencil or something"

@@ -70,7 +65,6 @@
 	name = "Gold"
 	id = "gold"
 	description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
-	reagent_state = SOLID
 	color = "#F7C430" // rgb: 247, 196, 48
 	taste_description = "bling"

@@ -79,7 +73,6 @@
 	name = "Silver"
 	id = "silver"
 	description = "A lustrous metallic element regarded as one of the precious metals."
-	reagent_state = SOLID
 	color = "#D0D0D0" // rgb: 208, 208, 208
 	taste_description = "sub-par bling"

@@ -87,7 +80,6 @@
 	name = "Aluminum"
 	id = "aluminum"
 	description = "A silvery white and ductile member of the boron group of chemical elements."
-	reagent_state = SOLID
 	color = "#A8A8A8" // rgb: 168, 168, 168
 	taste_description = "metal"

@@ -95,7 +87,6 @@
 	name = "Silicon"
 	id = "silicon"
 	description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
-	reagent_state = SOLID
 	color = "#A8A8A8" // rgb: 168, 168, 168
 	taste_description = "a CPU"

@@ -124,7 +115,6 @@
 	name = "Iron"
 	id = "iron"
 	description = "Pure iron is a metal."
-	reagent_state = SOLID
 	color = "#525152" // rgb: 200, 165, 220
 	taste_description = "metal"

@@ -675,7 +665,6 @@
 	name = "Generic nutrient"
 	id = "plantnutrient"
 	description = "Some kind of nutrient. You can't really tell what it is. You should probably report it, along with how you obtained it."
-	color = "#000000" // RBG: 0, 0, 0
 	var/tox_prob = 0
 	var/mutation_level = 0
 	taste_description = "puke"
@@ -13,7 +13,6 @@
 	name = "Paradise Punch"
 	id = "paradise_punch"
 	description = "Tastes just how you'd think Paradise would if you could bottle it."
-	reagent_state = LIQUID
 	color = "#cc0044"
 	taste_description = "paradise"

@@ -22,7 +21,6 @@
 	name = "Apple-pocalypse"
 	id = "apple-pocalypse"
 	description = "If doomsday came in fruit form, it'd probably be apples."
-	reagent_state = LIQUID
 	color = "#44FF44"
 	taste_description = "doomsday"

@@ -38,7 +36,6 @@
 	name = "Berry Banned"
 	id = "berry_banned"
 	description = "Reason for ban: Excessive Flavor."
-	reagent_state = LIQUID
 	color = "#FF44FF"
 	taste_description = "a permaban"

@@ -67,7 +64,6 @@
 	name = "Berry Banned"
 	id = "berry_banned2"
 	description = "Reason for ban: Excessive Flavor."
-	reagent_state = LIQUID
 	color = "#FF44FF"
 	taste_description = "a permaban"

@@ -89,7 +85,6 @@
 	name = "Blackeye Brew"
 	id = "blackeye_brew"
 	description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
-	reagent_state = LIQUID
 	color = "#4d2600"
 	taste_description = "greytide"

@@ -113,7 +108,6 @@
 	name = "Grape Granade"
 	id = "grape_granade"
 	description = "Exploding with grape flavor and a favorite among ERT members system-wide."
-	reagent_state = LIQUID
 	color = "#9933ff"
 	taste_description = "old people"

@@ -132,7 +126,6 @@
 	name = "Meteor Malt"
 	id = "meteor_malt"
 	description = "Soft drinks have been detected on collision course with your tastebuds."
-	reagent_state = LIQUID
 	color = "#cc9900"
 	taste_description = "flying space rocks"

@@ -47,7 +47,6 @@
 	size_divisor = 80
 	mob_burning = 3 // 15
 	burn_temperature = T0C + 700
-	burn_color = "white"

 /datum/reagent/napalm
 	name = "Napalm"
@@ -194,7 +193,6 @@
 	name = "Thermite"
 	id = "thermite"
 	description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
-	reagent_state = SOLID
 	color = "#673910" // rgb: 103, 57, 16
 	process_flags = ORGANIC | SYNTHETIC
 	taste_description = "rust"
@@ -317,7 +315,6 @@
 	id = "blackpowder"
 	description = "Explodes. Violently."
 	reagent_state = LIQUID
-	color = "#000000"
 	metabolization_rate = 0.05
 	penetrates_skin = TRUE
 	taste_description = "explosions"
@@ -159,7 +159,6 @@
 	id = "radium"
 	description = "Radium is an alkaline earth metal. It is extremely radioactive."
 	process_flags = ORGANIC | SYNTHETIC
-	reagent_state = SOLID
 	color = "#C7C7C7" // rgb: 199,199,199
 	penetrates_skin = TRUE
 	taste_description = "the colour blue and regret"
@@ -241,7 +240,6 @@
 	name = "Uranium"
 	id = "uranium"
 	description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
-	reagent_state = SOLID
 	color = "#B8B8C0" // rgb: 184, 184, 192
 	taste_mult = 0
 	taste_description = "the inside of a reactor"
@@ -340,7 +338,6 @@
 	description = "Fluorosulfuric acid is a an extremely corrosive super-acid."
 	color = "#5050FF"
 	acidpwr = 42
-	goal_department = "Science"
 	goal_difficulty = REAGENT_GOAL_NORMAL

 /datum/reagent/acid/facid/on_mob_life(mob/living/M)
@@ -916,7 +913,6 @@
 	name = "Lipolicide"
 	id = "lipolicide"
 	description = "A compound found in many seedy dollar stores in the form of a weight-loss tonic."
-	reagent_state = SOLID
 	color = "#D1DED1"
 	metabolization_rate = 0.2
 	taste_description = "battery acid"
@@ -1104,7 +1100,6 @@
 	name = "Atrazine"
 	id = "atrazine"
 	description = "A herbicidal compound used for destroying unwanted plants."
-	reagent_state = LIQUID
 	color = "#773E73" //RGB: 47 24 45
 	lethality = 2 //Atrazine, however, is definitely toxic
 	goal_department = "Science"
@@ -1254,7 +1249,6 @@
 	name = "Ants"
 	id = "ants"
 	description = "A sample of a lost breed of Space Ants (formicidae bastardium tyrannus), they are well-known for ravaging the living shit out of pretty much anything."
-	reagent_state = SOLID
 	color = "#993333"
 	process_flags = ORGANIC | SYNTHETIC
 	taste_description = "<span class='warning'>ANTS OH GOD</span>"
@@ -213,7 +213,6 @@
 	reagent_state = LIQUID
 	color = "#757547"
 	taste_description = "puke"
-	harmless = FALSE

 /datum/reagent/fishwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
 	if(method == REAGENT_INGEST)
@@ -233,8 +232,6 @@
 	name = "Toilet Water"
 	id = "toiletwater"
 	description = "Filthy water scoured from a nasty toilet bowl. Absolutely disgusting."
-	reagent_state = LIQUID
-	color = "#757547"
 	taste_description = "the inside of a toilet... or worse"

 /datum/reagent/fishwater/toiletwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) //For shennanigans
@@ -370,7 +367,6 @@
 	name = "Unholy Water"
 	id = "unholywater"
 	description = "Something that shouldn't exist on this plane of existence."
-	process_flags = ORGANIC | SYNTHETIC //ethereal means everything processes it.
 	metabolization_rate = 1
 	taste_description = "sulfur"

@@ -466,7 +462,6 @@
 	description = "A sticky compound that creates tar on contact with surfaces."
 	reagent_state = LIQUID
 	color = "#4B4B4B"
-	harmless = FALSE
 	taste_description = "processed sludge"

 /datum/reagent/tar_compound/reaction_turf(turf/simulated/T, volume)
@@ -745,7 +745,6 @@
 	id = "robottears"
 	result = "robottears"
 	required_reagents = list("synthanol" = 1, "oil" = 1, "sodawater" = 1)
-	result_amount = 3
 	mix_message = "The ingredients combine into a stiff, dark goo."

 /datum/chemical_reaction/synthanol/trinary
@@ -753,7 +752,6 @@
 	id = "trinary"
 	result = "trinary"
 	required_reagents = list("synthanol" = 1, "limejuice" = 1, "orangejuice" = 1)
-	result_amount = 3
 	mix_message = "The ingredients mix into a colorful substance."

 /datum/chemical_reaction/synthanol/servo
@@ -143,7 +143,6 @@
 	id = "conductivelube"
 	result = "conductivelube"
 	required_reagents = list("teslium" = 1, "lube" = 1, "aluminum" = 1)
-	result_amount = 3
 	mix_message = "The mixture darkens and starts sparking."

 /datum/chemical_reaction/surge
@@ -284,7 +284,6 @@
 	id = "smoke_powder_smoke"
 	required_reagents = list("smoke_powder" = 1)
 	min_temp = T0C + 100
-	result_amount = 1
 	mix_sound = null

 /datum/chemical_reaction/sonic_powder
@@ -4,13 +4,9 @@
 /obj/item/reagent_containers/glass/bottle
 	name = "bottle"
 	desc = "A small bottle."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle"
 	item_state = "atoxinbottle"
-	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 50)
-	container_type = OPENCONTAINER
-	volume = 50

 /obj/item/reagent_containers/glass/bottle/on_reagent_change()
 	update_icon(UPDATE_OVERLAYS)
@@ -250,7 +246,6 @@
 /obj/item/reagent_containers/glass/bottle/thermite
 	name = "thermite bottle"
 	desc = "A small bottle of thermite, a substance that burns extremely hot."
-	icon_state = "bottle"
 	list_reagents = list("thermite" = 50)

 ////////////////////Traitor Poison Bottle//////////////////////////////
@@ -5,7 +5,6 @@
 	name = " "
 	var/base_name = " "
 	desc = " "
-	icon = 'icons/obj/chemical.dmi'
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,50)
 	volume = 50
@@ -121,7 +120,6 @@
 /obj/item/reagent_containers/glass/beaker
 	name = "beaker"
 	desc = "A simple glass beaker, nothing special."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker"
 	item_state = "beaker"
 	belt_icon = "beaker"
@@ -227,9 +225,7 @@
 	icon_state = "beakerlarge"
 	materials = list(MAT_GLASS=2500)
 	volume = 100
-	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,50,100)
-	container_type = OPENCONTAINER

 /obj/item/reagent_containers/glass/beaker/vial
 	name = "vial"
@@ -238,9 +234,7 @@
 	belt_icon = "vial"
 	materials = list(MAT_GLASS=250)
 	volume = 25
-	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25)
-	container_type = OPENCONTAINER
 	can_assembly = 0

 /obj/item/reagent_containers/glass/beaker/drugs
@@ -250,7 +244,6 @@
 	amount_per_transfer_from_this = 2
 	possible_transfer_amounts = null
 	volume = 10
-	container_type = OPENCONTAINER
 	can_assembly = 0

 /obj/item/reagent_containers/glass/beaker/noreact
@@ -258,10 +251,7 @@
 	desc = "A cryostasis beaker that allows for chemical storage without reactions."
 	icon_state = "beakernoreact"
 	materials = list(MAT_METAL=3000)
-	volume = 50
-	amount_per_transfer_from_this = 10
 	origin_tech = "materials=2;engineering=3;plasmatech=3"
-	container_type = OPENCONTAINER
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC

 /obj/item/reagent_containers/glass/beaker/noreact/Initialize(mapload)
@@ -274,9 +264,7 @@
 	icon_state = "beakerbluespace"
 	materials = list(MAT_GLASS=3000)
 	volume = 300
-	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
-	container_type = OPENCONTAINER
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC
 	origin_tech = "bluespace=5;materials=4;plasmatech=4"

@@ -309,7 +297,6 @@
 	prefered_slot_flags = ITEM_SLOT_IN_BACKPACK
 	resistance_flags = NONE
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC
-	container_type = OPENCONTAINER
 	dog_fashion = /datum/dog_fashion/head/bucket

 /obj/item/reagent_containers/glass/bucket/update_overlays()
@@ -354,8 +341,6 @@
 	item_state = "bottle"
 	list_reagents = list("water" = 49.5, "fluorine" = 0.5) //see desc, don't think about it too hard
 	materials = list(MAT_GLASS = 0)
-	volume = 50
-	amount_per_transfer_from_this = 10

 /obj/item/reagent_containers/glass/beaker/waterbottle/empty
 	list_reagents = list()
@@ -8,8 +8,6 @@
 	item_state = "hypo"
 	icon_state = "hypo"
 	belt_icon = "hypospray"
-	amount_per_transfer_from_this = 5
-	volume = 30
 	possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
 	resistance_flags = ACID_PROOF
 	container_type = OPENCONTAINER
@@ -1,11 +1,9 @@
 /obj/item/reagent_containers/patch
 	name = "chemical patch"
 	desc = "A chemical patch for touch based applications."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bandaid1"
 	possible_transfer_amounts = null
 	visible_transfer_rate = FALSE
-	volume = 30
 	temperature_min = 270
 	temperature_max = 350
 	var/instant_application = FALSE
@@ -6,7 +6,6 @@
 /obj/item/reagent_containers/pill
 	name = "pill"
 	desc = "A pill."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = null
 	item_state = "pill"
 	possible_transfer_amounts = null
@@ -8,13 +8,10 @@
 	flags = NOBLUDGEON
 	container_type = OPENCONTAINER
 	slot_flags = ITEM_SLOT_BELT
-	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
-	throw_range = 7
 	var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self.
 	var/spray_currentrange = 3 //the range of tiles the sprayer will reach when in fixed mode.
-	amount_per_transfer_from_this = 5
 	volume = 250
 	possible_transfer_amounts = null
 	var/delay = CLICK_CD_RANGE * 2
@@ -156,7 +153,6 @@
 				visible_message("<span class='warning'>[src] identifies and removes a filthy substance.</span>")

 /obj/item/reagent_containers/spray/cleaner/drone
-	name = "space cleaner"
 	desc = "BLAM!-brand non-foaming space cleaner!"
 	spray_maxrange = 3
 	spray_currentrange = 3
@@ -192,7 +188,6 @@
 	belt_icon = null
 	volume = 40
 	spray_maxrange = 4
-	amount_per_transfer_from_this = 5
 	list_reagents = list("condensedcapsaicin" = 40)

 //water flower
@@ -219,7 +214,6 @@
 	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "chemsprayer"
 	item_state = "chemsprayer"
-	throwforce = 0
 	w_class = WEIGHT_CLASS_NORMAL
 	spray_maxrange = 7
 	spray_currentrange = 7
@@ -5,7 +5,6 @@
 	item_state = "syringe_0"
 	icon_state = "0"
 	belt_icon = "syringe"
-	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = null
 	volume = 15
 	var/busy = FALSE
@@ -6,7 +6,6 @@
 	density = TRUE
 	pressure_resistance = 2*ONE_ATMOSPHERE
 	container_type = DRAINABLE | AMOUNT_VISIBLE
-	max_integrity = 300
 	cares_about_temperature = TRUE
 	/// How much this dispenser can hold (In units)
 	var/tank_volume = 1000
@@ -85,7 +84,6 @@
 /obj/structure/reagent_dispensers/watertank
 	name = "water tank"
 	desc = "A water tank."
-	icon_state = "water"

 /obj/structure/reagent_dispensers/watertank/high
 	name = "high-capacity water tank"
@@ -262,7 +260,6 @@
 	icon = 'icons/obj/vending.dmi'
 	icon_state = "water_cooler"
 	tank_volume = 500
-	reagent_id = "water"
 	anchored = TRUE
 	var/paper_cups = 25 //Paper cups left from the cooler