other.dm

code/modules/hydroponics/backtank.dm

@@ -173,7 +173,7 @@
 
 /obj/item/watertank/janitor/Initialize()
 	. = ..()
-	reagents.add_reagent("cleaner", 500)
+	reagents.add_reagent(REAGENT_ID_CLEANER, 500)
 
 /obj/item/watertank/janitor/make_noz()
 	return new /obj/item/reagent_containers/spray/mister/janitor(src)

code/modules/hydroponics/grown.dm

@@ -84,7 +84,7 @@
 			descriptors |= "bitter"
 		if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
 			descriptors |= "sweet-sour"
-		if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent("uranium"))
+		if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent(REAGENT_ID_URANIUM))
 			descriptors |= "radioactive"
 		if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
 			descriptors |= "poisonous"
@@ -94,7 +94,7 @@
 			descriptors |= "medicinal"
 		if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent("earthsblood"))
 			descriptors |= "shiny"
-		if(reagents.has_reagent("lube"))
+		if(reagents.has_reagent(REAGENT_ID_LUBE))
 			descriptors |= "slippery"
 		if(reagents.has_reagent(REAGENT_ID_PACID) || reagents.has_reagent(REAGENT_ID_SACID))
 			descriptors |= "acidic"
@@ -196,7 +196,7 @@
 
 			if(seed.chems)
 
-				if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"]))
+				if(W.sharp && W.edge && !isnull(seed.chems[REAGENT_ID_WOODPULP]))
 					user.show_message(span_notice("You make planks out of \the [src]!"), 1)
 					playsound(src, 'sound/effects/woodcutting.ogg', 50, 1)
 					var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)

code/modules/hydroponics/seedtypes/berries.dm

@@ -26,7 +26,7 @@
 	seed_name = "glowberry"
 	display_name = "glowberry bush"
 	mutants = null
-	chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "uranium" = list(3,5))
+	chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_URANIUM = list(3,5))
 
 /datum/seed/berry/glow/New()
 	..()

code/modules/hydroponics/seedtypes/grass.dm

@@ -25,7 +25,7 @@
 	display_name = "carpet"
 	kitchen_tag = "carpet"
 	mutants = null
-	chems = list("liquidcarpet" = list(5,10))
+	chems = list(REAGENT_ID_LIQUIDCARPET = list(5,10))
 
 /datum/seed/grass/carpet/New()
 	..()

code/modules/hydroponics/seedtypes/mushrooms.dm

@@ -130,7 +130,7 @@
 	name = "towercap"
 	seed_name = "tower cap"
 	display_name = "tower caps"
-	chems = list("woodpulp" = list(10,1))
+	chems = list(REAGENT_ID_WOODPULP = list(10,1))
 	mutants = list("redcap")
 	has_item_product = /obj/item/stack/material/log
 
@@ -146,7 +146,7 @@
 	name = "redcap"
 	seed_name = "red cap"
 	display_name = "red caps"
-	chems = list("woodpulp" = list(10,1), "tannin" = list(1,10))
+	chems = list(REAGENT_ID_WOODPULP = list(10,1), "tannin" = list(1,10))
 	mutants = null
 	has_item_product = null
 

code/modules/hydroponics/seedtypes/tomatoes.dm

@@ -53,7 +53,7 @@
 	seed_name = "blue tomato"
 	display_name = "blue tomato plant"
 	mutants = list("bluespacetomato")
-	chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lube" = list(1,5))
+	chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LUBE = list(1,5))
 
 /datum/seed/tomato/blue/New()
 	..()

code/modules/hydroponics/spreading/spreading.dm

@@ -198,7 +198,7 @@
 	if(growth>2 && growth == max_growth)
 		plane = ABOVE_PLANE
 		set_opacity(1)
-		if(!isnull(seed.chems["woodpulp"]))
+		if(!isnull(seed.chems[REAGENT_ID_WOODPULP]))
 			density = TRUE
 	else
 		reset_plane_and_layer()

code/modules/hydroponics/trays/tray.dm

@@ -71,8 +71,8 @@
 		REAGENT_ID_PHOSPHORUS =      0.1,
 		REAGENT_ID_SUGAR =           0.1,
 		"sodawater" =       0.1,
-		"ammonia" =         1,
-		"diethylamine" =    2,
+		REAGENT_ID_AMMONIA =         1,
+		REAGENT_ID_DIETHYLAMINE =    2,
 		REAGENT_ID_NUTRIMENT =       1,
 		REAGENT_ID_ADMINORDRAZINE =  1,
 		"eznutrient" =      1,
@@ -91,7 +91,7 @@
 		)
 	var/static/list/pestkiller_reagents = list(
 		REAGENT_ID_SUGAR =           2,
-		"diethylamine" =   -2,
+		REAGENT_ID_DIETHYLAMINE =   -2,
 		REAGENT_ID_ADMINORDRAZINE = -5
 		)
 	var/static/list/water_reagents = list(
@@ -117,8 +117,8 @@
 		REAGENT_ID_PACID =          list( -2,    0,   0  ),
 		"plantbgone" =     list( -2,    0,   0.2),
 		"cryoxadone" =     list(  3,    0,   0  ),
-		"ammonia" =        list(  0.5,  0,   0  ),
-		"diethylamine" =   list(  1,    0,   0  ),
+		REAGENT_ID_AMMONIA =        list(  0.5,  0,   0  ),
+		REAGENT_ID_DIETHYLAMINE =   list(  1,    0,   0  ),
 		REAGENT_ID_NUTRIMENT =      list(  0.5,  0.1, 0  ),
 		REAGENT_ID_RADIUM =         list( -1.5,  0,   0.2),
 		REAGENT_ID_ADMINORDRAZINE = list(  1,    1,   1  ),