cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,835 Commits 8 Branches 0 Tags
6a60c4597b01e17b336f0741566df597ab5d9f93
Commit Graph

49 Commits

Author SHA1 Message Date
CHOMPStation2
4d9879937f [MIRROR] Port tg statpanel (#9242) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-17 23:29:59 +02:00
Raeschen
b65504a25d Time tweak again (#8097) 2024-03-29 13:35:19 +01:00
Cadyn
ccad338c93 Tgpanel (#8007) 
Co-authored-by: ItsSelis <selis@xynolabs.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-03-24 12:19:07 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Heroman3003
8cf37fc7f1 TGUI Interface Hotfix 2023-06-04 19:13:12 +00:00
Aronai Sieyes
e6313f6ae8 Merge pull request #11793 from Heroman3003/timefix2 
Reworks timestamps of specific time using wrong time compared to station time
 2021-12-09 22:37:22 +00:00
Nadyr
6c91cb7292 Merge branch 'master' into upstream-merge-11456 2021-08-24 23:02:14 -04:00
Aronai Sieyes
64e0604641 Merge pull request #11431 from VOREStation/Arokha/rolloversafety 
Add rollover safety check
 2021-08-25 00:00:48 +00:00
Chompstation Bot
dc5e465c07 Fix rollover even harder 2021-08-24 23:59:23 +00:00
Nadyr
19630dcdcc Merge pull request #2477 from CHOMPStationBot/upstream-merge-10946 
[MIRROR] Makes time/tram use REALTIMEOFDAY rather than world.time
 2021-07-10 01:46:02 -04:00
Nadyr
7476daf3f8 powder that makes you say yes 2021-07-10 01:29:23 -04:00
Nadyr
7285e94ef0 powder that makes you say yes 2021-07-10 01:25:10 -04:00
Chompstation Bot
8b3a896d98 Port current SSgarbage from /tg/ 2021-07-09 16:13:02 +00:00
Chompstation Bot
ffbd66852b Makes time/tram use REALTIMEOFDAY rather than world.time 2021-07-09 15:54:38 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
Arokha Sieyes
6d47c2f95c Further time fixes 2020-05-08 10:09:40 -04:00
Arokha Sieyes
323f7e651f Fix/rename some timing stuff 2020-05-08 01:51:52 -04:00
Aronai Sieyes
9acf643828 Make DS2NEARESTTICK macro 2020-05-06 20:26:51 -04:00
Unknown
49570f0d24 New Lore Oversights 
- Loads banners_vr
- Properly sets time back to 2320
 2020-04-30 09:11:08 -04:00
Leshana
3be0330db2 Remove the goonstation /datum/controller/processScheduler as it is no longer used. 2020-04-14 16:17:32 -04:00
Unknown
0e6c82ed60 Conflict Resolution 2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Anewbe
e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Leshana
a435d73450 Ports /tg controller optimizations 
https://github.com/tgstation/tgstation/pull/31092 - Fixes subsystems not returning a qdel hint
https://github.com/tgstation/tgstation/pull/31494 - In which the stoner one gets stoned and tries to address tick contention... again
https://github.com/tgstation/tgstation/pull/31950 - Removes an empty New()
https://github.com/tgstation/tgstation/pull/31951 - Logs subsystem shutdowns
 2017-12-27 21:19:55 -05:00
Leshana
c6e8184b58 Ports https://github.com/tgstation/tgstation/pull/30184 
* Adds defines for world.tick_usage
* This provides no useful benefit whatsoever, but /tg and Baystation12 have done it, so it will make porting future code easier if we do too.  No real harm done either.
 2017-12-27 19:10:15 -05:00
Leshana
fb92653ac9 Ports "Makes global master vars static" 
* https://github.com/tgstation/tgstation/pull/27523
 2017-06-10 19:01:58 -04:00
Leshana
90dff0ae63 Ports /tg's StonedMC Subsystem from Baystation12 
* Partial port of @PsiOmegaDelta's https://github.com/Baystation12/Baystation12/pull/16820
* Only ports the StonedMC changes, not the garbage collector (forthcoming in future)
 2017-05-30 21:00:37 -04:00
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade" 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
 2016-08-15 12:58:00 -04:00
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