Commit Graph

63598 Commits

Author SHA1 Message Date
oranges
962aa9e79d Merge pull request #40365 from AnturK/team-panel
Admin team panel
2018-09-27 22:26:41 +01:00
Ling
81a1280956 Merge pull request #2711 from yogstation13/upstream-merge-40480
[MIRROR] Makes the orbiter component less prone to failure
2018-09-26 23:21:57 +02:00
yogstation13-bot
3482b93bc5 Automatic changelog generation #2699 [ci skip] 2018-09-26 22:55:55 +02:00
Ling
f615165de9 Merge pull request #2699 from yogstation13/upstream-merge-40462
[MIRROR] [Ready for review]Adds credit holochips to replace magic cash
2018-09-26 22:55:54 +02:00
Ling
a966316bb1 Update dead.dm 2018-09-26 22:53:17 +02:00
yogstation13-bot
595fad3fcc Automatic changelog generation #2708 [ci skip] 2018-09-26 22:41:17 +02:00
Ling
0598f567c9 Merge pull request #2708 from yogstation13/upstream-merge-40490
[MIRROR] Removes superfluous sacid beakers
2018-09-26 22:41:15 +02:00
Ling
472207aff8 Merge pull request #2690 from yogstation13/upstream-merge-40458
[MIRROR] Fix banlist runtime not creating notes for server bans
2018-09-26 19:55:48 +02:00
Ling
c6e40173bc Merge pull request #2710 from yogstation13/upstream-merge-40476
[MIRROR] [s] fixes syringe gun exploit
2018-09-26 19:55:24 +02:00
Ling
8866dcae7f Merge pull request #2709 from yogstation13/upstream-merge-40477
[MIRROR] [s] Fixes pride mirror exploit
2018-09-26 19:55:02 +02:00
Ling
125c00815d Update yogstation.dmm 2018-09-26 19:53:38 +02:00
Emmett Gaines
636e311d74 Component strengthening course (#40480) 2018-09-26 19:52:39 +02:00
Ling
0c2b4884d8 Merge pull request #2707 from yogstation13/upstream-merge-40494
[MIRROR] [s] Adds logging to IV drips
2018-09-26 19:51:25 +02:00
Ling
a1a35c9144 Merge pull request #2706 from yogstation13/upstream-merge-40496
[MIRROR] Fixes proxy / infrared sensor exploits
2018-09-26 19:50:58 +02:00
yogstation13-bot
9b96571769 Automatic changelog generation #2705 [ci skip] 2018-09-26 19:50:42 +02:00
Ling
3f28fa96db Merge pull request #2705 from yogstation13/upstream-merge-40390
[MIRROR] Fixes advanced buildmode not having a picker tool
2018-09-26 19:50:41 +02:00
Ling
077eeb78b7 Merge pull request #2704 from yogstation13/upstream-merge-40475
[MIRROR] Adds forcefield projectors to toolbelts
2018-09-26 19:50:13 +02:00
yogstation13-bot
f76b7c4833 Automatic changelog generation #2703 [ci skip] 2018-09-26 19:49:59 +02:00
Ling
306ef02fe6 Merge pull request #2703 from yogstation13/upstream-merge-40466
[MIRROR] fixes skateboard  bounty
2018-09-26 19:49:57 +02:00
yogstation13-bot
5f1d628b84 Automatic changelog generation #2702 [ci skip] 2018-09-26 19:49:23 +02:00
Ling
d70d79ba7d Merge pull request #2702 from yogstation13/upstream-merge-40468
[MIRROR] Adds gorilla cubes to the uplink
2018-09-26 19:49:22 +02:00
Ling
3c236a6351 Merge pull request #2701 from yogstation13/upstream-merge-40470
[MIRROR] Another TGS DMAPI update
2018-09-26 19:48:46 +02:00
Ling
b4a3b095f2 Update yogstation.dme 2018-09-26 19:48:07 +02:00
yogstation13-bot
acde15b4c6 Automatic changelog generation #2698 [ci skip] 2018-09-26 19:46:42 +02:00
Ling
d6e8a89f06 Merge pull request #2698 from yogstation13/upstream-merge-40421
[MIRROR] Prison food tastes gross now.
2018-09-26 19:46:41 +02:00
Ling
84a8017de3 Update topic.dm 2018-09-26 18:57:32 +02:00
Ling
86ea276f35 Update topic.dm 2018-09-26 18:57:02 +02:00
yogstation13-bot
c85af7c8e9 Automatic changelog generation #2682 [ci skip] 2018-09-26 18:55:20 +02:00
Ling
33915ad0fa Merge pull request #2682 from yogstation13/upstream-merge-40313
[MIRROR] Dirty Var Cleanup
2018-09-26 18:55:19 +02:00
yogstation13-bot
cb9dc2c8dc Automatic changelog generation #2681 [ci skip] 2018-09-26 18:54:59 +02:00
Ling
4fd1b2e0c4 Merge pull request #2681 from yogstation13/upstream-merge-40433
[MIRROR] Componentizes orbiting
2018-09-26 18:54:58 +02:00
yogstation13-bot
ffa36d7f5d Automatic changelog generation #2622 [ci skip] 2018-09-26 18:54:23 +02:00
Ling
43bff8a45b Merge pull request #2622 from yogstation13/upstream-merge-40299
[MIRROR] revamps toxins
2018-09-26 18:54:22 +02:00
Ling
008f5d49f8 Merge pull request #2621 from yogstation13/upstream-merge-40220
[MIRROR] Objective refactor
2018-09-26 18:54:06 +02:00
Ling
c6e6aa2a59 Merge pull request #2700 from yogstation13/upstream-merge-40500
[MIRROR] Fixes economy subsys firing before game is running
2018-09-26 16:00:54 +02:00
yogstation13-bot
0ee1fa9e9e [s] fixes syringe gun exploit 2018-09-26 10:33:44 +01:00
ShizCalev
032e213bd0 fixes syringe gun exploit (#40476) 2018-09-26 10:33:44 +01:00
yogstation13-bot
92daf7cd8f [s] Fixes pride mirror exploit 2018-09-26 10:33:35 +01:00
ShizCalev
0527776daa [s] Fixes pride mirror exploit (#40477)
* Fixes pride mirror exploit

* Cleanup, adds no_tk check to canUseTopic
2018-09-26 10:33:35 +01:00
yogstation13-bot
9a091cb582 Removes superfluous sacid beakers 2018-09-26 10:30:20 +01:00
81Denton
992e9fe64f Removes superfluous sacid beakers (#40490) 2018-09-26 10:30:19 +01:00
yogstation13-bot
2ace7e47fb [s] Adds logging to IV drips 2018-09-26 10:29:05 +01:00
ShizCalev
033b2354cf Adds logging to IV drips (#40494) 2018-09-26 10:29:05 +01:00
yogstation13-bot
65f50d57af Fixes proxy / infrared sensor exploits 2018-09-26 10:27:54 +01:00
ShizCalev
49a6e82e13 Fixes proxy / infrared sensor exploits (#40496) 2018-09-26 10:27:54 +01:00
yogstation13-bot
e558e2d590 Fixes advanced buildmode not having a picker tool 2018-09-26 07:56:04 +01:00
MrDoomBringer
650e050db4 Fixes advanced buildmode not having a picker tool (#40390)
* YES WE CAN

* !

* tfw anturk prevents me from making a SIMPLE PR with a SHORT meme in the BRANCH+COMMIT NAME REE

* ok FINE

* asdfasdfasdf

* dddddddddddddddddddddddddddddddddd
2018-09-26 07:56:04 +01:00
yogstation13-bot
e4a6e8572a Adds forcefield projectors to toolbelts 2018-09-26 06:52:51 +01:00
ShizCalev
643fe11cc7 Adds forcefield projectors to toolbelts (#40475) 2018-09-26 06:52:51 +01:00
yogstation13-bot
9ea06e11dd fixes skateboard bounty 2018-09-26 06:51:40 +01:00