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 |
|
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 |
|
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 |
|
Artur
|
e3d3f7b750
|
Ported
|
2020-01-13 13:20:55 +02:00 |
|
TrilbySpaceClone
|
92dc5e61c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
|
2020-01-13 03:42:20 -05:00 |
|
TrilbySpaceClone
|
43dcb70718
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Seed-to-points
|
2020-01-13 03:27:01 -05:00 |
|
Putnam
|
e412852c8f
|
Made temp flavor "more" pop up with actual temp flavor
|
2020-01-12 23:44:49 -08:00 |
|
Arturlang
|
f98bc85db0
|
Merge branch 'master' into mesmerize_quickfiz
|
2020-01-13 09:44:17 +02:00 |
|
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 |
|
Xantholne
|
903e59d6ed
|
Merge branch 'master' into xantholne-christmas03
|
2020-01-12 22:29:59 -07:00 |
|
Seris02
|
bd2fe8eb01
|
durathread winter coat from hyper
|
2020-01-13 13:12:17 +08: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 |
|
kevinz000
|
42f0aba130
|
s
|
2020-01-12 20:11:26 -08:00 |
|
Seris02
|
10944719b1
|
erge branch 'master' of https://github.com/Citadel-Station-16/Citade-Station-18 into bowmanupgrade
nope
|
2020-01-13 11:50:39 +08:00 |
|
kevinz000
|
e2d5d9a23c
|
Merge remote-tracking branch 'citadel/master' into isbanned2
|
2020-01-12 19:28:40 -08:00 |
|
kevinz000
|
884ea59d63
|
fix logic
|
2020-01-12 18:38:22 -08:00 |
|
kevinz000
|
8f5d4a0a49
|
Merge remote-tracking branch 'citadel/master' into nightshift_1
|
2020-01-12 18:27:03 -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
|
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 |
|
deathride58
|
bbdedd20b6
|
Merge branch 'master' into stambufferbuff
|
2020-01-12 20:35:31 -05:00 |
|
Putnam
|
bb0d012d7a
|
well that works
|
2020-01-12 16:08:49 -08:00 |
|
r4d6
|
d04a882c29
|
Prevent Playback Devices from triggering Voice Analyzer
|
2020-01-12 18:49:33 -05: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 |
|
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 |
|
Detective Google
|
6589065c38
|
scream
|
2020-01-12 15:25:51 -06:00 |
|
Detective Google
|
97c26c704d
|
Update Space_Station_13_areas.dm
|
2020-01-12 15:24:51 -06:00 |
|
Detective Google
|
81d3225819
|
?
|
2020-01-12 15:23:45 -06:00 |
|
Detective Google
|
99ba77ce01
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
2020-01-12 15:23:05 -06:00 |
|
Detective Google
|
c7dcd0c8a3
|
grug hates merge conflicts
|
2020-01-12 15:19:44 -06:00 |
|
Detective Google
|
f6c5f81a83
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-12 15:16:17 -06:00 |
|
Detective Google
|
c88efe84de
|
makes sharks drop fish meat
|
2020-01-12 15:14:34 -06:00 |
|
kappa-sama
|
3e199ed780
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
|
2020-01-12 14:23:38 -05:00 |
|
kappa-sama
|
4e3a5379a4
|
augh
|
2020-01-12 14:21:06 -05:00 |
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08:00 |
|
Hatterhat
|
7fac15caeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform
|
2020-01-12 12:39:57 -06: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 |
|
Hatterhat
|
83f8e42fb3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046
|
2020-01-12 12:37:19 -06:00 |
|
kevinz000
|
90dd0909b8
|
Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into god_wish_your_plushies_holy_shit
|
2020-01-12 10:25:50 -08: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 |
|
r4d6
|
ee33e36e6d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
|
2020-01-12 12:46:30 -05:00 |
|
Ghommie
|
268146bb93
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374
|
2020-01-12 17:19:57 +01:00 |
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|