Commit Graph

  • 57372ebdb0 merge LetterJay 2017-05-10 19:41:55 -05:00
  • bc9805dab0 Merge pull request #830 from Citadel-Station-13/upstream-merge-27042 LetterJay 2017-05-10 20:08:54 -04:00
  • 4d9b48e5c5 Commit hash in rev data is now shortened (#873) CitadelStationBot 2017-05-10 18:28:14 -05:00
  • 8efe1cf60a Automatic changelog generation for PR #642 [ci skip] CitadelStationBot 2017-05-10 18:27:51 -05:00
  • 5790e8359a [MIRROR] GPS Personalizations [Post TGPSUI] (#642) CitadelStationBot 2017-05-10 18:27:49 -05:00
  • e9a35b03f6 dme kevinz000 2017-05-10 16:22:19 -07:00
  • 106de41867 Automatic changelog generation for PR #848 [ci skip] CitadelStationBot 2017-05-10 18:19:16 -05:00
  • db65f8c553 Quieter highlander (#848) CitadelStationBot 2017-05-10 18:19:15 -05:00
  • 9e4b55b2c4 Adds sql insert note (#833) CitadelStationBot 2017-05-10 18:17:56 -05:00
  • 0d49bde7c1 Automatic changelog generation for PR #896 [ci skip] CitadelStationBot 2017-05-10 18:16:49 -05:00
  • 4a818bee1f Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#896) CitadelStationBot 2017-05-10 18:16:48 -05:00
  • 4e51020ec1 Automatic changelog generation for PR #877 [ci skip] CitadelStationBot 2017-05-10 18:16:24 -05:00
  • afdf829abc [MIRROR] Visible ghosts emit light (#877) CitadelStationBot 2017-05-10 18:16:23 -05:00
  • 8fadc0e734 Nettles won't pierce PIERCEIMMUNE species (#852) CitadelStationBot 2017-05-10 18:14:31 -05:00
  • 6e9fdb61f9 Automatic changelog generation for PR #860 [ci skip] CitadelStationBot 2017-05-10 18:14:07 -05:00
  • bbff27bd58 [MIRROR] Make Lathe Design Names Capitalized Consistently (#860) CitadelStationBot 2017-05-10 18:14:06 -05:00
  • 7295018c27 Automatic changelog generation for PR #883 [ci skip] CitadelStationBot 2017-05-10 18:11:44 -05:00
  • bec5a73f6c Tweak Meta Kill Room Areas (#883) CitadelStationBot 2017-05-10 18:11:43 -05:00
  • dfc83d94bf Automatic changelog generation for PR #884 [ci skip] CitadelStationBot 2017-05-10 18:11:23 -05:00
  • 1e1e0f7f6e More /vg/lighting tweaks (#884) CitadelStationBot 2017-05-10 18:11:22 -05:00
  • 71a36f1606 [MIRROR] 150 hours of testing (fixes master) (#889) CitadelStationBot 2017-05-10 18:10:38 -05:00
  • 69d72877a2 [DNM] [MIRROR] Probably fixes the ending cinematic to Gang War (#888) CitadelStationBot 2017-05-10 18:08:32 -05:00
  • 79d99cd729 Automatic changelog generation for PR #895 [ci skip] CitadelStationBot 2017-05-10 18:06:31 -05:00
  • 82deebb863 Dominators now require a significant amount of open turf around them (#895) CitadelStationBot 2017-05-10 18:06:29 -05:00
  • aa2c0c0ca7 Automatic changelog generation for PR #885 [ci skip] CitadelStationBot 2017-05-10 18:05:56 -05:00
  • 2625269439 t-ray mode on goggles resets lighting (#885) CitadelStationBot 2017-05-10 18:05:55 -05:00
  • 65fc23806b Automatic changelog generation for PR #882 [ci skip] CitadelStationBot 2017-05-10 18:05:35 -05:00
  • 5b2521dad4 Tweaks the curator's access and clothing to improve his treasure hunting ability (#882) CitadelStationBot 2017-05-10 18:05:33 -05:00
  • 42fe8eb7c7 Fixes riding messages always using male pronouns (#869) CitadelStationBot 2017-05-10 18:05:14 -05:00
  • 5dd3dbf86b Automatic changelog generation for PR #886 [ci skip] CitadelStationBot 2017-05-10 18:04:59 -05:00
  • 93e652e07b Capitalizes machine names when they talk on radio (#886) CitadelStationBot 2017-05-10 18:04:58 -05:00
  • f28ecbd5b9 Automatic changelog generation for PR #891 [ci skip] CitadelStationBot 2017-05-10 18:04:43 -05:00
  • 914ae0cc4f You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#891) CitadelStationBot 2017-05-10 18:04:42 -05:00
  • 8fb1639c77 Automatic changelog generation for PR #890 [ci skip] CitadelStationBot 2017-05-10 18:04:23 -05:00
  • ccf4550ac1 Lavaland Loot: Cursed heart upgraded to wizard version, New loot item that grants omnitongue (#890) CitadelStationBot 2017-05-10 18:04:21 -05:00
  • 29d503bfad Automatic changelog generation for PR #880 [ci skip] CitadelStationBot 2017-05-10 18:04:00 -05:00
  • 4e957c7de2 CC Ferry can now dock at Omega (#880) CitadelStationBot 2017-05-10 18:03:59 -05:00
  • 062ba92bdc woops I used the wrong operator there (#893) CitadelStationBot 2017-05-10 18:03:33 -05:00
  • d804e5e886 Fixes wizard academy spawner. (#892) CitadelStationBot 2017-05-10 18:03:03 -05:00
  • a40dc45f7d Automatic changelog generation for PR #897 [ci skip] CitadelStationBot 2017-05-10 18:01:00 -05:00
  • 18607f79a2 Wooden planks now sell for 50 instead of 25 cargo points (#897) CitadelStationBot 2017-05-10 18:00:59 -05:00
  • 1911694715 Delete useless.txt LetterJay 2017-05-10 17:37:19 -05:00
  • eef274a7d5 wrong map LetterJay 2017-05-10 17:34:13 -05:00
  • 43dd22425b Citadel hat DMI/DM Cleans up pointless files LetterJay 2017-05-10 17:33:13 -05:00
  • 29a3968f48 kinda_working kevinz000 2017-05-10 03:41:01 -07:00
  • 9687080cd0 Crab/Carp DEVOURALE = TRUE LetterJay 2017-05-09 21:04:08 -05:00
  • b3cc892c4a Fixes some things not using log_world CitadelStationBot 2017-05-09 09:44:18 -05:00
  • 005d8a8156 Lets try that again... (#868) kevinz000 2017-05-08 22:58:46 -07:00
  • 77c066d93a Revert "[MIRROR] TGUI GPS" (#867) kevinz000 2017-05-08 22:48:34 -07:00
  • 7701c39fde Automatic changelog generation for PR #608 [ci skip] CitadelStationBot 2017-05-09 00:46:43 -05:00
  • ba0f4b1c59 TGUI GPS (#608) CitadelStationBot 2017-05-09 00:46:42 -05:00
  • 0c5d7796f8 Update useless.txt kevinz000 2017-05-08 22:39:50 -07:00
  • 46d1f5575a Automatic changelog generation for PR #785 [ci skip] CitadelStationBot 2017-05-09 00:16:11 -05:00
  • faf8829d30 [MIRROR] Adamantine golem leadership (#785) CitadelStationBot 2017-05-09 00:16:09 -05:00
  • c7b78203a5 Fixes spelling error when implanting BITTEN organs (#847) CitadelStationBot 2017-05-08 18:48:44 -05:00
  • 5c8a9c5342 Syndicate borg/reinforcement spawners have a Never For This Round option. (#851) CitadelStationBot 2017-05-08 18:48:28 -05:00
  • 9abfbb46d4 Fixes female undershirts showing all the time (#741) CitadelStationBot 2017-05-08 18:47:35 -05:00
  • c782e15d64 [MIRROR] Fix server hop (#740) CitadelStationBot 2017-05-08 18:47:21 -05:00
  • 4895d84fb9 Automatic changelog generation for PR #758 [ci skip] CitadelStationBot 2017-05-08 18:46:00 -05:00
  • 8e0e77cd35 Nerfs Chaplain smoke book. (#758) CitadelStationBot 2017-05-08 18:45:59 -05:00
  • 53dba37fca Fixes decals on shuttles (#855) CitadelStationBot 2017-05-08 18:44:59 -05:00
  • 44c29c6193 Fixes clothing damage message (#831) CitadelStationBot 2017-05-08 18:44:38 -05:00
  • c506b6c7ce Makes initial adamantine golem shells non-anchored and non-dense (#856) CitadelStationBot 2017-05-08 18:44:11 -05:00
  • e94e1efb4f Automatic changelog generation for PR #862 [ci skip] CitadelStationBot 2017-05-08 18:43:38 -05:00
  • 92bbdafc94 Adjusts Meteor Shuttle name for grammar (#862) CitadelStationBot 2017-05-08 18:43:37 -05:00
  • 1f349ecc72 Add Slime Scanner to Autolathe CitadelStationBot 2017-05-08 13:50:07 -05:00
  • 98765ec854 Small Click refactor. CitadelStationBot 2017-05-08 03:06:05 -05:00
  • 09eb38714d [MIRROR] Flushes Ling & Alien HUD info with the edge of the screen (#721) CitadelStationBot 2017-05-08 02:32:40 -05:00
  • 3ce2f5c698 Automatic changelog generation for PR #844 [ci skip] CitadelStationBot 2017-05-08 02:31:55 -05:00
  • 65729cdd55 [MIRROR] Fixes being unable to hit trophy cases in melee (#844) CitadelStationBot 2017-05-08 02:31:54 -05:00
  • e54a6725ea Automatic changelog generation for PR #763 [ci skip] CitadelStationBot 2017-05-08 02:26:00 -05:00
  • 9acc4da365 [MIRROR] Curator starts with the key to the display cases instead of being the key (#763) CitadelStationBot 2017-05-08 02:25:59 -05:00
  • e89bdb6422 [MIRROR] Fixes some stuff (#768) CitadelStationBot 2017-05-08 02:25:40 -05:00
  • 0eb1b603b2 Automatic changelog generation for PR #806 [ci skip] CitadelStationBot 2017-05-08 02:25:22 -05:00
  • a6cb12b84a [MIRROR] Plastic golems (#806) CitadelStationBot 2017-05-08 02:25:20 -05:00
  • f59f2ff8ed Automatic changelog generation for PR #696 [ci skip] CitadelStationBot 2017-05-08 01:19:36 -05:00
  • 41341e50a5 Merge pull request #696 from Citadel-Station-13/upstream-merge-25458 kevinz000 2017-05-07 23:19:35 -07:00
  • 49881624e2 Merge pull request #772 from Citadel-Station-13/upstream-merge-26874 kevinz000 2017-05-07 23:16:33 -07:00
  • ce7b714ada Merge pull request #730 from Citadel-Station-13/upstream-merge-26862 kevinz000 2017-05-07 23:16:21 -07:00
  • e94993f437 Revert "Delete mind.dm.rej" kevinz000 2017-05-07 23:07:10 -07:00
  • 9430f89756 Delete mind.dm.rej kevinz000 2017-05-07 23:06:10 -07:00
  • 010baa6a34 Merge pull request #661 from Citadel-Station-13/upstream-merge-26705 kevinz000 2017-05-07 22:53:29 -07:00
  • 8edb386906 Automatic changelog generation for PR #735 [ci skip] CitadelStationBot 2017-05-08 00:53:25 -05:00
  • a87424e105 Merge pull request #735 from Citadel-Station-13/upstream-merge-26813 kevinz000 2017-05-07 22:53:24 -07:00
  • 9ca8b570b2 Merge branch 'master' into upstream-merge-26705 kevinz000 2017-05-07 22:53:14 -07:00
  • 52a8aacd00 Delete lavaland_ruin_code.dm.rej kevinz000 2017-05-07 22:52:47 -07:00
  • 204a3a3938 Update lavaland_ruin_code.dm kevinz000 2017-05-07 22:52:39 -07:00
  • 106a9d3ad9 Delete clockwork_slab.dm.rej kevinz000 2017-05-07 22:48:04 -07:00
  • e12fc21d60 Update clockwork_slab.dm kevinz000 2017-05-07 22:47:58 -07:00
  • bebb9ec571 Delete status_effect.dm.rej kevinz000 2017-05-07 22:44:14 -07:00
  • 14a9bda61e Update status_effect.dm kevinz000 2017-05-07 22:44:06 -07:00
  • bd8bfe1327 Merge pull request #684 from Citadel-Station-13/upstream-merge-26728 kevinz000 2017-05-07 22:41:24 -07:00
  • e611a7d095 Automatic changelog generation for PR #835 [ci skip] CitadelStationBot 2017-05-08 00:36:54 -05:00
  • 8c80fee6aa Merge pull request #835 from Citadel-Station-13/upstream-merge-26993 kevinz000 2017-05-07 22:36:52 -07:00
  • 451ca85ca4 Automatic changelog generation for PR #803 [ci skip] CitadelStationBot 2017-05-08 00:36:04 -05:00
  • 54b8375f9c Merge pull request #803 from Citadel-Station-13/upstream-merge-26881 kevinz000 2017-05-07 22:36:03 -07:00
  • 4a59682803 Update gang.dm kevinz000 2017-05-07 22:35:54 -07:00
  • 6bf46e1a6d Delete gang.dm.rej kevinz000 2017-05-07 22:35:48 -07:00
  • 9012783adb Merge pull request #838 from Citadel-Station-13/upstream-merge-26888 kevinz000 2017-05-07 22:35:11 -07:00
  • ec752aabb4 curator --> librarian kevinz000 2017-05-07 22:33:30 -07:00