cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 05:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8657 from MistakeNot4892/randcol

Browse Source 
get_random_colour() now prepends a #.
This commit is contained in:
Atermonera
2022-06-25 10:49:48 -08:00
committed by GitHub
parent 91e64f1988 43883793e9
commit a9c08ab5f5
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/unsorted.dm
View File

@@ -1252,7 +1252,7 @@ var/global/list/WALLITEMS = list(
if(length(temp_col )<2) if(length(temp_col )<2)
temp_col = "0[temp_col]" temp_col = "0[temp_col]"
colour += temp_col colour += temp_col
return colour return "#[colour]"
/proc/color_square(red, green, blue, hex) /proc/color_square(red, green, blue, hex)
var/color = hex || rgb(red, green, blue) var/color = hex || rgb(red, green, blue)

8
code/game/objects/effects/decals/Cleanable/humans.dm
View File

@@ -51,7 +51,8 @@ var/global/list/image/splatter_cache=list()
addtimer(CALLBACK(src, .proc/dry), DRYING_TIME * (amount+1)) addtimer(CALLBACK(src, .proc/dry), DRYING_TIME * (amount+1))
/obj/effect/decal/cleanable/blood/update_icon() /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 color = basecolor
if(basecolor == SYNTH_BLOOD_COLOUR) 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) var/image/giblets = new(base_icon, "[icon_state]_flesh", dir)
if(!fleshcolor || fleshcolor == "rainbow") if(!fleshcolor || fleshcolor == "rainbow")
fleshcolor = "#[get_random_colour(1)]" fleshcolor = get_random_colour(1)
giblets.color = fleshcolor giblets.color = fleshcolor
var/icon/blood = new(base_icon,"[icon_state]",dir) 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) blood.Blend(basecolor,ICON_MULTIPLY)
icon = blood icon = blood

4
code/game/objects/items/weapons/melee/misc.dm
View File

@@ -44,7 +44,7 @@
// Randomizes color // Randomizes color
/obj/item/melee/umbrella/random/Initialize() /obj/item/melee/umbrella/random/Initialize()
color = "#"+get_random_colour() color = get_random_colour()
. = ..() . = ..()
/obj/item/melee/cursedblade /obj/item/melee/cursedblade
@@ -82,4 +82,4 @@
new_voice.name = "cursed sword" //Cursed swords shouldn't be known characters. new_voice.name = "cursed sword" //Cursed swords shouldn't be known characters.
new_voice.real_name = "cursed sword" new_voice.real_name = "cursed sword"
voice_mobs.Add(new_voice) voice_mobs.Add(new_voice)
listening_objects |= src listening_objects |= src

2
code/game/objects/items/weapons/storage/wallets.dm
View File

@@ -103,7 +103,7 @@
/obj/item/storage/wallet/poly/Initialize() /obj/item/storage/wallet/poly/Initialize()
. = ..() . = ..()
verbs |= /obj/item/storage/wallet/poly/proc/change_color verbs |= /obj/item/storage/wallet/poly/proc/change_color
color = "#"+get_random_colour() color = get_random_colour()
update_icon() update_icon()
/obj/item/storage/wallet/poly/proc/change_color() /obj/item/storage/wallet/poly/proc/change_color()

2
code/game/objects/items/weapons/towels.dm
View File

@@ -31,4 +31,4 @@
/obj/item/towel/random/Initialize() /obj/item/towel/random/Initialize()
. = ..() . = ..()
color = "#"+get_random_colour() color = get_random_colour()

8
code/modules/hydroponics/seed.dm
View File

@@ -413,8 +413,8 @@
set_trait(TRAIT_POTENCY,rand(5,30),200,0) set_trait(TRAIT_POTENCY,rand(5,30),200,0)
set_trait(TRAIT_PRODUCT_ICON,pick(plant_controller.accessible_product_sprites)) 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_ICON,pick(plant_controller.accessible_plant_sprites))
set_trait(TRAIT_PLANT_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)]") set_trait(TRAIT_PRODUCT_COLOUR,get_random_colour(0,75,190))
update_growth_stages() update_growth_stages()
if(prob(20)) if(prob(20))
@@ -538,7 +538,7 @@
if(prob(5)) if(prob(5))
set_trait(TRAIT_BIOLUM,1) 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)) if(prob(3))
set_trait(TRAIT_SPORING,1) set_trait(TRAIT_SPORING,1)
@@ -644,7 +644,7 @@
if(get_trait(TRAIT_BIOLUM)) if(get_trait(TRAIT_BIOLUM))
source_turf.visible_message("<span class='notice'>\The [display_name] begins to glow!</span>") source_turf.visible_message("<span class='notice'>\The [display_name] begins to glow!</span>")
if(prob(degree*2)) 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("<span class='notice'>\The [display_name]'s glow </span><font color='[get_trait(TRAIT_BIOLUM_COLOUR)]'>changes colour</font>!") source_turf.visible_message("<span class='notice'>\The [display_name]'s glow </span><font color='[get_trait(TRAIT_BIOLUM_COLOUR)]'>changes colour</font>!")
else else
source_turf.visible_message("<span class='notice'>\The [display_name]'s glow dims...</span>") source_turf.visible_message("<span class='notice'>\The [display_name]'s glow dims...</span>")