cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,745 Commits 55 Branches 0 Tags
a87e4533e583f0168e166bd509005bdc59d96908
Commit Graph

404 Commits

Author SHA1 Message Date
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
Letter N
501d33cddd agony 2021-02-19 10:32:24 +08:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Lin
7576c25666 Merge pull request #14140 from silicons/tgui_fix 
fixes chat highlighting not working (literally) half the time
 2021-02-13 23:30:14 -06:00
Letter N
5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
Letter N
6286d40082 code works 2021-02-12 17:26:08 +08:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
92eb4fb684 filter 2021-02-12 12:40:24 +08:00
Letter N
3167dd8e22 atmos cc, cpl 2021-02-12 11:50:39 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
silicons
423fcaa70a tgui_recompile 2021-02-11 04:57:35 -07:00
dependabot[bot]
e5562f6cb6 Bump marked from 1.1.1 to 2.0.0 in /tgui 
Bumps [marked](https://github.com/markedjs/marked) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js)
- [Commits](https://github.com/markedjs/marked/compare/v1.1.1...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-10 09:12:51 +00:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Fermi
bd959877a5 Updates tgui 2021-02-06 02:46:11 +00:00
Fermi
f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +00:00
Letter N
945599e937 tgui build 2021-01-31 10:23:39 +08:00
Letter N
02bba115a6 T-G-U-I 2021-01-31 10:16:48 +08:00
SmArtKar
1c23737664 Makes it compile 2021-01-28 18:16:46 +03:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
silicons
d8da062ce8 fix 2021-01-26 07:25:52 -07:00
Fermi
760ac29c1d Fixes merge conflict 2021-01-17 22:22:41 +00:00
Fermi
cb614bcd95 Merge branch 'master' into Dispencer-UI-change 2021-01-17 22:19:45 +00:00
Letter N
f63c020cfa certified react moment 
also we updated package.json without yarn? What the fuck?!
 2021-01-13 11:20:11 +08:00
Fermi
a772fe1e0b Fixes the blue to the right colour 2021-01-08 02:13:10 +00:00
Fermi
95bf86f765 Hmm 2021-01-08 00:40:54 +00:00
Fermi
e78b6a7b04 Merge remote-tracking branch 'upstream/master' into Dispencer-UI-change 2021-01-08 00:29:05 +00:00
silicons
eeb4807d3f Merge pull request #13982 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/axios-0.21.1 
Bump axios from 0.19.2 to 0.21.1 in /tgui
 2021-01-07 17:22:52 -07:00
silicons
5964fd0390 fix 2021-01-06 02:12:37 -08:00
dependabot[bot]
5e25fe4da2 Bump axios from 0.19.2 to 0.21.1 in /tgui 
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-06 09:13:54 +00:00
Fermi
00ed164a2c Fixes tgui problem! 2021-01-05 10:21:56 +00:00
Fermi
fa9e066b71 Merged upstream fixes 2021-01-04 16:23:32 +00:00
Fermi
5b703e84a4 Merge branch 'master' into Dispencer-UI-change 2021-01-04 16:21:06 +00:00
Fermi
d9047e458c Testing and bugfixes 2021-01-04 15:47:35 +00:00
Fermi
57cd698994 Tweaks and fixes. Should be freature complete now. 2021-01-04 13:40:26 +00:00
Fermi
c7965d3b4a Pushing to review diff 2021-01-04 10:53:21 +00:00
Fermi
37c3bbbd9c Fixing things and gui 2021-01-04 01:48:35 +00:00
Chiirno
336272fb02 Nevermind, I heard the catgirl wrong we're going back. 2021-01-01 05:42:35 -04:00
Chiirno
977f0c4cc9 how about this 2021-01-01 05:39:23 -04:00
Chiirno
fd2bbe23e0 A catgirl on discord told be replacing the bundle file would be ok 2021-01-01 05:33:34 -04:00
Chiirno
bbeed2b8f0 I've done it, I've edited TgUI! 2021-01-01 04:00:35 -04:00
Lin
caed4b51b9 Merge pull request #13756 from silicons/tgui_db 
gives citadel main its own tgui db id to avoid issues but this time i actually don't webedit so i can recompile tgui
 2020-12-20 17:12:12 +00:00
silicons
6416921560 raise 2020-12-19 18:59:35 -07:00
silicons
ad12207503 fix 2020-12-19 06:44:56 -07:00
silicons
e2a99ff223 Recompile 2020-12-19 06:08:28 -07:00
silicons
c717191447 Update chat-dark.scss 2020-12-18 19:36:57 -07:00
silicons
d00f7daae4 Update chat-light.scss 2020-12-18 19:34:53 -07:00
silicons
6fea2c2b3a recompile 2020-12-15 02:56:16 -07:00
silicons
ce293a5d6d Update chat-dark.scss 2020-12-13 23:11:20 -07:00
silicons
c6c25e5fa3 recompile 2020-12-11 10:35:02 -07:00
Putnam
4e9bb126e8 recompiled, thanks tgui 2020-12-02 08:18:10 -08:00