Commit Graph

  • d2949c64db Merge pull request #13728 from Citadel-Station-13/silicons-patch-12 Lin 2020-12-06 22:10:48 +00:00
  • 53a434cfb1 suggested change Timothy Teakettle 2020-12-06 20:07:50 +00:00
  • 9c401eeb1f Merge branch 'loadout-json' of https://github.com/timothyteakettle/Citadel-Station-13 into loadout-json Timothy Teakettle 2020-12-06 20:05:57 +00:00
  • 158d76dea5 githubs being weird Timothy Teakettle 2020-12-06 20:05:49 +00:00
  • 74c30dc3c1 better time length qwerty 2020-12-06 13:13:53 -06:00
  • 851f9afa20 bugfixes qwerty 2020-12-06 13:08:18 -06:00
  • 29141ba97d flash on climax qwerty 2020-12-06 12:36:30 -06:00
  • 61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json timothyteakettle 2020-12-06 17:26:04 +00:00
  • 0f540884eb Merge branch 'master' into loadout-json timothyteakettle 2020-12-06 17:24:24 +00:00
  • 5566c00a69 fixes timothyteakettle 2020-12-06 17:24:12 +00:00
  • dd4f60a24b *snap DeltaFire 2020-12-06 17:37:46 +01:00
  • a478da678e bugfixes timothyteakettle 2020-12-06 15:50:33 +00:00
  • 86b9161fc9 Automatic changelog generation for PR #13711 [ci skip] CitadelStationBot 2020-12-06 00:36:31 -06:00
  • 3b6553899b Merge pull request #13711 from DeltaFire15/medbot-synthetic-ignore Lin 2020-12-06 06:36:28 +00:00
  • 8cf6f11609 Automatic changelog generation for PR #13733 [ci skip] CitadelStationBot 2020-12-06 00:13:01 -06:00
  • cbcf60ff76 Merge pull request #13733 from DeltaFire15/tail-entwine-fix Lin 2020-12-06 06:12:57 +00:00
  • 37d85ac14f Merge remote-tracking branch 'Upstream/master' The0bserver 2020-12-06 01:00:20 -05:00
  • 663fff03c6 Merge pull request #13720 from timothyteakettle/podpeople-green-blood DeltaFire 2020-12-06 03:43:19 +01:00
  • 7b3a5198dc Fixes blob reflection keronshb 2020-12-05 20:18:07 -05:00
  • cbbcc0c386 fix the migration timothyteakettle 2020-12-06 00:16:56 +00:00
  • dc42a07489 b timothyteakettle 2020-12-06 00:02:23 +00:00
  • d05992ee44 Revert "a" timothyteakettle 2020-12-06 00:02:17 +00:00
  • fa26f4c402 b timothyteakettle 2020-12-06 00:02:14 +00:00
  • 640a86582a a timothyteakettle 2020-12-06 00:02:06 +00:00
  • afdbac31fa test Timothy Teakettle 2020-12-05 22:35:27 +00:00
  • 0c4e9ca1c5 better phrasing DeltaFire 2020-12-05 02:56:03 +01:00
  • f0c1890a65 fix DeltaFire 2020-12-05 02:48:33 +01:00
  • c2954d1d6f Merge pull request #13727 from Citadel-Station-13/silicons-patch-11 Lin 2020-12-04 22:52:04 +00:00
  • 7b0cb7c5a4 FIXED silicons 2020-12-03 22:07:41 -07:00
  • e34a6cb544 Automatic changelog generation for PR #13717 [ci skip] CitadelStationBot 2020-12-03 17:34:02 -06:00
  • 750f81920b Merge pull request #13717 from TheObserver-sys/shuttlefix silicons 2020-12-03 16:34:00 -07:00
  • b6092086da Automatic changelog generation for PR #13719 [ci skip] CitadelStationBot 2020-12-03 17:33:51 -06:00
  • 8d398b3e24 Merge pull request #13719 from shellspeed1/Adds-construction-bags-from-tg silicons 2020-12-03 16:33:47 -07:00
  • a6eeb5d418 Merge pull request #13692 from Citadel-Station-13/silicons-patch-7 Lin 2020-12-03 20:34:16 +00:00
  • b721cf3128 Update preferences.dm silicons 2020-12-03 05:41:56 -07:00
  • 31cf8842e4 Update death.dm silicons 2020-12-02 23:45:18 -07:00
  • d43086572d Update carbon.dm silicons 2020-12-02 23:44:35 -07:00
  • c891a456e8 Update typing_indicator.dm silicons 2020-12-02 23:43:00 -07:00
  • 8d7f3aebc4 sigh silicons 2020-12-02 09:20:23 -07:00
  • 4e9bb126e8 recompiled, thanks tgui Putnam 2020-12-02 08:18:10 -08:00
  • 809e270290 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local Putnam 2020-12-02 08:16:22 -08:00
  • 2f34f2dac5 Automatic changelog generation for PR #13721 [ci skip] CitadelStationBot 2020-12-02 09:08:48 -06:00
  • ad4d10239d Merge pull request #13721 from MrJWhit/moar-crimmas DeltaFire 2020-12-02 16:08:45 +01:00
  • 19420a6274 moar crimmas MrJWhit 2020-12-01 04:08:39 -05:00
  • d0ebd6c2d8 green blood Timothy Teakettle 2020-11-30 19:22:54 +00:00
  • 3735efbfca Ports construction bags shellspeed1 2020-11-29 18:29:03 -08:00
  • da3c28675a Merge pull request #13714 from Citadel-Station-13/silicons-patch-10 DeltaFire 2020-11-29 18:18:45 +01:00
  • bd980fb981 Automatic changelog generation for PR #13687 [ci skip] CitadelStationBot 2020-11-29 11:13:15 -06:00
  • 6bdb54117b Merge pull request #13687 from Citadel-Station-13/silicons-patch-6 DeltaFire 2020-11-29 18:13:12 +01:00
  • f84817b85a Automatic changelog generation for PR #13695 [ci skip] CitadelStationBot 2020-11-28 10:13:15 -06:00
  • 6bd13c9054 Merge pull request #13695 from shellspeed1/Better-Ling-change silicons 2020-11-28 09:13:12 -07:00
  • 1b5432c807 Automatic changelog generation for PR #13715 [ci skip] CitadelStationBot 2020-11-28 10:12:59 -06:00
  • 3e07a309f3 Merge pull request #13715 from MrJWhit/whoops-boxstation-fix silicons 2020-11-28 09:12:56 -07:00
  • 332e58a1f1 Automatic changelog generation for PR #13698 [ci skip] CitadelStationBot 2020-11-28 10:12:43 -06:00
  • 0f9734b1f7 Merge pull request #13698 from timothyteakettle/communication-hotkeys silicons 2020-11-28 09:12:40 -07:00
  • 4559a153c3 Map Tweak The0bserver 2020-11-27 16:51:55 -05:00
  • 868798b122 Automatic changelog generation for PR #13576 [ci skip] CitadelStationBot 2020-11-27 15:31:13 -06:00
  • a1d38033a4 Merge pull request #13576 from Sonic121x/patch-2 DeltaFire15 2020-11-27 22:31:10 +01:00
  • fa88f3aa92 e DeltaFire 2020-11-27 22:10:29 +01:00
  • 47c74c3fac sigh silicons 2020-11-27 06:42:55 -07:00
  • ead209f507 sigh silicons 2020-11-27 06:31:05 -07:00
  • ae756749cc woops silicons 2020-11-27 05:15:40 -07:00
  • a6d73e0344 fix silicons 2020-11-27 04:25:22 -07:00
  • 0d6986d3a2 Update jellypeople.dm silicons 2020-11-27 02:25:41 -07:00
  • 884fbd0a52 found you. The0bserver 2020-11-27 03:45:08 -05:00
  • 564766d11d sigh silicons 2020-11-27 00:16:53 -07:00
  • 134fd0f858 k silicons 2020-11-26 23:42:39 -07:00
  • 9f4e0ac4df woops silicons 2020-11-26 23:38:39 -07:00
  • 5e965d099f COME ON silicons 2020-11-26 23:37:27 -07:00
  • e7c02de01e k silicons 2020-11-26 23:16:25 -07:00
  • b949daba84 Merge remote-tracking branch 'Upstream/master' The0bserver 2020-11-26 22:02:08 -05:00
  • 2c01acd5f5 important timothyteakettle 2020-11-26 22:52:58 +00:00
  • 21734b5d63 there we go DeltaFire 2020-11-26 23:04:39 +01:00
  • 566d74bd77 E DeltaFire 2020-11-26 16:12:08 +01:00
  • 00337392c7 Sneaky opposum MrJWhit 2020-11-26 00:58:48 -05:00
  • 46baf7372d Update permissionedit.dm silicons 2020-11-25 22:47:25 -07:00
  • 211019903e Merge pull request #13709 from Hatterhat/thanks-aleks silicons 2020-11-25 22:23:46 -07:00
  • 3b68d4a982 Automatic changelog generation for PR #13705 [ci skip] CitadelStationBot 2020-11-25 23:23:20 -06:00
  • a20f14b937 Merge pull request #13705 from Putnam3145/buff-rad-collector silicons 2020-11-25 22:23:17 -07:00
  • b847988485 Automatic changelog generation for PR #13707 [ci skip] CitadelStationBot 2020-11-25 23:23:09 -06:00
  • 8fa69c458b Merge pull request #13707 from DeltaFire15/synthetic-alcohol-intolerance silicons 2020-11-25 22:23:05 -07:00
  • ed0aad8d65 Automatic changelog generation for PR #13702 [ci skip] CitadelStationBot 2020-11-25 23:22:46 -06:00
  • a78ebb1f08 Merge pull request #13702 from Putnam3145/harness-tweak silicons 2020-11-25 22:22:43 -07:00
  • 77b9c4bca7 Automatic changelog generation for PR #13703 [ci skip] CitadelStationBot 2020-11-25 23:22:34 -06:00
  • a0330d46db Merge pull request #13703 from Putnam3145/none-dynamic-with-left-beef silicons 2020-11-25 22:22:31 -07:00
  • 543f28fed9 Automatic changelog generation for PR #13697 [ci skip] CitadelStationBot 2020-11-25 23:22:23 -06:00
  • bba5cef9be Merge pull request #13697 from Putnam3145/brain-trauma-again silicons 2020-11-25 22:22:20 -07:00
  • 28c8f1b6eb Automatic changelog generation for PR #13689 [ci skip] CitadelStationBot 2020-11-25 23:22:00 -06:00
  • f301ed4f8f Merge pull request #13689 from DeltaFire15/apc-power-fuckery silicons 2020-11-25 22:21:57 -07:00
  • 4750ee9513 Automatic changelog generation for PR #13685 [ci skip] CitadelStationBot 2020-11-25 23:21:37 -06:00
  • fa516b1097 Merge pull request #13685 from uomo91/adminlogging silicons 2020-11-25 22:21:34 -07:00
  • 9931285702 Automatic changelog generation for PR #13686 [ci skip] CitadelStationBot 2020-11-25 23:21:31 -06:00
  • 2be21324bc Merge pull request #13686 from Arturlang/tgui_whitescreenfix_port silicons 2020-11-25 22:21:27 -07:00
  • 60a0db7730 oh thanks silicons 2020-11-25 22:20:50 -07:00
  • e8c2b7d2a6 gas mask adjusting timothyteakettle 2020-11-26 01:03:00 +00:00
  • 67303ce7be Update medbot.dm DeltaFire 2020-11-26 00:19:47 +01:00
  • b487c7cb57 actually DeltaFire 2020-11-25 23:53:33 +01:00
  • f4bef53633 only care about robots if oxydam DeltaFire 2020-11-25 23:41:18 +01:00
  • 69127ebec6 e DeltaFire 2020-11-25 18:06:08 +01:00
  • 24b712c71e better way to do this DeltaFire 2020-11-25 15:42:43 +01:00