 Ghom
|
e87a3d1074
|
Merge pull request #10507 from LetterN/banjo
Ports banjo
|
2020-01-13 14:44:46 +01:00 |
|
|
Letter N
|
6ace5fc4b3
|
ell eff
|
2020-01-13 21:19:21 +08:00 |
|
|
Letter N
|
450cb2b01a
|
Merge branch 'master' into banjo
|
2020-01-13 20:53:30 +08: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 |
|
|
CitadelStationBot
|
42a867df4f
|
Automatic changelog generation for PR #10493 [ci skip]
|
2020-01-13 06:46:42 -06:00 |
|
|
Ghom
|
00325e7de6
|
Merge pull request #10493 from Putnam3145/score-instead
Makes the post-secret gamemode vote score-based instead of schulze-based
|
2020-01-13 13:46:39 +01:00 |
|
|
CitadelStationBot
|
5de5b0b308
|
Automatic changelog generation for PR #10556 [ci skip]
|
2020-01-13 06:14:44 -06:00 |
|
|
Ghom
|
962e73d1bc
|
Merge pull request #10556 from AffectedArc07/lf-ci
CI to check for wrong line ending
|
2020-01-13 13:14:42 +01:00 |
|
|
AffectedArc07
|
4bee50a472
|
DME was wrong
|
2020-01-13 11:57:13 +00:00 |
|
|
AffectedArc07
|
8191716868
|
CI to check for wrong line ending
|
2020-01-13 11:53:36 +00:00 |
|
|
Ghom
|
ed42ed5a1e
|
Merge pull request #10551 from Arturlang/mesmerize_quickfiz
[s]Fixes bloodsucker mesmerize mute
|
2020-01-13 12:49:13 +01:00 |
|
|
Ghom
|
942e321b76
|
Merge pull request #10555 from Arturlang/Lummox_suggestions
Ports lummoxes suggestions
|
2020-01-13 12:48:19 +01:00 |
|
|
CitadelStationBot
|
c8fdfa8375
|
Automatic changelog generation for PR #10404 [ci skip]
|
2020-01-13 05:45:18 -06:00 |
|
|
Ghom
|
12da79513b
|
Merge pull request #10404 from Xantholne/xantholne-christmas03
Puts an end to the Christmas Menace
|
2020-01-13 12:45:15 +01:00 |
|
|
Artur
|
e3d3f7b750
|
Ported
|
2020-01-13 13:20:55 +02:00 |
|
|
Artur
|
20d0f0c662
|
Merge remote-tracking branch 'upstream/master'
|
2020-01-13 09:52:02 +02: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 |
|
|
Xantholne
|
903e59d6ed
|
Merge branch 'master' into xantholne-christmas03
|
2020-01-12 22:29:59 -07:00 |
|
|
Putnam
|
4c4c965e86
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into score-instead
|
2020-01-12 17:36:56 -08:00 |
|
|
CitadelStationBot
|
d233a14d91
|
Automatic changelog generation for PR #10546 [ci skip]
|
2020-01-12 18:26:07 -06:00 |
|
|
Ghom
|
df295e1bb2
|
Merge pull request #10546 from r4d6/loop-fix
Prevent Playback Devices from triggering Voice Analyzer
|
2020-01-13 01:26:05 +01:00 |
|
|
r4d6
|
d04a882c29
|
Prevent Playback Devices from triggering Voice Analyzer
|
2020-01-12 18:49:33 -05:00 |
|
|
CitadelStationBot
|
8c50b578b4
|
Automatic changelog generation for PR #10544 [ci skip]
|
2020-01-12 09:02:24 -06:00 |
|
|
Ghom
|
e90cef5c69
|
Merge pull request #10544 from AffectedArc07/file-standardisation
[LARGE PR] Standardises all files from CRLF to LF
|
2020-01-12 16:02:20 +01:00 |
|
|
AffectedArc07
|
3e9de4d1ed
|
Ill explain in comments
|
2020-01-12 14:42:38 +00:00 |
|
|
AffectedArc07
|
653b302d46
|
Forgot this
|
2020-01-12 14:36:00 +00:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
Putnam
|
82d8900e5d
|
aaand move this over
|
2020-01-12 03:36:47 -08:00 |
|
|
Putnam
|
3f5e68765e
|
am i fucking stupid?
|
2020-01-12 03:10:42 -08:00 |
|
|
Putnam
|
295c134243
|
i'm so dumb dude
|
2020-01-12 03:06:17 -08:00 |
|
|
CitadelStationBot
|
ca848e547f
|
Automatic changelog generation for PR #10492 [ci skip]
|
2020-01-12 02:49:42 -06:00 |
|
|
kevinz000
|
e1ae3f3c07
|
Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
|
2020-01-12 00:49:39 -08:00 |
|
|
kevinz000
|
f210971889
|
Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk
Significantly lowers the forcefield projector health, lowers armor.
|
2020-01-12 00:47:17 -08:00 |
|
|
CitadelStationBot
|
abd4754631
|
Automatic changelog generation for PR #10416 [ci skip]
|
2020-01-12 02:45:23 -06:00 |
|
|
kevinz000
|
60524fb9c7
|
Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
|
2020-01-12 00:45:21 -08:00 |
|
|
CitadelStationBot
|
d9d0e7c5e7
|
Automatic changelog generation for PR #10504 [ci skip]
|
2020-01-12 02:42:21 -06:00 |
|
|
kevinz000
|
0b56e76b29
|
Merge pull request #10504 from Xantholne/xantholne-bees02
Bees
|
2020-01-12 00:42:19 -08:00 |
|
|
CitadelStationBot
|
f13851704f
|
Automatic changelog generation for PR #10480 [ci skip]
|
2020-01-12 02:41:50 -06:00 |
|
|
kevinz000
|
6396c95bec
|
Merge pull request #10480 from Putnam3145/more_flavor
Added second flavor text, not copied anywhere.
|
2020-01-12 00:41:47 -08:00 |
|
|
kevinz000
|
fe720dbb9c
|
Merge pull request #10500 from rossark/robo
ports fast augmentation surgery pr from /tg/
|
2020-01-12 00:41:30 -08:00 |
|
|
CitadelStationBot
|
33a705e067
|
Automatic changelog generation for PR #10532 [ci skip]
|
2020-01-12 02:41:03 -06:00 |
|
|
Putnam3145
|
01db064038
|
Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
|
2020-01-12 00:41:00 -08:00 |
|
|
kevinz000
|
c69d882943
|
Merge pull request #10521 from BlackMajor/master
Fixes roundstart borg spawns, plus a little bit extra.
|
2020-01-12 00:40:48 -08:00 |
|
|
CitadelStationBot
|
58f41ffee2
|
Automatic changelog generation for PR #10522 [ci skip]
|
2020-01-12 02:40:20 -06:00 |
|
|
kevinz000
|
4b4864740b
|
Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
|
2020-01-12 00:40:17 -08:00 |
|
|
CitadelStationBot
|
958abdc515
|
Automatic changelog generation for PR #10518 [ci skip]
|
2020-01-12 02:38:46 -06:00 |
|
|
kevinz000
|
ddff903532
|
Merge pull request #10518 from Seris02/explosionport
ports the explosion rework thingamajig
|
2020-01-12 00:38:43 -08:00 |
|
|
CitadelStationBot
|
ef00d1522c
|
Automatic changelog generation for PR #10513 [ci skip]
|
2020-01-12 02:37:36 -06:00 |
|