SinTwo
|
f50adb9554
|
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
code/_helpers/time.dm
code/modules/economy/ATM.dm
|
2016-08-09 15:46:24 -04:00 |
|
SinTwo
|
b42d46205f
|
more time proc call fixes
|
2016-07-30 17:39:47 -04:00 |
|
PsiOmegaDelta
|
d2b4db716d
|
Ports Paradise's 510 scheduler.
Conflicts:
code/__defines/btime.dm
code/__defines/process_scheduler.dm
code/_helpers/time.dm
code/controllers/ProcessScheduler/core/_stubs.dm
code/controllers/ProcessScheduler/core/processScheduler.dm
polaris.dme
|
2016-07-27 17:20:37 -04:00 |
|
SinTwo
|
4fa126b7e7
|
a whole lot of nanoui upgrades
|
2016-06-24 00:43:16 -04:00 |
|
Yoshax
|
26192e2b32
|
Fixes an error
|
2016-04-20 15:36:13 +01:00 |
|
PsiOmegaDelta
|
a3f8bc815e
|
Round start timer now remains at 0 until the round actually starts.
|
2016-04-20 15:27:59 +01:00 |
|
Zuhayr
|
dfbdd79375
|
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev
|
2015-08-29 16:53:42 +09:30 |
|
Zuhayr
|
7d82e4850e
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
|
2015-08-29 16:53:07 +09:30 |
|
PsiOmegaDelta
|
74b8f6c3be
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
html/changelogs/.all_changelog.yml
|
2015-08-17 09:44:21 +02:00 |
|
PsiOmegaDelta
|
55bc41241f
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/setup.dm
|
2015-08-17 09:37:49 +02:00 |
|
PsiOmegaDelta
|
a81113b877
|
Update time.dm
Restores proper roundstart hours.
|
2015-07-05 08:11:31 +02:00 |
|
PsiOmegaDelta
|
c2c4336afe
|
Changelog entry.
|
2015-06-30 09:51:38 +02:00 |
|
PsiOmegaDelta
|
10c2e32f4c
|
Now pads a 0 to single digit hours.
|
2015-06-30 09:50:12 +02:00 |
|
PsiOmegaDelta
|
f420dd9f01
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
.travis.yml
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defines.dm
code/modules/mob/living/silicon/silicon.dm
code/setup.dm
|
2015-06-30 08:59:34 +02:00 |
|
Chinsky
|
bf53304fec
|
Splits setup.dm into berjillion of smaller files vaguely named thematically.
Also moved __HELPERS and _defines around so defines actually come first.
|
2015-06-04 21:51:58 +03:00 |
|