Commit Graph
1529 Commits
Author SHA1 Message Date
CitadelStationBot cbffd533ba Automatic changelog generation for PR #832 [ci skip] 2017-05-10 22:05:38 -05:00
LetterJayandGitHub a66e0c949e Merge pull request #832 from Citadel-Station-13/upstream-merge-23201
[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
2017-05-10 23:05:37 -04:00
LetterJayandGitHub 746da812bf Delete client_procs.dm.rej 2017-05-10 22:00:44 -05:00
LetterJay 43318a88a5 rej fix 2017-05-10 21:59:41 -05:00
CitadelStationBot 51d5c735a0 Automatic changelog generation for PR #722 [ci skip] 2017-05-10 20:12:10 -05:00
LetterJayandGitHub 3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645
[MIRROR] Persistent investigate and game logs separated by round ID
2017-05-10 21:12:08 -04:00
kevinz000andGitHub 9f7dd3fe16 Update ghost.dm 2017-05-10 17:53:27 -07:00
LetterJay 57372ebdb0 merge 2017-05-10 19:41:55 -05:00
LetterJayandGitHub bc9805dab0 Merge pull request #830 from Citadel-Station-13/upstream-merge-27042
[MIRROR] Fixes this annoying ass thing in the bandb I should have fixed before.
2017-05-10 20:08:54 -04:00
CitadelStationBotandkevinz000 4d9b48e5c5 Commit hash in rev data is now shortened (#873) 2017-05-10 16:28:14 -07:00
CitadelStationBot 8efe1cf60a Automatic changelog generation for PR #642 [ci skip] 2017-05-10 18:27:51 -05:00
CitadelStationBotandkevinz000 5790e8359a [MIRROR] GPS Personalizations [Post TGPSUI] (#642)
* GPS Personalizations [Post TGPSUI]

* Delete gps.dm.rej

* Update gps.dm

* eol
2017-05-10 16:27:49 -07:00
CitadelStationBot 106de41867 Automatic changelog generation for PR #848 [ci skip] 2017-05-10 18:19:16 -05:00
CitadelStationBotandkevinz000 db65f8c553 Quieter highlander (#848) 2017-05-10 16:19:15 -07:00
CitadelStationBotandkevinz000 9e4b55b2c4 Adds sql insert note (#833) 2017-05-10 16:17:56 -07:00
CitadelStationBot 0d49bde7c1 Automatic changelog generation for PR #896 [ci skip] 2017-05-10 18:16:49 -05:00
CitadelStationBotandkevinz000 4a818bee1f Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#896) 2017-05-10 16:16:48 -07:00
CitadelStationBot 4e51020ec1 Automatic changelog generation for PR #877 [ci skip] 2017-05-10 18:16:24 -05:00
CitadelStationBotandkevinz000 afdf829abc [MIRROR] Visible ghosts emit light (#877)
* Visible ghosts emit light

* Update ghost.dm

* Delete ghost.dm.rej
2017-05-10 16:16:23 -07:00
CitadelStationBotandkevinz000 8fadc0e734 Nettles won't pierce PIERCEIMMUNE species (#852) 2017-05-10 16:14:31 -07:00
CitadelStationBot 6e9fdb61f9 Automatic changelog generation for PR #860 [ci skip] 2017-05-10 18:14:07 -05:00
CitadelStationBotandkevinz000 bbff27bd58 [MIRROR] Make Lathe Design Names Capitalized Consistently (#860)
* Make Lathe Design Names Capitalized Consistently

* Delete biogenerator_designs.dm.rej
2017-05-10 16:14:06 -07:00
CitadelStationBot 7295018c27 Automatic changelog generation for PR #883 [ci skip] 2017-05-10 18:11:44 -05:00
CitadelStationBotandkevinz000 bec5a73f6c Tweak Meta Kill Room Areas (#883) 2017-05-10 16:11:43 -07:00
CitadelStationBot dfc83d94bf Automatic changelog generation for PR #884 [ci skip] 2017-05-10 18:11:23 -05:00
CitadelStationBotandkevinz000 1e1e0f7f6e More /vg/lighting tweaks (#884) 2017-05-10 16:11:22 -07:00
CitadelStationBotandkevinz000 71a36f1606 [MIRROR] 150 hours of testing (fixes master) (#889)
* 150 hours of testing (fixes master)

* Update gang.dm

* Delete gang.dm.rej
2017-05-10 16:10:38 -07:00
CitadelStationBotandkevinz000 69d72877a2 [DNM] [MIRROR] Probably fixes the ending cinematic to Gang War (#888)
* Probably fixes the ending cinematic to Gang War

* Update gang.dm

* Delete gang.dm.rej

* Update gang.dm
2017-05-10 16:08:32 -07:00
CitadelStationBot 79d99cd729 Automatic changelog generation for PR #895 [ci skip] 2017-05-10 18:06:31 -05:00
CitadelStationBotandkevinz000 82deebb863 Dominators now require a significant amount of open turf around them (#895) 2017-05-10 16:06:29 -07:00
CitadelStationBot aa2c0c0ca7 Automatic changelog generation for PR #885 [ci skip] 2017-05-10 18:05:56 -05:00
CitadelStationBotandkevinz000 2625269439 t-ray mode on goggles resets lighting (#885) 2017-05-10 16:05:55 -07:00
CitadelStationBot 65fc23806b Automatic changelog generation for PR #882 [ci skip] 2017-05-10 18:05:35 -05:00
CitadelStationBotandkevinz000 5b2521dad4 Tweaks the curator's access and clothing to improve his treasure hunting ability (#882) 2017-05-10 16:05:33 -07:00
CitadelStationBotandkevinz000 42fe8eb7c7 Fixes riding messages always using male pronouns (#869) 2017-05-10 16:05:14 -07:00
CitadelStationBot 5dd3dbf86b Automatic changelog generation for PR #886 [ci skip] 2017-05-10 18:04:59 -05:00
CitadelStationBotandkevinz000 93e652e07b Capitalizes machine names when they talk on radio (#886) 2017-05-10 16:04:58 -07:00
CitadelStationBot f28ecbd5b9 Automatic changelog generation for PR #891 [ci skip] 2017-05-10 18:04:43 -05:00
CitadelStationBotandkevinz000 914ae0cc4f You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#891) 2017-05-10 16:04:42 -07:00
CitadelStationBot 8fb1639c77 Automatic changelog generation for PR #890 [ci skip] 2017-05-10 18:04:23 -05:00
CitadelStationBotandkevinz000 ccf4550ac1 Lavaland Loot: Cursed heart upgraded to wizard version, New loot item that grants omnitongue (#890) 2017-05-10 16:04:21 -07:00
CitadelStationBot 29d503bfad Automatic changelog generation for PR #880 [ci skip] 2017-05-10 18:04:00 -05:00
CitadelStationBotandkevinz000 4e957c7de2 CC Ferry can now dock at Omega (#880) 2017-05-10 16:03:59 -07:00
CitadelStationBotandkevinz000 062ba92bdc woops I used the wrong operator there (#893) 2017-05-10 16:03:33 -07:00
CitadelStationBotandkevinz000 d804e5e886 Fixes wizard academy spawner. (#892) 2017-05-10 16:03:03 -07:00
CitadelStationBot a40dc45f7d Automatic changelog generation for PR #897 [ci skip] 2017-05-10 18:01:00 -05:00
CitadelStationBotandkevinz000 18607f79a2 Wooden planks now sell for 50 instead of 25 cargo points (#897) 2017-05-10 16:00:59 -07:00
LetterJayandGitHub 1911694715 Delete useless.txt 2017-05-10 17:37:19 -05:00
LetterJay 9687080cd0 Crab/Carp DEVOURALE = TRUE 2017-05-09 21:04:08 -05:00
kevinz000andGitHub 005d8a8156 Lets try that again... (#868)
* TGUI GPS

* fixes .rej
2017-05-08 22:58:46 -07:00