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

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

Browse Source
This commit is contained in:
izac112
2020-05-11 18:20:43 +02:00
parent 133a5f61d1 478c792de9
commit 2b3fc9a740
295 changed files with 6398 additions and 3317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/client procs.dm
View File

@@ -325,11 +325,13 @@
// VOREStation Edit Start - Department Hours
if(config.time_off)
var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'")
var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours, total_hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'")
query_hours.Execute()
LAZYINITLIST(department_hours)
LAZYINITLIST(play_hours)
while(query_hours.NextRow())
LAZYINITLIST(department_hours)
department_hours[query_hours.item[1]] = text2num(query_hours.item[2])
play_hours[query_hours.item[1]] = text2num(query_hours.item[3])
// VOREStation Edit End - Department Hours
if(sql_id)