Commit Graph

101 Commits

Author SHA1 Message Date
Putnam
3ea7f0defa Added a gas mixture counter and fixed a segfault on exit. 2020-09-10 17:42:49 -07:00
Putnam
7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -07:00
Putnam
2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
silicons
ee0d86f201 fix 2020-08-31 14:14:53 -07:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Putnam
9b955e5d03 gotta replace all of them actually 2020-07-09 03:19:52 -07:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -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
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +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
kevinz000
f0f2a7eaf2 Update world.dm 2020-06-17 11:12:34 -07: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
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
b25a20e3f9 typo 2020-05-20 07:49:55 -07:00
kevinz000
89a14a82f0 ok 2020-05-20 07:46:58 -07:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Putnam
17826fe98b monstermos wow 2020-05-11 22:00:04 -07:00
kevinz000
5aea034d88 k 2020-05-10 15:12:13 -07:00
kevinz000
452b360450 ok 2020-05-10 15:05:46 -07:00
kevinz000
2a33060c98 Update world.dm 2020-05-07 10:44:45 -07:00
kevinz000
c1436c4c7b Maptick lag minimization port (#12066)
* extools.dll

* backend

* queued pipenet builds

* oh yeah we don't have that

* wow

* Update air.dm
2020-05-03 03:34:33 +02:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02: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
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
kevinz000
275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
Artur
c2b68d0ba3 Adds debbuging 2020-02-05 20:35:24 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
kevinz000
7649bf423e Update world.dm 2020-01-24 04:13:59 -07:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Ghom
07b3bac674 Merge pull request #10580 from Putnam3145/craft-log
Craft logging
2020-01-18 17:47:31 +01:00
Putnam
a4cc73f219 some craft logging 2020-01-16 18:40:00 -08:00
Artur
472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties 2020-01-16 11:38:09 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Ghom
11cb7357c5 Stop web-editing like that, little one. 2020-01-14 16:22:41 +01:00
kappa-sama
17604a672d epic 2020-01-14 09:04:35 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
deathride58
c39058379e Merge branch 'master' into topiccommandlimit 2020-01-08 22:19:56 -05:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
deathride58
33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -05:00
deathride58
633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05:00
deathride58
cde9946e25 is this why wrench refuses to work 2020-01-07 09:00:30 -05: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
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Poojawa
f76bb27127 Fixes some runtimes and removes a holodeck exploit
and a cleanup >.>;
2019-08-08 21:33:42 -05:00