cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update jobwhitelist.txt

Browse Source
This commit is contained in:
Casey
2022-06-25 17:54:57 -04:00
committed by CHOMPStation2
parent 0c9b70b451
commit 7a81cb88df
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/tgui_input/list.dm
View File

@@ -130,7 +130,7 @@
/datum/tgui_list_input/tgui_data(mob/user) /datum/tgui_list_input/tgui_data(mob/user)
var/list/data = list() var/list/data = list()
if(timeout) if(timeout)
.["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1)
return data return data
/datum/tgui_list_input/tgui_act(action, list/params) /datum/tgui_list_input/tgui_act(action, list/params)

2
code/modules/tgui_input/text.dm
View File

@@ -129,7 +129,7 @@
/datum/tgui_input_text/tgui_data(mob/user) /datum/tgui_input_text/tgui_data(mob/user)
var/list/data = list() var/list/data = list()
if(timeout) if(timeout)
.["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1)
return data return data
/datum/tgui_input_text/tgui_act(action, list/params) /datum/tgui_input_text/tgui_act(action, list/params)

28
config/jobwhitelist.txt
View File

@@ -1,3 +1,31 @@
# Job whitelist in format ckey - jobname # Job whitelist in format ckey - jobname
# Like arokha - clown # Like arokha - clown
<<<<<<< HEAD
=======
akram - clown
amshaegaar - mime
auraribbon - clown
awkwarddryad - mime
CGR - mime
chargae - mime
coolcrow420 - clown
coolcrow420 - mime
h0lysquirr3l - clown
joey4298 - mime
lm40 - clown
pastelprincedan - mime
pastelprincedan - clown
radishfriend - clown
seiga - mime
sgtryder - mime
siennaathens - clown
silvertalismen - clown
spirit1299 - clown
suicidalpickles - mime
tinybear16 - clown
tygertac - clown
verkister - clown
whiskyrose - clown
yecrowbarman - mime
>>>>>>> 2fe24136d0... Merge pull request #13163 from ItsSelis/patch-3