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 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
silicons
|
484da28600
|
Merge branch 'master' into shoelaces
|
2020-07-16 17:31:41 -07:00 |
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|
silicons
|
047a36c973
|
fix
|
2020-07-12 05:37:07 -07:00 |
|
silicons
|
72c5c2234e
|
ok
|
2020-07-12 05:15:55 -07:00 |
|
silicons
|
3d80792e79
|
more
|
2020-07-11 00:37:56 -07: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
|
7781296fb9
|
DNA CONSOLE FIX
|
2020-07-03 11:09:55 +03:00 |
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
Ghommie
|
f7de8034a1
|
Put an end to the null stack traces from icon2html's register_asset.
|
2020-07-01 19:26:09 +02:00 |
|
Ghommie
|
94f7dae62e
|
Porting "Fix asset cache verification" and other tiny bits.
|
2020-07-01 16:24:12 +02:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
Putnam3145
|
42809d8b0c
|
Merge pull request #12416 from Ghommie/Ghommie-cit792
TGUI-next Check Skills menu.
|
2020-06-29 12:44:08 -07:00 |
|
Ghommie
|
5307676317
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
|
2020-06-29 06:55:35 +02:00 |
|
Artur
|
765ffdb1a1
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-26 14:03:27 +03:00 |
|
silicons
|
46acf770b4
|
Update roundend.dm
|
2020-06-25 14:00:37 -07:00 |
|
silicons
|
03c9762dcf
|
Update files.dm
|
2020-06-24 12:11:49 -07:00 |
|
Detective Google
|
da68163c80
|
ghosts now appear at round-end
|
2020-06-22 15:43:32 -05:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
Artur
|
66cbdd1174
|
Fixes the dreaded examine bug
|
2020-06-22 17:25:40 +03:00 |
|
Ghom
|
e31ce2edcf
|
Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
|
2020-06-19 23:09:09 +02:00 |
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
Timothy Teakettle
|
7fbfb4ad0e
|
Merge remote-tracking branch 'upstream/master' into embed-changes
|
2020-06-15 22:48:26 +01:00 |
|
Ghommie
|
02a21081a6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
|
2020-06-15 02:21:21 +02:00 |
|