From 43883793e9eaf9e95e77616965acad657c83e231 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Thu, 23 Jun 2022 10:23:57 +1000 Subject: [PATCH] get_random_colour() now prepends a #. --- code/_helpers/unsorted.dm | 2 +- code/game/objects/effects/decals/Cleanable/humans.dm | 8 +++++--- code/game/objects/items/weapons/melee/misc.dm | 4 ++-- code/game/objects/items/weapons/storage/wallets.dm | 2 +- code/game/objects/items/weapons/towels.dm | 2 +- code/modules/hydroponics/seed.dm | 8 ++++---- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index bd90d79c20..deec02badc 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1252,7 +1252,7 @@ var/global/list/WALLITEMS = list( if(length(temp_col )<2) temp_col = "0[temp_col]" colour += temp_col - return colour + return "#[colour]" /proc/color_square(red, green, blue, hex) var/color = hex || rgb(red, green, blue) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 92e4d66a05..36815339c7 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -51,7 +51,8 @@ var/global/list/image/splatter_cache=list() addtimer(CALLBACK(src, .proc/dry), DRYING_TIME * (amount+1)) /obj/effect/decal/cleanable/blood/update_icon() - if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]" + if(basecolor == "rainbow") + basecolor = get_random_colour(1) color = basecolor if(basecolor == SYNTH_BLOOD_COLOUR) @@ -183,11 +184,12 @@ var/global/list/image/splatter_cache=list() var/image/giblets = new(base_icon, "[icon_state]_flesh", dir) if(!fleshcolor || fleshcolor == "rainbow") - fleshcolor = "#[get_random_colour(1)]" + fleshcolor = get_random_colour(1) giblets.color = fleshcolor var/icon/blood = new(base_icon,"[icon_state]",dir) - if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]" + if(basecolor == "rainbow") + basecolor = get_random_colour(1) blood.Blend(basecolor,ICON_MULTIPLY) icon = blood diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 687f49bd8f..a1da1ebdd0 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -44,7 +44,7 @@ // Randomizes color /obj/item/melee/umbrella/random/Initialize() - color = "#"+get_random_colour() + color = get_random_colour() . = ..() /obj/item/melee/cursedblade @@ -82,4 +82,4 @@ new_voice.name = "cursed sword" //Cursed swords shouldn't be known characters. new_voice.real_name = "cursed sword" voice_mobs.Add(new_voice) - listening_objects |= src \ No newline at end of file + listening_objects |= src diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 4870dba114..baa7a16df9 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -103,7 +103,7 @@ /obj/item/storage/wallet/poly/Initialize() . = ..() verbs |= /obj/item/storage/wallet/poly/proc/change_color - color = "#"+get_random_colour() + color = get_random_colour() update_icon() /obj/item/storage/wallet/poly/proc/change_color() diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index 39c75bfc1a..b3c3a532a0 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -31,4 +31,4 @@ /obj/item/towel/random/Initialize() . = ..() - color = "#"+get_random_colour() \ No newline at end of file + color = get_random_colour() diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index cbec447ba4..34513969fd 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -413,8 +413,8 @@ set_trait(TRAIT_POTENCY,rand(5,30),200,0) set_trait(TRAIT_PRODUCT_ICON,pick(plant_controller.accessible_product_sprites)) set_trait(TRAIT_PLANT_ICON,pick(plant_controller.accessible_plant_sprites)) - set_trait(TRAIT_PLANT_COLOUR,"#[get_random_colour(0,75,190)]") - set_trait(TRAIT_PRODUCT_COLOUR,"#[get_random_colour(0,75,190)]") + set_trait(TRAIT_PLANT_COLOUR,get_random_colour(0,75,190)) + set_trait(TRAIT_PRODUCT_COLOUR,get_random_colour(0,75,190)) update_growth_stages() if(prob(20)) @@ -538,7 +538,7 @@ if(prob(5)) set_trait(TRAIT_BIOLUM,1) - set_trait(TRAIT_BIOLUM_COLOUR,"#[get_random_colour(0,75,190)]") + set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) if(prob(3)) set_trait(TRAIT_SPORING,1) @@ -644,7 +644,7 @@ if(get_trait(TRAIT_BIOLUM)) source_turf.visible_message("\The [display_name] begins to glow!") if(prob(degree*2)) - set_trait(TRAIT_BIOLUM_COLOUR,"#[get_random_colour(0,75,190)]") + set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) source_turf.visible_message("\The [display_name]'s glow changes colour!") else source_turf.visible_message("\The [display_name]'s glow dims...")