Commit Graph

  • 5f44230442 Automatic changelog generation for PR #11141 [ci skip] CitadelStationBot 2020-02-20 04:08:30 -06:00
  • c1f8deb4a5 Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17 Ghom 2020-02-20 11:08:27 +01:00
  • 1cff36babd Automatic changelog generation for PR #11146 [ci skip] CitadelStationBot 2020-02-20 04:08:17 -06:00
  • e9d0f536de Merge pull request #11146 from Putnam3145/supermatter-hardcap Ghom 2020-02-20 11:08:14 +01:00
  • ad337901e2 Automatic changelog generation for PR #11149 [ci skip] CitadelStationBot 2020-02-20 04:07:54 -06:00
  • 1f42e9f451 Merge pull request #11149 from Putnam3145/fix-vendor-badcode Ghom 2020-02-20 11:07:51 +01:00
  • 296e845183 Automatic changelog generation for PR #11160 [ci skip] CitadelStationBot 2020-02-20 04:00:04 -06:00
  • 22a041f72b Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway Ghom 2020-02-20 11:00:00 +01:00
  • 5401796a5f corrections TrilbySpaceClone 2020-02-20 02:40:34 -05:00
  • c4b4a90bd8 Oh hey it's KiloStation Persi 2020-02-18 21:52:34 -05:00
  • ca7e4842ee Automatic changelog generation for PR #11168 [ci skip] CitadelStationBot 2020-02-19 23:57:01 -06:00
  • e11cfcd305 Merge pull request #11168 from Putnam3145/fix-dynamic-storytellers kevinz000 2020-02-19 22:56:58 -07:00
  • 71c71766e6 one of those runtimes that will never show up in play but boy howdy Putnam 2020-02-19 21:53:22 -08:00
  • d7403b3436 john doe kevinz000 2020-02-19 22:26:10 -07:00
  • 2dd5a0cfb8 Merge branch 'master' into hijack kevinz000 2020-02-19 22:25:31 -07:00
  • fd410963a9 Update teleportation.dm kevinz000 2020-02-19 22:23:54 -07:00
  • 4373f116e0 Update teleportation.dm kevinz000 2020-02-19 22:07:03 -07:00
  • 00618dbc9b whoops option is a number Putnam 2020-02-19 20:58:06 -08:00
  • 00f21ed685 revert mesmerize spammability raspyosu 2020-02-19 23:37:11 -05:00
  • 362ebbcf8f shit Hatterhat 2020-02-19 21:14:13 -06:00
  • b5e369aaf1 i forgot about that one Hatterhat 2020-02-19 21:00:31 -06:00
  • c498b1df95 Quick TEG update MrJWhit 2020-02-19 22:00:15 -05:00
  • 2d32c47743 so i forgot to change that over Hatterhat 2020-02-19 20:59:02 -06:00
  • c3f489dd48 back/suit icons kevinz000 2020-02-19 19:33:16 -07:00
  • a06fcea985 Merge remote-tracking branch 'citadel/master' into vampire_haste kevinz000 2020-02-19 19:16:58 -07:00
  • c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-02-19 19:12:27 -07:00
  • 8610c7f664 better inhands kevinz000 2020-02-19 19:10:19 -07:00
  • 7151f3d2ea Automatic changelog generation for PR #11098 [ci skip] CitadelStationBot 2020-02-19 20:05:52 -06:00
  • 6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows! kevinz000 2020-02-19 19:05:49 -07:00
  • e47d7c0ddf Automatic changelog generation for PR #11113 [ci skip] CitadelStationBot 2020-02-19 20:03:37 -06:00
  • 49279086b7 Merge pull request #11113 from CameronWoof/biogeneratin' kevinz000 2020-02-19 19:03:35 -07:00
  • 9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583 kevinz000 2020-02-19 19:03:01 -07:00
  • a10c71320d Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-02-19 19:02:34 -07:00
  • 9929cecec5 wack Hatterhat 2020-02-19 20:01:40 -06:00
  • 36f9edbfef Automatic changelog generation for PR #10953 [ci skip] CitadelStationBot 2020-02-19 20:00:55 -06:00
  • 8567346501 Merge pull request #10953 from Ghommie/Ghommie-cit564 kevinz000 2020-02-19 19:00:53 -07:00
  • 7c3308d593 Automatic changelog generation for PR #10910 [ci skip] CitadelStationBot 2020-02-19 20:00:35 -06:00
  • 3e073f160c Merge pull request #10910 from Citadel-Station-13/Ghommie-patch-6 kevinz000 2020-02-19 19:00:32 -07:00
  • 3657922990 Automatic changelog generation for PR #10904 [ci skip] CitadelStationBot 2020-02-19 20:00:26 -06:00
  • aeb8087441 Merge pull request #10904 from Hatterhat/golem-ship-gps kevinz000 2020-02-19 19:00:24 -07:00
  • 548baf14b6 Automatic changelog generation for PR #11133 [ci skip] CitadelStationBot 2020-02-19 20:00:05 -06:00
  • 6df64da7d6 Merge pull request #11133 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-02-19 19:00:02 -07:00
  • 1c2dca4a00 Merge pull request #11132 from Ghommie/Ghommie-cit585 kevinz000 2020-02-19 18:59:44 -07:00
  • a7cf5b63ee Automatic changelog generation for PR #11147 [ci skip] CitadelStationBot 2020-02-19 19:59:31 -06:00
  • 530416a5ac Merge pull request #11147 from Putnam3145/supermatter-objective-fix kevinz000 2020-02-19 18:59:28 -07:00
  • 8be22278e4 Automatic changelog generation for PR #11145 [ci skip] CitadelStationBot 2020-02-19 19:59:13 -06:00
  • b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586 kevinz000 2020-02-19 18:59:10 -07:00
  • 7c8b9828cd Merge branch 'master' into eldritch_affairs kevinz000 2020-02-19 18:57:32 -07:00
  • 6b1a721f1c literally a mouth cover check Hatterhat 2020-02-19 17:51:18 -06:00
  • 901b54b7e8 Webedit man to the doom and rescue Arturlang 2020-02-20 01:38:28 +02:00
  • 0ad49f9004 shit dude i hope this works lmao Hatterhat 2020-02-19 17:18:51 -06:00
  • cd56e29a98 drink my ass kevinz Kraseo 2020-02-20 00:18:43 +01:00
  • 796f51b557 Merge branch 'master' into TGUI_Next_Nanites Arturlang 2020-02-20 00:52:55 +02:00
  • b66b8ac2a0 Merge remote-tracking branch 'citadel/master' into staves kevinz000 2020-02-19 14:32:28 -07:00
  • 304026a4f8 Merge pull request #11151 from Putnam3145/map-irv-fix Ghom 2020-02-19 21:13:48 +01:00
  • dd3520896a wow there's an else Putnam 2020-02-19 11:45:37 -08:00
  • 3bf1ac590c it's probably better that it works Putnam 2020-02-19 11:00:56 -08:00
  • b76b346f2d whoops Putnam 2020-02-19 10:56:43 -08:00
  • 395fb8de3e Added licking pref. Putnam 2020-02-19 10:49:26 -08:00
  • af6df2784c holy shit this was still in the fucking game necromanceranne 2020-02-20 04:46:30 +11:00
  • f532c1a444 i spent 2 hours figuring out how to fix this Kraseo 2020-02-19 18:40:30 +01:00
  • c920d198e2 Update Viro to /tg/ standards Unknown 2020-02-19 12:17:57 -05:00
  • eb342d1591 Update mood.dm Ghom 2020-02-19 17:14:30 +01:00
  • 9289ca8873 fix kevinz000 2020-02-19 08:14:28 -07:00
  • 15c56e6a12 crlf kevinz000 2020-02-19 07:56:16 -07:00
  • 34fbcd1dc0 fixes kevinz000 2020-02-19 07:49:05 -07:00
  • 4a537d770d let's make this work kevinz000 2020-02-19 07:20:16 -07:00
  • ee1f61b5de F Ghommie 2020-02-19 14:26:11 +01:00
  • 057b6f591c HEEY Ghommie 2020-02-19 14:23:12 +01:00
  • 37ba75ec12 Fixing addiction moodlets not going away and secret sauce recipe paper. Ghommie 2020-02-19 14:07:11 +01:00
  • d635af0caa Conflict Fix Artur 2020-02-19 13:11:33 +02:00
  • 87d55c5be6 Reworks it Artur 2020-02-19 13:09:09 +02:00
  • 6aec971b4e haha i'm dumb Putnam 2020-02-18 21:41:00 -08:00
  • a570a8fea8 this is fine raspyosu 2020-02-18 23:24:01 -05:00
  • 6e013d7f8c zzzzzz raspyosu 2020-02-18 23:18:52 -05:00
  • 950082f537 k kevinz000 2020-02-18 20:49:42 -07:00
  • 00d66c9b91 Renamed CAT_FISH to CAT_EASTERN Winter Flare 2020-02-18 22:19:58 -05:00
  • 60f819465c what. what. what. what. what. Putnam 2020-02-18 18:30:15 -08:00
  • 0229db9c61 trait comsigs kevinz000 2020-02-18 18:23:01 -07:00
  • 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-02-18 18:16:34 -07:00
  • fef9cc83ac Automatic changelog generation for PR #11138 [ci skip] CitadelStationBot 2020-02-18 19:12:44 -06:00
  • 479cdccd17 Merge pull request #11138 from Citadel-Station-13/kevinz000-patch-11 Ghom 2020-02-19 02:12:42 +01:00
  • 9a51caf834 Automatic changelog generation for PR #10980 [ci skip] CitadelStationBot 2020-02-18 19:10:28 -06:00
  • 0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4 Ghom 2020-02-19 02:10:25 +01:00
  • 4f13765f3c Automatic changelog generation for PR #11103 [ci skip] CitadelStationBot 2020-02-18 19:09:04 -06:00
  • 4d39bae16b Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb Ghom 2020-02-19 02:09:02 +01:00
  • 77d5c09858 Merge pull request #11124 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-02-19 02:05:49 +01:00
  • 9803a0835c lunge tweaks raspyosu 2020-02-18 19:04:20 -05:00
  • a9edff6e56 Supermatter sabotage no longer shows up with no supermatter Putnam 2020-02-18 11:51:03 -08:00
  • 2834994587 why didn't we do this sooner Putnam 2020-02-18 11:34:09 -08:00
  • 19ca51a639 Automatic changelog generation for PR #11083 [ci skip] CitadelStationBot 2020-02-18 12:02:37 -06:00
  • 2b7f27270f Merge pull request #11083 from Hatterhat/sword-cleaning Ghom 2020-02-18 19:02:34 +01:00
  • 33c0422453 Automatic changelog generation for PR #11091 [ci skip] CitadelStationBot 2020-02-18 10:11:52 -06:00
  • 08c86ec1ea Merge pull request #11091 from BlueWildrose/master Ghom 2020-02-18 17:11:50 +01:00
  • e860a36c3d Automatic changelog generation for PR #11131 [ci skip] CitadelStationBot 2020-02-18 10:02:20 -06:00
  • 6ea2843149 Merge pull request #11131 from Seris02/demondabbing Ghom 2020-02-18 17:02:17 +01:00
  • 698f0b8177 Something about pAIs and silicon access priviledges. Ghommie 2020-02-18 16:20:44 +01:00
  • 541ecffa1a Automatic changelog generation for PR #11134 [ci skip] CitadelStationBot 2020-02-18 08:52:20 -06:00
  • 218bb44e3f Merge pull request #11134 from Hatterhat/tg-46579-also-icons Ghom 2020-02-18 15:52:17 +01:00
  • 3785c94a1b more responsive kevinz000 2020-02-18 03:57:39 -07:00