diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index b4aa33c1cd8..f3151f64e0b 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -140,6 +140,15 @@ #define COLOR_ASSEMBLY_BLUE "#38559E" #define COLOR_ASSEMBLY_PURPLE "#6F6192" +//Colors for Bioluminescence plant traits. +#define COLOR_BIOLUMINESCENCE_STANDARD "#C3E381" +#define COLOR_BIOLUMINESCENCE_SHADOW "#AAD84B" +#define COLOR_BIOLUMINESCENCE_YELLOW "#FFFF66" +#define COLOR_BIOLUMINESCENCE_GREEN "#99FF99" +#define COLOR_BIOLUMINESCENCE_BLUE "#6699FF" +#define COLOR_BIOLUMINESCENCE_PURPLE "#D966FF" +#define COLOR_BIOLUMINESCENCE_PINK "#FFB3DA" + ///Colors for grayscale tools #define COLOR_TOOL_BLUE "#1861d5" #define COLOR_TOOL_RED "#951710" diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index 504b9326552..08f6e0306f7 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -38,6 +38,9 @@ ///How many tiles standard fires glow. #define LIGHT_RANGE_FIRE 3 +#define LIGHT_FIRE_BLOSSOM 2.1 +#define LIGHT_RANGE_FIRE_BLOSSOM_HARVESTED 2.7 +#define LIGHT_POWER_FIRE_BLOSSOM_HARVESTED 1.5 // Lighting cutoff defines // These are a percentage of how much darkness to cut off (in rgb) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index b7b404be770..fa81a51b1ad 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -353,8 +353,8 @@ description = "It emits a soft glow." trait_ids = GLOW_ID mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE - /// The color of our bioluminesence. - var/glow_color = "#C3E381" + /// The color of our bioluminescence. + var/glow_color = COLOR_BIOLUMINESCENCE_STANDARD /datum/plant_gene/trait/glow/proc/glow_range(obj/item/seeds/seed) return 1.4 + seed.potency * rate @@ -379,7 +379,7 @@ name = "Shadow Emission" icon = "lightbulb-o" rate = 0.04 - glow_color = "#AAD84B" + glow_color = COLOR_BIOLUMINESCENCE_SHADOW /datum/plant_gene/trait/glow/shadow/glow_power(obj/item/seeds/seed) return -max(seed.potency*(rate*0.2), 0.2) @@ -389,37 +389,37 @@ /// White /datum/plant_gene/trait/glow/white name = "White Bioluminescence" - glow_color = "#FFFFFF" + glow_color = COLOR_WHITE /// Red /datum/plant_gene/trait/glow/red name = "Red Bioluminescence" - glow_color = "#FF3333" + glow_color = COLOR_RED_LIGHT /// Yellow (not the disgusting glowshroom yellow hopefully) /datum/plant_gene/trait/glow/yellow name = "Yellow Bioluminescence" - glow_color = "#FFFF66" + glow_color = COLOR_BIOLUMINESCENCE_YELLOW /// Green (oh no, now i'm radioactive) /datum/plant_gene/trait/glow/green name = "Green Bioluminescence" - glow_color = "#99FF99" + glow_color = COLOR_BIOLUMINESCENCE_GREEN /// Blue (the best one) /datum/plant_gene/trait/glow/blue name = "Blue Bioluminescence" - glow_color = "#6699FF" + glow_color = COLOR_BIOLUMINESCENCE_BLUE /// Purple (did you know that notepad++ doesnt think bioluminescence is a word) (was the person who wrote this using notepad++ for dm?) /datum/plant_gene/trait/glow/purple name = "Purple Bioluminescence" - glow_color = "#D966FF" + glow_color = COLOR_BIOLUMINESCENCE_PURPLE // Pink (gay tide station pride) /datum/plant_gene/trait/glow/pink name = "Pink Bioluminescence" - glow_color = "#FFB3DA" + glow_color = COLOR_BIOLUMINESCENCE_PINK /* * Makes plant teleport people when squashed or slipped on. diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 6e70edc419a..e9a74cbc63e 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -133,6 +133,9 @@ desc = "An odd flower that grows commonly near bodies of lava." icon_state = "fireblossom1" base_icon_state = "fireblossom" + light_range = LIGHT_FIRE_BLOSSOM + light_power = LIGHT_FIRE_BLOSSOM + light_color = COLOR_BIOLUMINESCENCE_YELLOW product_types = list(/obj/item/food/grown/ash_flora/fireblossom = 1) harvested_name = "fire blossom stems" harvested_desc = "A few fire blossom stems, missing their flowers." @@ -144,6 +147,18 @@ regrowth_time_high = 4000 number_of_variants = 2 +/obj/structure/flora/ash/fireblossom/after_harvest() + set_light_power(LIGHT_RANGE_FIRE_BLOSSOM_HARVESTED) + set_light_range(LIGHT_POWER_FIRE_BLOSSOM_HARVESTED) + update_light() + return ..() + +/obj/structure/flora/ash/fireblossom/regrow() + set_light_power(initial(light_power)) + set_light_range(initial(light_range)) + update_light() + return ..() + ///Snow flora to exist on icebox. /obj/structure/flora/ash/chilly name = "springy grassy fruit"