cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
This commit is contained in:
izac112
2020-05-06 21:53:03 +02:00
parent d06278c69e 60b756cc6e
commit e28994b7be
1099 changed files with 63850 additions and 118586 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/planet/time.dm
+5 -3
View File
@@ -11,27 +11,29 @@
/datum/time/New(new_time)
if(new_time)
if(new_time >= seconds_in_day)
new_time = rollover(new_time)
seconds_stored = new_time
..()
/datum/time/proc/add_seconds(amount)
var/answer = seconds_stored + amount * 10
if(answer >= seconds_in_day)
rollover(answer)
answer = rollover(answer)
return new type(answer)
/datum/time/proc/add_minutes(amount)
var/real_amount = amount * seconds_in_minute
var/answer = real_amount + seconds_stored
if(answer >= seconds_in_day)
rollover(answer)
answer = rollover(answer)
return new type(answer)
/datum/time/proc/add_hours(amount)
var/real_amount = amount * seconds_in_hour
var/answer = real_amount + seconds_stored
if(answer >= seconds_in_day)
rollover(answer)
answer = rollover(answer)
return new type(answer)
/datum/time/proc/rollover(time)