mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 15:08:34 +01:00
get_random_colour() now prepends a # (#13423)
* get_random_colour() now prepends a # * Sleepy edits bad.
This commit is contained in:
@@ -1161,7 +1161,7 @@ var/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 ? hex : "#[num2hex(red, 2)][num2hex(green, 2)][num2hex(blue, 2)]"
|
||||
@@ -1178,7 +1178,7 @@ var/mob/dview/dview_mob = new
|
||||
log_error("Had to recreate the dview mob!")
|
||||
|
||||
dview_mob.loc = center
|
||||
|
||||
|
||||
dview_mob.see_invisible = invis_flags
|
||||
|
||||
. = view(range, dview_mob)
|
||||
@@ -1497,7 +1497,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
|
||||
. += new /obj/screen/plane_master/lighting //Lighting system (but different!)
|
||||
. += new /obj/screen/plane_master/o_light_visual //Object lighting (using masks)
|
||||
. += new /obj/screen/plane_master/emissive //Emissive overlays
|
||||
|
||||
|
||||
. += new /obj/screen/plane_master/ghosts //Ghosts!
|
||||
. += new /obj/screen/plane_master{plane = PLANE_AI_EYE} //AI Eye!
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ 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)
|
||||
@@ -184,11 +184,11 @@ 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
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
// Randomizes color
|
||||
/obj/item/weapon/melee/umbrella/random/New()
|
||||
color = "#"+get_random_colour()
|
||||
color = get_random_colour()
|
||||
..()
|
||||
|
||||
/obj/item/weapon/melee/cursedblade
|
||||
@@ -95,4 +95,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
|
||||
listening_objects |= src
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
/obj/item/weapon/storage/wallet/poly/New()
|
||||
..()
|
||||
verbs |= /obj/item/weapon/storage/wallet/poly/proc/change_color
|
||||
color = "#"+get_random_colour()
|
||||
color = get_random_colour()
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/storage/wallet/poly/proc/change_color()
|
||||
@@ -196,4 +196,4 @@
|
||||
icon_state = "casinowallet_white"
|
||||
return
|
||||
else
|
||||
icon_state = "casinowallet_black"
|
||||
icon_state = "casinowallet_black"
|
||||
|
||||
@@ -31,4 +31,4 @@
|
||||
|
||||
/obj/item/weapon/towel/random/New()
|
||||
..()
|
||||
color = "#"+get_random_colour()
|
||||
color = get_random_colour()
|
||||
|
||||
@@ -419,8 +419,8 @@
|
||||
set_trait(TRAIT_POTENCY,rand(5,30),200,0)
|
||||
set_trait(TRAIT_PRODUCT_ICON,pick(SSplants.accessible_product_sprites))
|
||||
set_trait(TRAIT_PLANT_ICON,pick(SSplants.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))
|
||||
@@ -548,7 +548,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)
|
||||
@@ -654,7 +654,7 @@
|
||||
if(get_trait(TRAIT_BIOLUM))
|
||||
source_turf.visible_message("<b>\The [display_name]</b> 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("<span class='notice'>\The [display_name]'s glow </span><font color='[get_trait(TRAIT_BIOLUM_COLOUR)]'>changes colour</font>!")
|
||||
else
|
||||
source_turf.visible_message("<span class='notice'>\The [display_name]'s glow dims...</span>")
|
||||
|
||||
@@ -409,7 +409,7 @@
|
||||
// harvested yet and it's safe to assume it's restricted to this tray.
|
||||
if(!isnull(SSplants.seeds[seed.name]))
|
||||
seed = seed.diverge()
|
||||
seed.mutate(severity,get_turf(src))
|
||||
seed.mutate(severity,get_turf(src))
|
||||
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user