 kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
|
kevinz000
|
14aaca8fa5
|
compile
|
2020-01-16 19:18:54 -07:00 |
|
|
kevinz000
|
b22e1a1cb4
|
compile
|
2020-01-16 02:27:35 -07:00 |
|
|
kevinz000
|
1d184b8cad
|
s
|
2020-01-16 00:21:21 -07:00 |
|
|
kevinz000
|
350c5aa060
|
compile
|
2020-01-16 00:18:40 -07:00 |
|
|
kevinz000
|
26525b8fa7
|
s
|
2020-01-16 00:14:03 -07:00 |
|
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -07:00 |
|
|
kevinz000
|
162a0def29
|
parentheses
|
2020-01-15 19:09:38 -07:00 |
|
|
kevinz000
|
45c92bcb6f
|
s
|
2020-01-15 19:07:47 -07:00 |
|
|
kevinz000
|
02841f8e92
|
compile
|
2020-01-15 18:49:37 -07:00 |
|
|
Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
|
Ghom
|
31c3b0f7bb
|
Merge pull request #10415 from kevinz000/tg_update_1
Small controller/backend updates from /tg/
|
2020-01-15 15:23:09 +01:00 |
|
|
Ghom
|
3c4d36ddd3
|
Merge pull request #10478 from Seris02/gorillashuttlesstopping
Makes the gorilla shuttle emag only
|
2020-01-13 16:12:26 +01:00 |
|
|
Ghom
|
7af8579d17
|
Merge pull request #10550 from deathride58/fixestopicstatusproper
fixes status topic having a broken cooldown
|
2020-01-13 13:48:04 +01:00 |
|
|
Arturlang
|
f98bc85db0
|
Merge branch 'master' into mesmerize_quickfiz
|
2020-01-13 09:44:17 +02: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 |
|
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00: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 |
|
|
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 |
|
|
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 |
|