Merge pull request #1629 from DragonTrance/more-colors

Ports tgstation's Color Standardization, adds Color Defines and Signals
2026-08-29 15:46:22 +01:00 · 2022-07-06 15:44:41 -06:00
parent 708d1a2664 ca592d1e1e
commit b103b5fa9a
188 changed files with 715 additions and 652 deletions
@@ -5,7 +5,7 @@
 	desc = "This is a plant."
 	icon_state = "ambrosiavulgaris"
 	slot_flags = ITEM_SLOT_HEAD
-	filling_color = "#008000"
+	filling_color = COLOR_DARK_GREEN
 	bitesize_mod = 2
 	foodtype = VEGETABLES
 	tastes = list("ambrosia" = 1)
@@ -21,7 +21,7 @@
 	icon_state = "banana"
 	item_state = "banana"
 	trash = /obj/item/grown/bananapeel
-	filling_color = "#FFFF00"
+	filling_color = COLOR_YELLOW
 	bitesize = 5
 	foodtype = FRUIT
 	juice_results = list(/datum/reagent/consumable/banana = 0)
@@ -115,7 +115,7 @@
 	icon_state = "banana_blue"
 	item_state = "bluespace_peel"
 	trash = /obj/item/grown/bananapeel/bluespace
-	filling_color = "#0000FF"
+	filling_color = COLOR_BLUE
 	tastes = list("banana" = 1)
 	wine_power = 60
 	wine_flavor = "slippery hypercubes"
@@ -23,7 +23,7 @@
 	desc = "Nutritious!"
 	icon_state = "berrypile"
 	gender = PLURAL
-	filling_color = "#FF00FF"
+	filling_color = COLOR_MAGENTA
 	bitesize_mod = 2
 	foodtype = FRUIT
 	juice_results = list(/datum/reagent/consumable/berryjuice = 0)
@@ -132,7 +132,7 @@
 	desc = "Great for toppings!"
 	icon_state = "cherry"
 	gender = PLURAL
-	filling_color = "#FF0000"
+	filling_color = COLOR_RED
 	bitesize_mod = 2
 	foodtype = FRUIT
 	grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
@@ -181,7 +181,7 @@
 	name = "cherry bulbs"
 	desc = "They're like little Space Christmas lights!"
 	icon_state = "cherry_bulb"
-	filling_color = "#FF0000"
+	filling_color = COLOR_RED
 	bitesize_mod = 2
 	foodtype = FRUIT
 	grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
@@ -86,7 +86,7 @@
 	name = "cannabis leaf"
 	desc = "Recently legalized in most galaxies."
 	icon_state = "cannabis"
-	filling_color = "#00FF00"
+	filling_color = COLOR_GREEN
 	bitesize_mod = 2
 	foodtype = VEGETABLES //i dont really know what else weed could be to be honest
 	tastes = list("cannabis" = 1)
@@ -23,7 +23,7 @@
 	name = "chili"
 	desc = "It's spicy! Wait... IT'S BURNING ME!!"
 	icon_state = "chilipepper"
-	filling_color = "#FF0000"
+	filling_color = COLOR_RED
 	bitesize_mod = 2
 	foodtype = FRUIT
 	wine_power = 20
@@ -31,7 +31,7 @@
 	desc = "It's so sour, your face will twist."
 	foodtype = FRUIT | ANTITOXIC
 	icon_state = "lime"
-	filling_color = "#00FF00"
+	filling_color = COLOR_GREEN
 	juice_results = list(/datum/reagent/consumable/limejuice = 0)

 // Orange
@@ -21,7 +21,7 @@
 	desc = "Needs some butter!"
 	icon_state = "corn"
 	cooked_type = /obj/item/reagent_containers/food/snacks/popcorn
-	filling_color = "#FFFF00"
+	filling_color = COLOR_YELLOW
 	trash = /obj/item/grown/corncob
 	bitesize_mod = 2
 	foodtype = VEGETABLES
@@ -20,7 +20,7 @@
 	name = "eggplant"
 	desc = "Maybe there's a chicken inside?"
 	icon_state = "eggplant"
-	filling_color = "#800080"
+	filling_color = COLOR_PURPLE
 	bitesize_mod = 2
 	foodtype = FRUIT
 	wine_power = 20
@@ -23,7 +23,7 @@
 	name = "grass"
 	desc = "Green and lush."
 	icon_state = "grassclump"
-	filling_color = "#32CD32"
+	filling_color = COLOR_LIME
 	bitesize_mod = 2
 	var/stacktype = /obj/item/stack/tile/grass
 	var/tile_coefficient = 0.02 // 1/50
@@ -30,7 +30,7 @@
 	slices_num = 5
 	dried_type = null
 	w_class = WEIGHT_CLASS_NORMAL
-	filling_color = "#008000"
+	filling_color = COLOR_DARK_GREEN
 	bitesize_mod = 3
 	foodtype = FRUIT
 	juice_results = list(/datum/reagent/consumable/watermelonjuice = 0)
@@ -380,8 +380,7 @@
 			icon_state = "coconut_grenade_active"
 			desc = "RUN!"
 			if(!seed.get_gene(/datum/plant_gene/trait/glow))
-				light_color = "#FFCC66" //for the fuse
-				set_light(3, 0.8)
+				set_light(3, 0.8, COLOR_CREAMY_ORANGE)
 			return

 	//ADDING A FUSE, NADE LOGIC
@@ -86,7 +86,7 @@
 	name = "fly amanita"
 	desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
 	icon_state = "amanita"
-	filling_color = "#FF0000"
+	filling_color = COLOR_RED

 // Destroying Angel
 /obj/item/seeds/angel
@@ -21,7 +21,7 @@
 	name = "Tea Aspera tips"
 	desc = "These aromatic tips of the tea plant can be dried to make tea."
 	icon_state = "tea_aspera_leaves"
-	filling_color = "#008000"
+	filling_color = COLOR_DARK_GREEN
 	grind_results = list(/datum/reagent/toxin/teapowder = 0)
 	dry_grind = TRUE
 	can_distill = FALSE
@@ -20,7 +20,7 @@
 	name = "tobacco leaves"
 	desc = "Dry them out to make some smokes."
 	icon_state = "tobacco_leaves"
-	filling_color = "#008000"
+	filling_color = COLOR_DARK_GREEN
 	distill_reagent = /datum/reagent/consumable/ethanol/creme_de_menthe //Menthol, I guess.

 // Space Tobacco
@@ -45,7 +45,7 @@
 	desc = "So bloody...so...very...bloody....AHHHH!!!!"
 	icon_state = "bloodtomato"
 	splat_type = /obj/effect/gibspawner/generic
-	filling_color = "#FF0000"
+	filling_color = COLOR_RED
 	foodtype = FRUIT | GROSS
 	grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood/tomato = 0)
 	distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary
@@ -71,7 +71,7 @@
 	desc = "I say blue-mah-to, you say blue-mae-to."
 	icon_state = "bluetomato"
 	splat_type = /obj/effect/decal/cleanable/oil
-	filling_color = "#0000FF"
+	filling_color = COLOR_BLUE
 	distill_reagent = /datum/reagent/consumable/laughter

 // Bluespace Tomato
@@ -119,7 +119,7 @@
 	desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
 	icon_state = "killertomato"
 	var/awakening = 0
-	filling_color = "#FF0000"
+	filling_color = COLOR_RED
 	distill_reagent = /datum/reagent/consumable/ethanol/demonsblood

 /obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
@@ -329,7 +329,7 @@ datum/plant_gene/trait/glow/white

 /datum/plant_gene/trait/glow/red
 	name = "Red Bioluminescence"
-	glow_color = "#FF3333"
+	glow_color = COLOR_RED_LIGHT

 /datum/plant_gene/trait/glow/yellow
 	//not the disgusting glowshroom yellow hopefully