Merge pull request #9327 from Techhead0/chemRenames

Replaces gaseous reagents with organic chemistry ones, adjusts flammable chemicals.

code/modules/hydroponics/grown.dm

@@ -98,7 +98,7 @@
 			descriptors |= "shiny"
 		if(reagents.has_reagent("lube"))
 			descriptors |= "slippery"
-		if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
+		if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid") || reagents.has_reagent("hclacid"))
 			descriptors |= "acidic"
 		if(seed.get_trait(TRAIT_JUICY))
 			descriptors |= "juicy"

code/modules/hydroponics/seed.dm

@@ -408,7 +408,9 @@
 			"slimejelly",
 			"cyanide",
 			"mindbreaker",
-			"stoxin"
+			"stoxin",
+			"acetone",
+			"hydrazine"
 			)
 
 		for(var/x=1;x<=additional_chems;x++)

code/modules/hydroponics/trays/tray.dm

@@ -47,9 +47,10 @@
 	var/global/list/toxic_reagents = list(
 		"anti_toxin" =     -2,
 		"toxin" =           2,
-		"fluorine" =        2.5,
-		"chlorine" =        1.5,
+		"hydrazine" =       2.5,
+		"acetone" =	        1,
 		"sacid" =           1.5,
+		"hclacid" =         1.5,
 		"pacid" =           3,
 		"plantbgone" =      3,
 		"cryoxadone" =     -3,
@@ -70,11 +71,11 @@
 		"left4zed" =        1
 		)
 	var/global/list/weedkiller_reagents = list(
-		"fluorine" =       -4,
-		"chlorine" =       -3,
+		"hydrazine" =      -4,
 		"phosphorus" =     -2,
 		"sugar" =           2,
 		"sacid" =          -2,
+		"hclacid" =        -2,
 		"pacid" =          -4,
 		"plantbgone" =     -8,
 		"adminordrazine" = -5
@@ -89,8 +90,7 @@
 		"adminordrazine" =  1,
 		"milk" =            0.9,
 		"beer" =            0.7,
-		"fluorine" =       -0.5,
-		"chlorine" =       -0.5,
+		"hydrazine" =      -2,
 		"phosphorus" =     -0.5,
 		"water" =           1,
 		"sodawater" =       1,
@@ -99,11 +99,11 @@
 	// Beneficial reagents also have values for modifying yield_mod and mut_mod (in that order).
 	var/global/list/beneficial_reagents = list(
 		"beer" =           list( -0.05, 0,   0  ),
-		"fluorine" =       list( -2,    0,   0  ),
-		"chlorine" =       list( -1,    0,   0  ),
+		"hydrazine" =      list( -2,    0,   0  ),
 		"phosphorus" =     list( -0.75, 0,   0  ),
 		"sodawater" =      list(  0.1,  0,   0  ),
 		"sacid" =          list( -1,    0,   0  ),
+		"hclacid" =        list( -1,    0,   0  ),
 		"pacid" =          list( -2,    0,   0  ),
 		"plantbgone" =     list( -2,    0,   0.2),
 		"cryoxadone" =     list(  3,    0,   0  ),

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

@@ -181,6 +181,7 @@
 	description = "Required for welders. Flamable."
 	reagent_state = LIQUID
 	color = "#660000"
+	touch_met = 5
 
 	glass_icon_state = "dr_gibb_glass"
 	glass_name = "glass of welder fuel"

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

@@ -1,3 +1,31 @@
+/datum/reagent/acetone
+	name = "Acetone"
+	id = "acetone"
+	description = "A colorless liquid solvent used in chemical synthesis."
+	reagent_state = LIQUID
+	color = "#808080"
+	metabolism = REM * 0.2
+
+/datum/reagent/acetone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	M.adjustToxLoss(removed * 3)
+
+/datum/reagent/acetone/touch_obj(var/obj/O)	//I copied this wholesale from ethanol and could likely be converted into a shared proc. ~Techhead
+	if(istype(O, /obj/item/weapon/paper))
+		var/obj/item/weapon/paper/paperaffected = O
+		paperaffected.clearpaper()
+		usr << "The solution dissolves the ink on the paper."
+		return
+	if(istype(O, /obj/item/weapon/book))
+		if(volume < 5)
+			return
+		if(istype(O, /obj/item/weapon/book/tome))
+			usr << "<span class='notice'>The solution does nothing. Whatever this is, it isn't normal ink.</span>"
+			return
+		var/obj/item/weapon/book/affectedbook = O
+		affectedbook.dat = null
+		usr << "<span class='notice'>The solution dissolves the ink on the book.</span>"
+	return
+
 /datum/reagent/aluminum
 	name = "Aluminum"
 	id = "aluminum"
@@ -5,6 +33,20 @@
 	reagent_state = SOLID
 	color = "#A8A8A8"
 
+/datum/reagent/ammonia
+	name = "Ammonia"
+	id = "ammonia"
+	description = "A caustic substance commonly used in fertilizer or household cleaners."
+	reagent_state = LIQUID
+	color = "#404030"
+	metabolism = REM * 0.5
+
+/datum/reagent/ammonia/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_VOX)
+		M.adjustOxyLoss(-removed * 10)
+	else if(alien != IS_DIONA)
+		M.adjustToxLoss(removed * 1.5)
+
 /datum/reagent/carbon
 	name = "Carbon"
 	id = "carbon"
@@ -32,19 +74,6 @@
 		else
 			dirtoverlay.alpha = min(dirtoverlay.alpha + volume * 30, 255)
 
-/datum/reagent/chlorine
-	name = "Chlorine"
-	id = "chlorine"
-	description = "A chemical element with a characteristic odour."
-	reagent_state = GAS
-	color = "#808080"
-
-/datum/reagent/chlorine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
-	M.take_organ_damage(1*REM, 0)
-
-/datum/reagent/chlorine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
-	M.take_organ_damage(1*REM, 0)
-
 /datum/reagent/copper
 	name = "Copper"
 	id = "copper"
@@ -57,6 +86,7 @@
 	description = "A well-known alcohol with a variety of applications."
 	reagent_state = LIQUID
 	color = "#404030"
+	touch_met = 5
 	var/nutriment_factor = 0
 	var/strength = 10 // This is, essentially, units between stages - the lower, the stronger. Less fine tuning, more clarity.
 	var/toxicity = 1
@@ -133,25 +163,26 @@
 		usr << "<span class='notice'>The solution dissolves the ink on the book.</span>"
 	return
 
-/datum/reagent/fluorine
-	name = "Fluorine"
-	id = "fluorine"
-	description = "A highly-reactive chemical element."
-	reagent_state = GAS
+/datum/reagent/hydrazine
+	name = "Hydrazine"
+	id = "hydrazine"
+	description = "A toxic, colorless, flammable liquid with a strong ammonia-like odor, in hydrate form."
+	reagent_state = LIQUID
 	color = "#808080"
+	metabolism = REM * 0.2
+	touch_met = 5
 
-/datum/reagent/fluorine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
-	M.adjustToxLoss(removed)
+/datum/reagent/hydrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	M.adjustToxLoss(4 * removed)
 
-/datum/reagent/fluorine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
-	M.adjustToxLoss(removed)
+/datum/reagent/hydrazine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) // Hydrazine is both toxic and flammable.
+	M.adjust_fire_stacks(removed / 12)
+	M.adjustToxLoss(0.2 * removed)
 
-/datum/reagent/hydrogen
-	name = "Hydrogen"
-	id = "hydrogen"
-	description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
-	reagent_state = GAS
-	color = "#808080"
+/datum/reagent/hydrazine/touch_turf(var/turf/T)
+	new /obj/effect/decal/cleanable/liquid_fuel(T, volume)
+	remove_self(volume)
+	return
 
 /datum/reagent/iron
 	name = "Iron"
@@ -193,28 +224,6 @@
 			M.emote(pick("twitch", "drool", "moan"))
 		M.adjustBrainLoss(2)
 
-/datum/reagent/nitrogen
-	name = "Nitrogen"
-	id = "nitrogen"
-	description = "A colorless, odorless, tasteless gas."
-	reagent_state = GAS
-	color = "#808080"
-
-/datum/reagent/nitrogen/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
-	if(alien == IS_VOX)
-		M.adjustOxyLoss(-removed * 3)
-
-/datum/reagent/oxygen
-	name = "Oxygen"
-	id = "oxygen"
-	description = "A colorless, odorless gas."
-	reagent_state = GAS
-	color = "#808080"
-
-/datum/reagent/oxygen/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
-	if(alien == IS_VOX)
-		M.adjustToxLoss(removed * 3)
-
 /datum/reagent/phosphorus
 	name = "Phosphorus"
 	id = "phosphorus"
@@ -345,6 +354,15 @@
 		qdel(O)
 		remove_self(meltdose) // 10 units of acid will not melt EVERYTHING on the tile
 
+/datum/reagent/acid/hydrochloric //Like sulfuric, but less toxic and more acidic.
+	name = "Hydrochloric Acid"
+	id = "hclacid"
+	description = "A very corrosive mineral acid with the molecular formula HCl."
+	reagent_state = LIQUID
+	color = "#808080"
+	power = 3
+	meltdose = 8
+
 /datum/reagent/silicon
 	name = "Silicon"
 	id = "silicon"

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

@@ -220,13 +220,6 @@
 		T.holy = 1
 	return
 
-/datum/reagent/ammonia
-	name = "Ammonia"
-	id = "ammonia"
-	description = "A caustic substance commonly used in fertilizer or household cleaners."
-	reagent_state = GAS
-	color = "#404030"
-
 /datum/reagent/diethylamine
 	name = "Diethylamine"
 	id = "diethylamine"
@@ -234,10 +227,10 @@
 	reagent_state = LIQUID
 	color = "#604030"
 
-/datum/reagent/fluorosurfactant // Foam precursor
-	name = "Fluorosurfactant"
-	id = "fluorosurfactant"
-	description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
+/datum/reagent/surfactant // Foam precursor
+	name = "Azosurfactant"
+	id = "surfactant"
+	description = "A isocyanate liquid that forms a foam when mixed with water."
 	reagent_state = LIQUID
 	color = "#9E6B38"
 

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

@@ -44,10 +44,13 @@
 	reagent_state = LIQUID
 	color = "#9D14DB"
 	strength = 30
+	touch_met = 5
 
 /datum/reagent/toxin/phoron/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
 	M.adjust_fire_stacks(removed / 5)
+	if(prob(50))
+		M.pl_effects()
 
 /datum/reagent/toxin/phoron/touch_turf(var/turf/simulated/T)
 	if(!istype(T))

code/modules/reagents/Chemistry-Recipes.dm

@@ -24,21 +24,21 @@
 	name = "Inaprovaline"
 	id = "inaprovaline"
 	result = "inaprovaline"
-	required_reagents = list("oxygen" = 1, "carbon" = 1, "sugar" = 1)
+	required_reagents = list("acetone" = 1, "carbon" = 1, "sugar" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/dylovene
 	name = "Dylovene"
 	id = "anti_toxin"
 	result = "anti_toxin"
-	required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1)
+	required_reagents = list("silicon" = 1, "potassium" = 1, "ammonia" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/tramadol
 	name = "Tramadol"
 	id = "tramadol"
 	result = "tramadol"
-	required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "oxygen" = 1)
+	required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "acetone" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/paracetamol
@@ -60,35 +60,28 @@
 	name = "Sterilizine"
 	id = "sterilizine"
 	result = "sterilizine"
-	required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "chlorine" = 1)
+	required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "hclacid" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/silicate
 	name = "Silicate"
 	id = "silicate"
 	result = "silicate"
-	required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
+	required_reagents = list("aluminum" = 1, "silicon" = 1, "acetone" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/mutagen
 	name = "Unstable mutagen"
 	id = "mutagen"
 	result = "mutagen"
-	required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
+	required_reagents = list("radium" = 1, "phosphorus" = 1, "hclacid" = 1)
 	result_amount = 3
 
-/datum/chemical_reaction/water
-	name = "Water"
-	id = "water"
-	result = "water"
-	required_reagents = list("oxygen" = 1, "hydrogen" = 2)
-	result_amount = 1
-
 /datum/chemical_reaction/thermite
 	name = "Thermite"
 	id = "thermite"
 	result = "thermite"
-	required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1)
+	required_reagents = list("aluminum" = 1, "iron" = 1, "acetone" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/space_drugs
@@ -102,14 +95,14 @@
 	name = "Space Lube"
 	id = "lube"
 	result = "lube"
-	required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
+	required_reagents = list("water" = 1, "silicon" = 1, "acetone" = 1)
 	result_amount = 4
 
 /datum/chemical_reaction/pacid
 	name = "Polytrinic acid"
 	id = "pacid"
 	result = "pacid"
-	required_reagents = list("sacid" = 1, "chlorine" = 1, "potassium" = 1)
+	required_reagents = list("sacid" = 1, "hclacid" = 1, "potassium" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/synaptizine
@@ -130,14 +123,14 @@
 	name = "Arithrazine"
 	id = "arithrazine"
 	result = "arithrazine"
-	required_reagents = list("hyronalin" = 1, "hydrogen" = 1)
+	required_reagents = list("hyronalin" = 1, "hydrazine" = 1)
 	result_amount = 2
 
 /datum/chemical_reaction/impedrezene
 	name = "Impedrezene"
 	id = "impedrezene"
 	result = "impedrezene"
-	required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
+	required_reagents = list("mercury" = 1, "acetone" = 1, "sugar" = 1)
 	result_amount = 2
 
 /datum/chemical_reaction/kelotane
@@ -174,7 +167,7 @@
 	name = "Cryptobiolin"
 	id = "cryptobiolin"
 	result = "cryptobiolin"
-	required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
+	required_reagents = list("potassium" = 1, "acetone" = 1, "sugar" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/tricordrazine
@@ -188,14 +181,14 @@
 	name = "Alkysine"
 	id = "alkysine"
 	result = "alkysine"
-	required_reagents = list("chlorine" = 1, "nitrogen" = 1, "anti_toxin" = 1)
+	required_reagents = list("hclacid" = 1, "ammonia" = 1, "anti_toxin" = 1)
 	result_amount = 2
 
 /datum/chemical_reaction/dexalin
 	name = "Dexalin"
 	id = "dexalin"
 	result = "dexalin"
-	required_reagents = list("oxygen" = 2, "phoron" = 0.1)
+	required_reagents = list("acetone" = 2, "phoron" = 0.1)
 	catalysts = list("phoron" = 1)
 	inhibitors = list("water" = 1) // Messes with cryox
 	result_amount = 1
@@ -204,7 +197,7 @@
 	name = "Dermaline"
 	id = "dermaline"
 	result = "dermaline"
-	required_reagents = list("oxygen" = 1, "phosphorus" = 1, "kelotane" = 1)
+	required_reagents = list("acetone" = 1, "phosphorus" = 1, "kelotane" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/dexalinp
@@ -240,7 +233,7 @@
 	name = "Cryoxadone"
 	id = "cryoxadone"
 	result = "cryoxadone"
-	required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1)
+	required_reagents = list("dexalin" = 1, "water" = 1, "acetone" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/clonexadone
@@ -262,14 +255,14 @@
 	name = "imidazoline"
 	id = "imidazoline"
 	result = "imidazoline"
-	required_reagents = list("carbon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+	required_reagents = list("carbon" = 1, "hydrazine" = 1, "anti_toxin" = 1)
 	result_amount = 2
 
 /datum/chemical_reaction/ethylredoxrazine
 	name = "Ethylredoxrazine"
 	id = "ethylredoxrazine"
 	result = "ethylredoxrazine"
-	required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1)
+	required_reagents = list("acetone" = 1, "anti_toxin" = 1, "carbon" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/soporific
@@ -284,7 +277,7 @@
 	name = "Chloral Hydrate"
 	id = "chloralhydrate"
 	result = "chloralhydrate"
-	required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
+	required_reagents = list("ethanol" = 1, "hclacid" = 3, "water" = 1)
 	result_amount = 1
 
 /datum/chemical_reaction/potassium_chloride
@@ -312,7 +305,7 @@
 	name = "Mindbreaker Toxin"
 	id = "mindbreaker"
 	result = "mindbreaker"
-	required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+	required_reagents = list("silicon" = 1, "hydrazine" = 1, "anti_toxin" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/lipozine
@@ -323,19 +316,12 @@
 	result_amount = 3
 
 /datum/chemical_reaction/surfactant
-	name = "Foam surfactant"
-	id = "foam surfactant"
-	result = "fluorosurfactant"
-	required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
+	name = "Azosurfactant"
+	id = "surfactant"
+	result = "surfactant"
+	required_reagents = list("hydrazine" = 2, "carbon" = 2, "sacid" = 1)
 	result_amount = 5
 
-/datum/chemical_reaction/ammonia
-	name = "Ammonia"
-	id = "ammonia"
-	result = "ammonia"
-	required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
-	result_amount = 3
-
 /datum/chemical_reaction/diethylamine
 	name = "Diethylamine"
 	id = "diethylamine"
@@ -361,7 +347,7 @@
 	name = "Foaming Agent"
 	id = "foaming_agent"
 	result = "foaming_agent"
-	required_reagents = list("lithium" = 1, "hydrogen" = 1)
+	required_reagents = list("lithium" = 1, "hydrazine" = 1)
 	result_amount = 1
 
 /datum/chemical_reaction/glycerol
@@ -375,7 +361,7 @@
 	name = "Sodium Chloride"
 	id = "sodiumchloride"
 	result = "sodiumchloride"
-	required_reagents = list("sodium" = 1, "chlorine" = 1)
+	required_reagents = list("sodium" = 1, "hclacid" = 1)
 	result_amount = 2
 
 /datum/chemical_reaction/condensedcapsaicin
@@ -390,7 +376,7 @@
 	name = "Coolant"
 	id = "coolant"
 	result = "coolant"
-	required_reagents = list("tungsten" = 1, "oxygen" = 1, "water" = 1)
+	required_reagents = list("tungsten" = 1, "acetone" = 1, "water" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/rezadone
@@ -404,14 +390,14 @@
 	name = "Lexorin"
 	id = "lexorin"
 	result = "lexorin"
-	required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1)
+	required_reagents = list("phoron" = 1, "hydrazine" = 1, "ammonia" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/methylphenidate
 	name = "Methylphenidate"
 	id = "methylphenidate"
 	result = "methylphenidate"
-	required_reagents = list("mindbreaker" = 1, "hydrogen" = 1)
+	required_reagents = list("mindbreaker" = 1, "hydrazine" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/citalopram
@@ -426,7 +412,7 @@
 	name = "Paroxetine"
 	id = "paroxetine"
 	result = "paroxetine"
-	required_reagents = list("mindbreaker" = 1, "oxygen" = 1, "inaprovaline" = 1)
+	required_reagents = list("mindbreaker" = 1, "acetone" = 1, "inaprovaline" = 1)
 	result_amount = 3
 
 /* Solidification */
@@ -579,7 +565,7 @@
 	name = "Foam"
 	id = "foam"
 	result = null
-	required_reagents = list("fluorosurfactant" = 1, "water" = 1)
+	required_reagents = list("surfactant" = 1, "water" = 1)
 	result_amount = 2
 	mix_message = "The solution violently bubbles!"
 
@@ -1922,7 +1908,7 @@ datum
 			name = "Lithium Sodium Tungstate"
 			id = "lithiumsodiumtungstate"
 			result = "lithiumsodiumtungstate"
-			required_reagents = list("lithium" = 1, "sodium" = 2, "tungsten" = 1, "oxygen" = 4)
+			required_reagents = list("lithium" = 1, "sodium" = 2, "tungsten" = 1, "acetone" = 4)
 			result_amount = 8
 
 		density_separated_liquid

code/modules/reagents/dispenser/cartridge_presets.dm

@@ -10,18 +10,17 @@
 	sugar		spawn_reagent = "sugar"
 
 	// Chemistry
-	hydrogen	spawn_reagent = "hydrogen"
+	hydrazine	spawn_reagent = "hydrazine"
 	lithium		spawn_reagent = "lithium"
 	carbon		spawn_reagent = "carbon"
-	nitrogen	spawn_reagent = "nitrogen"
-	oxygen		spawn_reagent = "oxygen"
-	fluorine	spawn_reagent = "fluorine"
+	ammonia		spawn_reagent = "ammonia"
+	acetone		spawn_reagent = "acetone"
 	sodium		spawn_reagent = "sodium"
 	aluminum	spawn_reagent = "aluminum"
 	silicon		spawn_reagent = "silicon"
 	phosphorus	spawn_reagent = "phosphorus"
 	sulfur		spawn_reagent = "sulfur"
-	chlorine	spawn_reagent = "chlorine"
+	hclacid		spawn_reagent = "hclacid"
 	potassium	spawn_reagent = "potassium"
 	iron		spawn_reagent = "iron"
 	copper		spawn_reagent = "copper"

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -1,17 +1,16 @@
 /obj/machinery/chemical_dispenser/full
 	spawn_cartridges = list(
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrazine,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/nitrogen,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/oxygen,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/fluorine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ammonia,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/acetone,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/chlorine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/hclacid,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/iron,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/copper,

code/modules/reagents/dispenser/supply.dm

@@ -31,18 +31,17 @@
 /datum/supply_packs/reagents
 	name = "Chemistry dispenser refill"
 	contains = list(
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrazine,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/nitrogen,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/oxygen,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/fluorine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ammonia,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/acetone,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/chlorine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/hclacid,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/iron,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/copper,
@@ -153,18 +152,17 @@
 
 // Chemistry-restricted (raw reagents excluding sugar/water)
 //      Datum path  Contents type                                                       Supply pack name                  Container name                         Cost  Container access
-SEC_PACK(hydrogen,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen,   "Reagent refill - Hydrogen",      "hydrogen reagent cartridge crate",      15, access_chemistry)
+SEC_PACK(hydrazine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrazine,  "Reagent refill - Hydrazine",     "hydrazine reagent cartridge crate",     15, access_chemistry)
 SEC_PACK(lithium,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium,    "Reagent refill - Lithium",       "lithium reagent cartridge crate",       15, access_chemistry)
 SEC_PACK(carbon,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon,     "Reagent refill - Carbon",        "carbon reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(nitrogen,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/nitrogen,   "Reagent refill - Nitrogen",      "nitrogen reagent cartridge crate",      15, access_chemistry)
-SEC_PACK(oxygen,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxygen,     "Reagent refill - Oxygen",        "oxygen reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(fluorine,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/fluorine,   "Reagent refill - Fluorine",      "fluorine reagent cartridge crate",      15, access_chemistry)
+SEC_PACK(ammonia,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/ammonia,    "Reagent refill - Ammonia",       "ammonia reagent cartridge crate",       15, access_chemistry)
+SEC_PACK(oxygen,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/acetone,    "Reagent refill - Acetone",       "acetone reagent cartridge crate",       15, access_chemistry)
 SEC_PACK(sodium,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium,     "Reagent refill - Sodium",        "sodium reagent cartridge crate",        15, access_chemistry)
 SEC_PACK(aluminium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum,   "Reagent refill - Aluminum",      "aluminum reagent cartridge crate",      15, access_chemistry)
 SEC_PACK(silicon,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon,    "Reagent refill - Silicon",       "silicon reagent cartridge crate",       15, access_chemistry)
 SEC_PACK(phosphorus,/obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus",    "phosphorus reagent cartridge crate",    15, access_chemistry)
 SEC_PACK(sulfur,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur,     "Reagent refill - Sulfur",        "sulfur reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(chlorine,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/chlorine,   "Reagent refill - Chlorine",      "chlorine reagent cartridge crate",      15, access_chemistry)
+SEC_PACK(hclacid,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/hclacid,    "Reagent refill - Hydrochloric Acid", "hydrochloric acid reagent cartridge crate", 15, access_chemistry)
 SEC_PACK(potassium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium,  "Reagent refill - Potassium",     "potassium reagent cartridge crate",     15, access_chemistry)
 SEC_PACK(iron,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron,       "Reagent refill - Iron",          "iron reagent cartridge crate",          15, access_chemistry)
 SEC_PACK(copper,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/copper,     "Reagent refill - Copper",        "copper reagent cartridge crate",        15, access_chemistry)