mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
This commit is contained in:
@@ -22,6 +22,9 @@ var/global/list/joblist = list() //list of all jobstypes, minus borg and AI
|
||||
|
||||
var/list/mannequins_
|
||||
|
||||
// Times that players are allowed to respawn ("ckey" = world.time)
|
||||
GLOBAL_LIST_EMPTY(respawn_timers)
|
||||
|
||||
// Posters
|
||||
var/global/list/poster_designs = list()
|
||||
var/global/list/NT_poster_designs = list()
|
||||
|
||||
@@ -367,6 +367,13 @@ proc/ReadRGB(rgb)
|
||||
. = list(r, g, b)
|
||||
if(usealpha) . += alpha
|
||||
|
||||
proc/RGBdec2hex(var/list/values)
|
||||
var/string = ""
|
||||
while(values.len)
|
||||
string = "[num2text(values[values.len], 2, 16)][string]"
|
||||
values.len--
|
||||
return "#[string]"
|
||||
|
||||
proc/ReadHSV(hsv)
|
||||
if(!hsv) return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user