mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-29 08:09:34 +01:00
Merge pull request #8482 from Spookerton/spkrtn/cng/legacy-text-number-handling
legacy text number handling
This commit is contained in:
@@ -322,7 +322,7 @@ var/list/wrapped_species_by_ref = list()
|
||||
|
||||
/mob/living/carbon/human/proc/shapeshifter_set_eye_color(var/new_eyes)
|
||||
|
||||
var/list/new_color_rgb_list = hex2rgb(new_eyes)
|
||||
var/list/new_color_rgb_list = rgb2num(new_eyes)
|
||||
// First, update mob vars.
|
||||
r_eyes = new_color_rgb_list[1]
|
||||
g_eyes = new_color_rgb_list[2]
|
||||
|
||||
@@ -938,7 +938,7 @@
|
||||
var/B = 0
|
||||
|
||||
for(var/C in colors_to_blend)
|
||||
var/RGB = hex2rgb(C)
|
||||
var/RGB = rgb2num(C)
|
||||
R = between(0, R + RGB[1], 255)
|
||||
G = between(0, G + RGB[2], 255)
|
||||
B = between(0, B + RGB[3], 255)
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
/mob/living/silicon/pai/proc/show_silenced()
|
||||
if(src.silence_time)
|
||||
var/timeleft = round((silence_time - world.timeofday)/10 ,1)
|
||||
stat(null, "Communications system reboot in -[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
stat(null, "Communications system reboot in -[(timeleft / 60) % 60]:[pad_left(num2text(timeleft % 60), 2, "0")]")
|
||||
|
||||
|
||||
/mob/living/silicon/pai/Stat()
|
||||
|
||||
@@ -86,13 +86,6 @@
|
||||
return check_rights(R_ADMIN|R_EVENT, 0, user) != 0
|
||||
|
||||
|
||||
/proc/hsl2rgb(h, s, l)
|
||||
return //TODO: Implement
|
||||
|
||||
/*
|
||||
Miss Chance
|
||||
*/
|
||||
|
||||
/proc/check_zone(zone)
|
||||
if(!zone) return BP_TORSO
|
||||
switch(zone)
|
||||
|
||||
Reference in New Issue
Block a user