Merge branch 'master' into economy-update-junk

code/modules/reagents/chemistry/reagents.dm

@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 	var/list/data
 	var/current_cycle = 0
 	var/volume = 0									//pretend this is moles
-	var/color = "#000000" // rgb: 0, 0, 0
+	var/color = COLOR_BLACK
 	var/can_synth = TRUE // can this reagent be synthesized? (for example: odysseus syringe gun)
 	var/metabolization_rate = REAGENTS_METABOLISM //how fast the reagent is metabolized by the mob
 	var/overrides_metab = 0

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -1514,7 +1514,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 /datum/reagent/consumable/ethanol/triple_sec
 	name = "Triple Sec"
 	description = "A sweet and vibrant orange liqueur."
-	color = "#ffcc66"
+	color = COLOR_CREAMY_ORANGE
 	boozepwr = 30
 	taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean"
 	glass_icon_state = "glass_orange"
@@ -1576,7 +1576,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
 /datum/reagent/consumable/ethanol/quintuple_sec
 	name = "Quintuple Sec"
 	description = "Law, Order, Alcohol, and Police Brutality distilled into one single elixir of JUSTICE."
-	color = "#ff3300"
+	color = COLOR_MOSTLY_PURE_RED
 	boozepwr = 80
 	quality = DRINK_FANTASTIC
 	taste_description = "THE LAW"
@@ -1622,7 +1622,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
 /datum/reagent/consumable/ethanol/bastion_bourbon
 	name = "Bastion Bourbon"
 	description = "Soothing hot herbal brew with restorative properties. Hints of citrus and berry flavors."
-	color = "#00FFFF"
+	color = COLOR_CYAN
 	boozepwr = 30
 	quality = DRINK_FANTASTIC
 	taste_description = "hot herbal brew with a hint of fruit"
@@ -1661,7 +1661,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
 /datum/reagent/consumable/ethanol/squirt_cider
 	name = "Squirt Cider"
 	description = "Fermented squirt extract with a nose of stale bread and ocean water. Whatever a squirt is."
-	color = "#FF0000"
+	color = COLOR_RED
 	boozepwr = 40
 	taste_description = "stale bread with a staler aftertaste"
 	nutriment_factor = 2 * REAGENTS_METABOLISM

code/modules/reagents/chemistry/reagents/blob_reagents.dm

@@ -4,7 +4,7 @@
 	description = "shouldn't exist and you should adminhelp immediately."
 	color = "#FFFFFF"
 	taste_description = "bad code and slime"
-	var/complementary_color = "#000000" //a color that's complementary to the normal blob color
+	var/complementary_color = COLOR_BLACK //a color that's complementary to the normal blob color
 	var/shortdesc = null //just damage and on_mob effects, doesn't include special, blob-tile only effects
 	var/effectdesc = null //any long, blob-tile specific effects
 	var/analyzerdescdamage = "Unknown. Report this bug to a coder, or just adminhelp."

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -481,7 +481,7 @@
 /datum/reagent/consumable/space_up
 	name = "Space-Up"
 	description = "Tastes like a hull breach in your mouth."
-	color = "#00FF00" // rgb: 0, 255, 0
+	color = COLOR_GREEN // rgb: 0, 255, 0
 	taste_description = "cherry soda"
 	glass_icon_state = "space-up_glass"
 	glass_name = "glass of Space-Up"
@@ -679,7 +679,7 @@
 /datum/reagent/consumable/chocolatepudding
 	name = "Chocolate Pudding"
 	description = "A great dessert for chocolate lovers."
-	color = "#800000"
+	color = COLOR_RED
 	quality = DRINK_VERYGOOD
 	nutriment_factor = 4 * REAGENTS_METABOLISM
 	taste_description = "sweet chocolate"

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -428,7 +428,7 @@
 	name = "Sprinkles"
 	value = 3
 	description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
-	color = "#FF00FF" // rgb: 255, 0, 255
+	color = COLOR_MAGENTA // rgb: 255, 0, 255
 	taste_description = "childhood whimsy"
 
 /datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M)

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -82,7 +82,7 @@
 /datum/reagent/medicine/synaptizine
 	name = "Synaptizine"
 	description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
-	color = "#FF00FF"
+	color = COLOR_MAGENTA
 	pH = 4
 
 /datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M)
@@ -458,7 +458,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	name = "Charcoal"
 	description = "Heals toxin damage as well as slowly removing any other chemicals the patient has in their bloodstream."
 	reagent_state = LIQUID
-	color = "#000000"
+	color = COLOR_BLACK
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	taste_description = "ash"
 	pH = 5
@@ -598,7 +598,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	name = "Salbutamol"
 	description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent."
 	reagent_state = LIQUID
-	color = "#00FFFF"
+	color = COLOR_CYAN
 	metabolization_rate = 0.25 * REAGENTS_METABOLISM
 	pH = 2
 
@@ -786,7 +786,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	name = "Atropine"
 	description = "If a patient is in critical condition, rapidly heals all damage types as well as regulating oxygen in the body. Excellent for stabilizing wounded patients."
 	reagent_state = LIQUID
-	color = "#000000"
+	color = COLOR_BLACK
 	metabolization_rate = 0.25 * REAGENTS_METABOLISM
 	overdose_threshold = 35
 	pH = 12

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -1584,7 +1584,7 @@
 /datum/reagent/plantnutriment
 	name = "Generic nutriment"
 	description = "Some kind of nutriment. 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
+	color = COLOR_BLACK
 	var/tox_prob = 0
 	taste_description = "plant food"
 	pH = 3
@@ -1694,7 +1694,7 @@
 	name = "Colorful Reagent"
 	description = "Thoroughly sample the rainbow."
 	reagent_state = LIQUID
-	color = "#FFFF00"
+	color = COLOR_YELLOW
 	var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700")
 	taste_description = "rainbows"
 	var/no_mob_color = FALSE
@@ -2020,7 +2020,7 @@
 /datum/reagent/growthserum //neutered to use as a chemical base for sizecode shit
 	name = "Growth Serum"
 	description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant
-	color = "#ff0000"//strong red. rgb 255, 0, 0
+	color = COLOR_RED//strong red. rgb 255, 0, 0
 	taste_description = "bitterness" // apparently what viagra tastes like
 
 /datum/reagent/plastic_polymers
@@ -2176,7 +2176,7 @@
 	name = "UNKNOWN"
 	description = "404: Chemical not found."
 	metabolization_rate = REAGENTS_METABOLISM
-	color = "#0000FF"
+	color = COLOR_BLUE
 	can_synth = FALSE
 	var/datum/dna/original_dna
 	var/reagent_ticks = 0

code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm

@@ -26,7 +26,7 @@
 	name = "Stabilizing Agent"
 	description = "Keeps unstable chemicals stable. This does not work on everything."
 	reagent_state = LIQUID
-	color = "#FFFF00"
+	color = COLOR_YELLOW
 	value = 3
 	taste_description = "metal"
 
@@ -92,7 +92,7 @@
 	name = "Black Powder"
 	description = "Explodes. Violently."
 	reagent_state = LIQUID
-	color = "#000000"
+	color = COLOR_BLACK
 	value = 5
 	metabolization_rate = 0.05
 	taste_description = "salt"

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -27,7 +27,7 @@
 /datum/reagent/toxin/mutagen
 	name = "Unstable mutagen"
 	description = "Might cause unpredictable mutations. Keep away from children."
-	color = "#00FF00"
+	color = COLOR_GREEN
 	toxpwr = 0
 	taste_description = "slime"
 	taste_mult = 0.9
@@ -562,7 +562,7 @@
 	name = "Sodium Thiopental"
 	description = "Sodium Thiopental induces heavy weakness in its target as well as unconsciousness."
 	reagent_state = LIQUID
-	color = "#6496FA"
+	color = LIGHT_COLOR_BLUE
 	metabolization_rate = 0.75 * REAGENTS_METABOLISM
 	toxpwr = 0
 

code/modules/reagents/reagent_containers/rags.dm

@@ -174,7 +174,7 @@
 	force = initial(force) + round(reagents.total_volume * 0.5)
 
 /obj/item/reagent_containers/rag/towel/random
-	possible_colors = list("#FF0000","#FF7F00","#FFFF00","#00FF00","#0000FF","#4B0082","#8F00FF")
+	possible_colors = list(COLOR_RED,"#FF7F00",COLOR_YELLOW,COLOR_GREEN,COLOR_BLUE,"#4B0082","#8F00FF")
 
 /obj/item/reagent_containers/rag/towel/syndicate
 	name = "syndicate towel"