Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

tgs-dmapi-update

tweaks-and-fixes

up-to-date

Mono Color

• 69d986df8a Automatic changelog generation for PR #10538 [ci skip] CitadelStationBot 2020-01-14 06:52:13 -06:00
• 99a6214d22 Merge pull request #10538 from Putnam3145/chemistry-aaa Ghom 2020-01-14 13:52:10 +01:00
• 06d505cdf8 Automatic changelog generation for PR #10558 [ci skip] CitadelStationBot 2020-01-14 06:51:06 -06:00
• 77bdc8ee58 Merge pull request #10558 from DeltaFire15/clockfixes Ghom 2020-01-14 13:51:03 +01:00
• 3e9d6ceb8e Automatic changelog generation for PR #10549 [ci skip] CitadelStationBot 2020-01-14 06:49:55 -06:00
• 9189455fb1 Merge pull request #10549 from Seris02/durathread Ghom 2020-01-14 13:49:53 +01:00
• 21dde64da2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa Putnam 2020-01-14 03:27:03 -08:00
• 464b893790 Merge branch 'master' into tg-40046 Hatterhat 2020-01-13 23:06:48 -06:00
• 1b927e6a01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 Seris02 2020-01-14 12:32:31 +08:00
• 90e2fca5e7 augh kappa-sama 2020-01-13 23:15:07 -05:00
• d46f3232f9 tada Seris02 2020-01-14 10:57:32 +08:00
• 4723fda5d8 aaaaaaaa Dap 2020-01-13 18:57:59 -07:00
• 7fa5b516c8 Merge remote-tracking branch 'upstream/master' into BEEES Dap 2020-01-13 18:54:01 -07:00
• db13d6c033 hopefully fixes the conflict Dap 2020-01-13 18:48:03 -07:00
• a0f35f5cfc Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 Ghommie 2020-01-14 00:55:28 +01:00
• f2bca71e82 Automatic changelog generation for PR #10552 [ci skip] CitadelStationBot 2020-01-13 17:33:50 -06:00
• 8437d1f0c3 Merge pull request #10552 from Tupinambis/NotUglyFireAlarms Ghom 2020-01-14 00:33:47 +01:00
• 17ce27bd70 remove trait genes without disks timothyteakettle 2020-01-13 23:23:49 +00:00
• fce73c84c7 Merge branch 'master' into the-p-o-o-l Detective-Google 2020-01-13 16:38:53 -06:00
• 0d164969eb Merge branch 'the-p-o-o-l' of https://github.com/Detective-Google/Citadel-Station-13 into the-p-o-o-l Detective Google 2020-01-13 16:32:27 -06:00
• 2c4daf3a99 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l Detective Google 2020-01-13 16:32:18 -06:00
• 1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2020-01-13 23:26:21 +01:00
• 269da0708b thank you git bash kappa-sama 2020-01-13 16:41:29 -05:00
• 4b1a5a8e53 hm kappa-sama 2020-01-13 16:40:58 -05:00
• 3f57f30e14 Merge branch 'master' into modularer kappa-sama 2020-01-13 16:32:00 -05:00
• be7fef7048 Automatic changelog generation for PR #10287 [ci skip] CitadelStationBot 2020-01-13 15:15:45 -06:00
• 623ab1c661 Merge pull request #10287 from Ghommie/Ghommie-cit492 Lin 2020-01-13 21:15:42 +00:00
• 330d96d549 Merge pull request #10409 from kevinz000/isbanned2 Ghom 2020-01-13 18:49:46 +01:00
• 04eab97058 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware TrilbySpaceClone 2020-01-13 11:54:14 -05:00
• 2be5756a6e Automatic changelog generation for PR #10478 [ci skip] CitadelStationBot 2020-01-13 09:12:30 -06:00
• 3c4d36ddd3 Merge pull request #10478 from Seris02/gorillashuttlesstopping Ghom 2020-01-13 16:12:26 +01:00
• 93a9a9fa8a Automatic changelog generation for PR #10539 [ci skip] CitadelStationBot 2020-01-13 09:07:31 -06:00
• 984c43116c Merge pull request #10539 from Savotta/cum Ghom 2020-01-13 16:07:28 +01:00
• e274b13b92 Automatic changelog generation for PR #10507 [ci skip] CitadelStationBot 2020-01-13 07:44:48 -06:00
• e87a3d1074 Merge pull request #10507 from LetterN/banjo Ghom 2020-01-13 14:44:46 +01:00
• 6ace5fc4b3 ell eff Letter N 2020-01-13 21:19:21 +08:00
• 450cb2b01a Merge branch 'master' into banjo Letter N 2020-01-13 20:53:30 +08:00
• 7af8579d17 Merge pull request #10550 from deathride58/fixestopicstatusproper Ghom 2020-01-13 13:48:04 +01:00
• 42a867df4f Automatic changelog generation for PR #10493 [ci skip] CitadelStationBot 2020-01-13 06:46:42 -06:00
• 00325e7de6 Merge pull request #10493 from Putnam3145/score-instead Ghom 2020-01-13 13:46:39 +01:00
• 5de5b0b308 Automatic changelog generation for PR #10556 [ci skip] CitadelStationBot 2020-01-13 06:14:44 -06:00
• 962e73d1bc Merge pull request #10556 from AffectedArc07/lf-ci Ghom 2020-01-13 13:14:42 +01:00
• 4bee50a472 DME was wrong AffectedArc07 2020-01-13 11:57:13 +00:00
• 8191716868 CI to check for wrong line ending AffectedArc07 2020-01-13 11:53:36 +00:00
• ed42ed5a1e Merge pull request #10551 from Arturlang/mesmerize_quickfiz Ghom 2020-01-13 12:49:13 +01:00
• 942e321b76 Merge pull request #10555 from Arturlang/Lummox_suggestions Ghom 2020-01-13 12:48:19 +01:00
• c8fdfa8375 Automatic changelog generation for PR #10404 [ci skip] CitadelStationBot 2020-01-13 05:45:18 -06:00
• 12da79513b Merge pull request #10404 from Xantholne/xantholne-christmas03 Ghom 2020-01-13 12:45:15 +01:00
• e3d3f7b750 Ported Artur 2020-01-13 13:20:55 +02:00
• 0ff6b2c2dc Merge branch 'glassware' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into glassware TrilbySpaceClone 2020-01-13 03:45:30 -05:00
• 92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware TrilbySpaceClone 2020-01-13 03:42:20 -05:00
• 43dcb70718 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Seed-to-points TrilbySpaceClone 2020-01-13 03:27:01 -05:00
• 7a0b14b6d7 fixes things Tupinambis 2020-01-13 02:12:12 -06:00
• 20d0f0c662 Merge remote-tracking branch 'upstream/master' Artur 2020-01-13 09:52:02 +02:00
• e412852c8f Made temp flavor "more" pop up with actual temp flavor Putnam 2020-01-12 23:44:49 -08:00
• f98bc85db0 Merge branch 'master' into mesmerize_quickfiz Arturlang 2020-01-13 09:44:17 +02:00
• 6197920101 fixed unnecessary typecheck Putnam 2020-01-12 23:40:28 -08:00
• 1b852b3a03 Fixes mesmerize Artur 2020-01-13 09:34:40 +02:00
• 2772feb084 Makes fire alarms less ugly Tupinambis 2020-01-13 01:04:43 -06:00
• e3a33ad8c1 fixes status topic having a broken cooldown deathride58 2020-01-13 00:56:05 -05:00
• 903e59d6ed Merge branch 'master' into xantholne-christmas03 Xantholne 2020-01-12 22:29:59 -07:00
• bd2fe8eb01 durathread winter coat from hyper Seris02 2020-01-13 13:12:17 +08:00
• 7a2375ba39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into durathread Seris02 2020-01-13 12:59:08 +08:00
• 16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics Seris02 2020-01-13 12:53:52 +08:00
• 42f0aba130 s kevinz000 2020-01-12 20:11:26 -08:00
• 10944719b1 erge branch 'master' of https://github.com/Citadel-Station-16/Citade-Station-18 into bowmanupgrade nope Seris02 2020-01-13 11:50:39 +08:00
• e2d5d9a23c Merge remote-tracking branch 'citadel/master' into isbanned2 kevinz000 2020-01-12 19:28:40 -08:00
• 884ea59d63 fix logic kevinz000 2020-01-12 18:38:22 -08:00
• 8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 kevinz000 2020-01-12 18:27:03 -08:00
• c7e3b167e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak Putnam 2020-01-12 17:40:26 -08:00
• 4c4c965e86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into score-instead Putnam 2020-01-12 17:36:56 -08:00
• bbdedd20b6 Merge branch 'master' into stambufferbuff deathride58 2020-01-12 20:35:31 -05:00
• d233a14d91 Automatic changelog generation for PR #10546 [ci skip] CitadelStationBot 2020-01-12 18:26:07 -06:00
• df295e1bb2 Merge pull request #10546 from r4d6/loop-fix Ghom 2020-01-13 01:26:05 +01:00
• bb0d012d7a well that works Putnam 2020-01-12 16:08:49 -08:00
• d04a882c29 Prevent Playback Devices from triggering Voice Analyzer r4d6 2020-01-12 18:49:33 -05:00
• f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 Ghommie 2020-01-12 23:21:03 +01:00
• 9dad810edf Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492 Ghommie 2020-01-12 23:11:02 +01:00
• b2ab8959f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492 Ghommie 2020-01-12 23:00:05 +01:00
• 3825ff8f59 Merge branch 'master' into the-p-o-o-l Detective-Google 2020-01-12 15:33:54 -06:00
• 6589065c38 scream Detective Google 2020-01-12 15:25:51 -06:00
• 97c26c704d Update Space_Station_13_areas.dm Detective Google 2020-01-12 15:24:51 -06:00
• 81d3225819 ? Detective Google 2020-01-12 15:23:45 -06:00
• 99ba77ce01 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Detective Google 2020-01-12 15:23:05 -06:00
• c7dcd0c8a3 grug hates merge conflicts Detective Google 2020-01-12 15:19:44 -06:00
• f6c5f81a83 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l Detective Google 2020-01-12 15:16:17 -06:00
• c88efe84de makes sharks drop fish meat Detective Google 2020-01-12 15:14:34 -06:00
• 3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer kappa-sama 2020-01-12 14:23:38 -05:00
• 4e3a5379a4 augh kappa-sama 2020-01-12 14:21:06 -05:00
• b341818f04 mobility flags kevinz000 2020-01-12 11:00:12 -08:00
• 7fac15caeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform Hatterhat 2020-01-12 12:39:57 -06:00
• 9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 Hatterhat 2020-01-12 12:39:17 -06:00
• 83f8e42fb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046 Hatterhat 2020-01-12 12:37:19 -06:00
• 90dd0909b8 Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into god_wish_your_plushies_holy_shit kevinz000 2020-01-12 10:25:50 -08:00
• c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2020-01-12 19:18:03 +01:00
• ee33e36e6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit r4d6 2020-01-12 12:46:30 -05:00
• 268146bb93 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374 Ghommie 2020-01-12 17:19:57 +01:00
• 02fbbd4f95 Ouch. Ghommie 2020-01-12 16:54:08 +01:00
• 8c50b578b4 Automatic changelog generation for PR #10544 [ci skip] CitadelStationBot 2020-01-12 09:02:24 -06:00
• e90cef5c69 Merge pull request #10544 from AffectedArc07/file-standardisation Ghom 2020-01-12 16:02:20 +01:00