 Artur
|
d04c09aba0
|
Compiles, just need to fix goonchat
|
2020-01-15 09:44:03 +02:00 |
|
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
|
Artur
|
6e3206a2e4
|
Why the fuck did the rest of the stuff dissapear
|
2020-01-15 09:37:23 +02:00 |
|
|
Artur
|
25ce2f545b
|
iNITIAL
|
2020-01-15 09:33:17 +02:00 |
|
|
CitadelStationBot
|
f2bca71e82
|
Automatic changelog generation for PR #10552 [ci skip]
|
2020-01-13 17:33:50 -06:00 |
|
|
Ghom
|
8437d1f0c3
|
Merge pull request #10552 from Tupinambis/NotUglyFireAlarms
Pseudo Reverts Fire Alarms Back to Original Look: AKA Not Fuckugly
|
2020-01-14 00:33:47 +01:00 |
|
|
CitadelStationBot
|
be7fef7048
|
Automatic changelog generation for PR #10287 [ci skip]
|
2020-01-13 15:15:45 -06:00 |
|
|
Lin
|
623ab1c661
|
Merge pull request #10287 from Ghommie/Ghommie-cit492
Minor captains closet cleanup.
|
2020-01-13 21:15:42 +00:00 |
|
|
Ghom
|
330d96d549
|
Merge pull request #10409 from kevinz000/isbanned2
IT WORKED ON LOCAL
|
2020-01-13 18:49:46 +01:00 |
|
|
CitadelStationBot
|
2be5756a6e
|
Automatic changelog generation for PR #10478 [ci skip]
|
2020-01-13 09:12:30 -06:00 |
|
|
Ghom
|
3c4d36ddd3
|
Merge pull request #10478 from Seris02/gorillashuttlesstopping
Makes the gorilla shuttle emag only
|
2020-01-13 16:12:26 +01:00 |
|
|
CitadelStationBot
|
93a9a9fa8a
|
Automatic changelog generation for PR #10539 [ci skip]
|
2020-01-13 09:07:31 -06:00 |
|
|
Ghom
|
984c43116c
|
Merge pull request #10539 from Savotta/cum
ports hShark snout from hyper-station-13
|
2020-01-13 16:07:28 +01:00 |
|
|
CitadelStationBot
|
e274b13b92
|
Automatic changelog generation for PR #10507 [ci skip]
|
2020-01-13 07:44:48 -06:00 |
|
|
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 |
|
|
Tupinambis
|
7a0b14b6d7
|
fixes things
|
2020-01-13 02:12:12 -06: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 |
|
|
Tupinambis
|
2772feb084
|
Makes fire alarms less ugly
|
2020-01-13 01:04:43 -06: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 |
|
|
kevinz000
|
e2d5d9a23c
|
Merge remote-tracking branch 'citadel/master' into isbanned2
|
2020-01-12 19:28:40 -08: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 |
|
|
Ghommie
|
9dad810edf
|
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:11:02 +01:00 |
|
|
Ghommie
|
b2ab8959f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:00:05 +01: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 |
|