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-17 05:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

69 Commits

Author SHA1 Message Date
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
SandPoot
96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot
4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot
37fef7fbba Upload files 2022-03-16 15:33:31 -03:00
SandPoot
fdb6413d23 You guys want some logs? 2022-03-16 15:22:04 -03:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +08:00
LetterN
12ae614833 fix1 2021-09-08 10:22:55 +08:00
silicons
77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
Letter N
f28363ae56 code quality 2020-12-29 11:12:56 +08:00
Letter N
792c9ad752 actualy important because of glidesize 2020-12-23 14:16:29 +08:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Putnam
2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
Letter N
ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
Artur
a304ed7f49 Canister and paper updates 
should fix papah exploits, though some runtiming is occuring
 2020-07-04 16:14:42 +03:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Letter N
151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
kevinz000
0bfe77e15a ok (#12365) 2020-05-26 15:24:23 +02:00
Lin
a6d7170d5b Merge pull request #12313 from kevinz000/click_logs 
[s]click logging
 2020-05-23 20:21:45 +00:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
kevinz000
ab2efa0485 rustg fix 2020-05-20 23:18:37 -07:00
kevinz000
89a14a82f0 ok 2020-05-20 07:46:58 -07:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and 
And fixes to make stuff work
 2020-04-23 17:36:13 +03:00
Artur
67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
Ghom
4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks 
Consent logging
 2020-02-05 07:19:37 +01:00
Ghom
f1e3261566 Update _logging.dm 2020-02-02 23:26:03 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
kevinz000
60365e4a8c Revert "Revert "Update _logging.dm"" 
This reverts commit 2b93d5c3dd.
 2020-01-24 04:22:16 -07:00
kevinz000
2b93d5c3dd Revert "Update _logging.dm" 
This reverts commit 264431d3c8.
 2020-01-24 04:22:08 -07:00
kevinz000
264431d3c8 Update _logging.dm 2020-01-24 04:15:35 -07:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Putnam
ae4afdd904 made it work (wow!) 2020-01-17 03:09:46 -08:00
Putnam
c735123e4e consent logging and arousal tweaks 2020-01-17 02:47:16 -08:00
Putnam
5ace1df9af better logging, that also works 2020-01-16 19:09:13 -08:00
Putnam
a4cc73f219 some craft logging 2020-01-16 18:40:00 -08:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
kevinz000
fa7dcad49a compile 2020-01-07 04:54:11 -08:00
kevinz000
ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Poojawa
0e510e8c34 HELPERS 2018-09-11 00:54:07 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox 
Query debug logging
 2018-05-17 21:38:41 -05:00