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 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,415 Commits 55 Branches 0 Tags
95bf86f765bec7ab00b1eadbbd4e71c71c5fdedf
Commit Graph

127 Commits

Author SHA1 Message Date
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
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
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
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
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
809e270290 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local 2020-12-02 08:16:22 -08:00
Putnam
4b8c9e6f85 Made not all emotes auto-italic'd. 2020-11-24 06:28:34 -08:00
Artur
84b299912a Merge remote-tracking branch 'origin/master' into tgui_whitescreenfix_port 2020-11-22 13:29:26 +02:00
Artur
6cdef62abb Ports https://github.com/tgstation/tgstation/pull/54895/ 2020-11-16 15:19:31 +02:00
DeltaFire
e191cd3b5b sleeper ui compartibility 
ugly but less work & less ugly than completely rewriting it.
If anyone else wants to, be my guest.
 2020-11-15 20:47:22 +01:00
DeltaFire
a9fda43bc2 makes the operating computer show toxin / corruption 
An ugly way to do this, but still LESS ugly than rewriting the entire thing. It'll be FIIIINE
 2020-11-13 02:41:34 +01:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
Arturlang
d3616f2d17 Fixes hijack UI (#13598) 
* Fixes hijack UI

* This was lost too it seems

* And this

* More stuff that was removed

* Should be good now

* Nice and proper now
 2020-10-24 21:23:52 +02:00
Putnam3145
099a82b936 Made fermichem displays work correctly. (#13577) 2020-10-16 22:27:37 +02:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Fermi
4470ff2a95 spans fix 2020-10-04 22:54:19 +01:00
Artur
cc34edf202 scss fixes 2020-09-09 21:21:40 +03:00
Artur
d2fa62d6e8 Recompile and undo 2020-09-07 13:42:25 +03:00
Artur
dd00688d06 More fixes 2020-09-07 13:27:25 +03:00
Artur
589bedcfaf Fixes alt click, themes a little, and re enter corpse 2020-09-07 13:06:34 +03:00
Artur
a2d34b7524 Undoes Theme shit 2020-09-02 19:44:19 +03:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Letter N
8175486453 webstorage moment 2020-08-30 09:39:07 +08:00
Letter N
b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08:00
Letter N
7a00122906 Fixes tgui stealing all of the space. 2020-08-22 21:49:43 +08:00
Letter N
317480a3e7 something something skin texture revert. oh and oh fuck shit passkeys works again. 2020-08-22 15:07:02 +08:00
Letter N
08120ae8b9 TGUI built! 2020-08-22 13:47:20 +08:00
Letter N
014e00d1a6 cogchamp changes. syncing then building tgui next 2020-08-22 13:35:34 +08:00
Letter N
a38aca4da6 tgui moment. 2020-08-22 13:11:13 +08:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +08:00
Letter N
0b4dfbfebc builds tgui. note: custom cit tgui's still need checking 2020-08-18 12:33:09 +08:00
Letter N
83df9159de GOONCHAT IS DEAD! LONG LIVE THE KING! 2020-08-18 10:51:13 +08:00
Letter N
a327e7d33f no thoughts, head segfaulted 2020-08-15 16:48:10 +08:00
Letter N
15e659fc9c tguichat and tgui4.1? 2020-08-15 16:08:10 +08:00
Letter N
081f07e259 bye! 2020-08-12 16:38:36 +08:00
Letter N
fa323732a1 TGUITGUITGUITGUI 2020-08-10 10:55:34 +08:00
Letter N
a4040ace26 hewwo have you tried to work? 2020-08-10 10:50:07 +08:00