cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds better combined colour check for greyscale modify menu (#88598)

Browse Source 
## About The Pull Request
- Fixes #87829

Ensures we can't enter invalid values that actually run timed in this
specific case

## Changelog
🆑
fix: greyscale modify menu has better validation for player entered
colours
/🆑
This commit is contained in:
SyncIt21
2024-12-22 02:42:32 +05:30
committed by GitHub
parent 15d49160e4
commit ad4108d6f3
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/admin/greyscale_modify_menu.dm
View File

@@ -241,14 +241,24 @@ This is highly likely to cause massive amounts of lag as every object in the gam
config.EnableAutoRefresh(config_owner_type) config.EnableAutoRefresh(config_owner_type)
/datum/greyscale_modify_menu/proc/ReadColorsFromString(colorString) /datum/greyscale_modify_menu/proc/ReadColorsFromString(colorString)
var/list/new_split_colors = list() //length validation
var/list/colors = splittext(colorString, "#") var/list/colors = splittext(colorString, "#")
for(var/index in 2 to min(length(colors), config.expected_colors + 1)) if(length(colors) <= 1) //doesn't even begin with a # so isn't even a color
return FALSE
colors.Cut(1, 2) //removes the white space as a consequence of the string beginning with a #
if(colors.len != config.expected_colors) //not the expected length
return FALSE
//value validation
var/list/new_split_colors = list()
for(var/index in 1 to config.expected_colors)
var/color = "#[colors[index]]" var/color = "#[colors[index]]"
if(!findtext(color, GLOB.is_color) && (!unlocked || !findtext(color, GLOB.is_alpha_color))) if(!findtext(color, GLOB.is_color) && (!unlocked || !findtext(color, GLOB.is_alpha_color)))
return FALSE return FALSE
new_split_colors += color new_split_colors += color
split_colors = new_split_colors split_colors = new_split_colors
//all good
return TRUE return TRUE
/datum/greyscale_modify_menu/proc/randomize_color(color_index) /datum/greyscale_modify_menu/proc/randomize_color(color_index)