Commit Graph

3652 Commits

Author SHA1 Message Date
Putnam
6197920101 fixed unnecessary typecheck 2020-01-12 23:40:28 -08:00
Artur
1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
deathride58
e3a33ad8c1 fixes status topic having a broken cooldown 2020-01-13 00:56:05 -05:00
Seris02
16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
Putnam
c7e3b167e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-12 17:40:26 -08:00
Putnam
bb0d012d7a well that works 2020-01-12 16:08:49 -08:00
Ghommie
f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
kevinz000
b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
Hatterhat
9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat
2842434d00 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 02:49:58 -06:00
kevinz000
ce1dabb585 Merge pull request #10513 from r4d6/open-message
Add a message when pulsing the open wire on airlocks
2020-01-12 00:37:33 -08:00
kevinz000
0fc6d0e891 compile 2020-01-11 11:28:03 -08:00
Seris02
ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
r4d6
96c75eb5ca Add a message when pulsing the open wire on airlocks 2020-01-10 17:01:46 -05:00
kevinz000
d4592449d2 Merge pull request #10484 from deathride58/topiccommandlimit
[s] Caches the status topic to prevent low-effort DDoSes
2020-01-10 14:00:43 -08:00
kevinz000
830054c106 sigh 2020-01-10 13:25:47 -08:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Putnam3145
3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
deathride58
c39058379e Merge branch 'master' into topiccommandlimit 2020-01-08 22:19:56 -05:00
kevinz000
356286f0e5 Merge pull request #10473 from deathride58/serverhopsanity
[s] adds a basic sanity check to server_hop
2020-01-08 19:16:03 -08:00
Putnam
244d46ee41 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-08 17:08:01 -08:00
deathride58
580119f038 makes it account for key_valid 2020-01-08 19:17:09 -05:00
deathride58
33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -05:00
kevinz000
2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
kevinz000
5360f85e21 Merge pull request #10459 from Putnam3145/cold-blooded
Adds cold-blooded neutral quirk
2020-01-08 13:34:27 -08:00
kappa-sama
b3e916cc68 e 2020-01-08 09:44:16 -05:00
Ghom
f263a3ea31 Merge pull request #10474 from Putnam3145/fix-traitor-again
[s] Fixes traitors
2020-01-08 13:48:12 +01:00
Seris02
83eff39063 nope 2020-01-08 17:20:58 +08:00
Putnam
a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00
deathride58
89fcde9927 im like 3 iq dont bulli 2020-01-07 20:24:08 -05:00
deathride58
f0af57d7d6 wrong question mark place aaa 2020-01-07 20:22:06 -05:00
deathride58
633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
kevinz000
5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
kevinz000
2a304800df more reformatting 2020-01-07 11:46:32 -08:00
kevinz000
ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000
3efdf013e6 mobility flags 2020-01-06 21:47:27 -08:00
keronshb
a7af5203e7 This is a test to see if they all work together
Title
2020-01-06 20:29:44 -05:00
keronshb
35cd77d433 Adds the nanite remote for some programs
Adds a new remote function from tg
2020-01-06 20:28:33 -05:00
Lin
46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Putnam
f728c4746f Allowed random engines to be weighted. 2020-01-06 16:25:17 -08:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
2020-01-06 21:47:15 +01:00
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
kevinz000
c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00