Commit Graph

1061 Commits

Author SHA1 Message Date
Letter N
945bf051bd get railed 2020-10-01 11:28:56 +08:00
Putnam
6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
Artur
d493886875 Speedmerge fix 2020-09-23 19:14:50 +03:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Letter N
fd2ec66757 Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." (#13347) 2020-09-06 09:23:28 +02:00
silicons
12c5680d58 Merge pull request #13324 from Putnam3145/extools-logging
Added threaded extools logging as an alternative to rust_g logging.
2020-09-04 04:10:02 -07:00
Artur
8d073bbce6 Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-02 19:05:18 +03:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Putnam3145
c0b73f8d6a Merge pull request #13306 from Citadel-Station-13/silicons-patch-28
new codebase policy do not use potentially volatile procs in character setup of all places so we can stop having the moments when everyone's characters get bricked for the 619634'th time.
2020-09-01 15:37:34 -07:00
Putnam
b7a7170f7c Actually I ain't using it so it goes away. 2020-09-01 15:32:22 -07:00
silicons
db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display
Makes fusion analyze not assume we're still on fusion v5
2020-08-31 21:20:15 -07:00
silicons
77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
Putnam
735809a69b Commented out threaded FFI. 2020-08-31 20:11:52 -07:00
Putnam
2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
Timothy Teakettle
d859d12b9f yes 2020-09-01 00:14:17 +01:00
timothyteakettle
af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle
a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
Putnam
10586f3c3b trend, trend! 2020-08-30 07:33:17 -07:00
Putnam
5ba883bfe5 Fixes fusion power text to make sense. 2020-08-30 02:53:46 -07:00
silicons
a8f920f88c Update _lists.dm 2020-08-29 22:48:26 -07:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
Letter N
6ba29acd4e uses some cit procs. and how the fuck did i forget to componentualize this 2020-08-22 16:08:05 +08:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
timothyteakettle
1f240b883f holy shit 2020-08-11 03:37:04 +01:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons
c0ac492d07 ok 2020-08-04 21:01:06 -07:00
silicons
0a137d2584 whew 2020-08-04 20:52:35 -07:00
Letter N
ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
Letter N
e40470f553 h. Updates NTOS, and axes p2p filetransfer! 2020-07-30 20:54:13 +08:00
Lin
a5dd08a054 Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
silicons
cbe0cad1a4 fix 2020-07-23 12:41:33 -07:00
silicons
758d746e96 compile 2020-07-23 12:25:02 -07:00
silicons
59bd63471e sigh 2020-07-23 12:23:13 -07:00
silicons
5d7dfd327c FUCK 2020-07-23 12:22:55 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
9a5e53a21f ok 2020-07-21 11:57:47 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
timothyteakettle
8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00