Commit Graph

  • e17a06cff1 Automatic changelog generation for PR #4968 [ci skip] CitadelStationBot 2018-01-22 00:25:16 -06:00
  • fadeecaf40 Merge pull request #4968 from Citadel-Station-13/upstream-merge-34667 deathride58 2018-01-22 06:25:14 +00:00
  • 7bc28bb2a3 Automatic changelog generation for PR #5003 [ci skip] CitadelStationBot 2018-01-22 00:24:38 -06:00
  • 5121a272d2 Merge pull request #5003 from Citadel-Station-13/upstream-merge-34717 deathride58 2018-01-22 06:24:35 +00:00
  • b87972b15c Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314 LetterJay 2018-01-21 23:14:18 -06:00
  • 8170ce4a71 Automatic changelog generation for PR #5013 [ci skip] CitadelStationBot 2018-01-21 23:13:55 -06:00
  • e374b7f575 Merge pull request #5013 from Citadel-Station-13/upstream-merge-34636 LetterJay 2018-01-21 23:13:53 -06:00
  • 4968216336 Automatic changelog generation for PR #5012 [ci skip] CitadelStationBot 2018-01-21 23:13:26 -06:00
  • fac7b08506 Merge pull request #5012 from Citadel-Station-13/upstream-merge-34705 LetterJay 2018-01-21 23:13:24 -06:00
  • e8ec0580d1 Merge pull request #5011 from Citadel-Station-13/upstream-merge-34697 LetterJay 2018-01-21 23:13:07 -06:00
  • 5d6ae12053 Automatic changelog generation for PR #5009 [ci skip] CitadelStationBot 2018-01-21 23:12:23 -06:00
  • 61b0c699bf Merge pull request #5009 from Citadel-Station-13/upstream-merge-34712 LetterJay 2018-01-21 23:12:21 -06:00
  • f3e4ba69ec Merge pull request #5008 from Citadel-Station-13/upstream-merge-34711 LetterJay 2018-01-21 23:11:56 -06:00
  • 3fc864fc35 Automatic changelog generation for PR #5007 [ci skip] CitadelStationBot 2018-01-21 23:11:39 -06:00
  • e9e357d3de Merge pull request #5007 from Citadel-Station-13/upstream-merge-34709 LetterJay 2018-01-21 23:11:37 -06:00
  • c0f5448025 Automatic changelog generation for PR #5006 [ci skip] CitadelStationBot 2018-01-21 23:11:22 -06:00
  • b1ee30d46e Merge pull request #5006 from Citadel-Station-13/upstream-merge-34714 LetterJay 2018-01-21 23:11:20 -06:00
  • 10d7a27db5 Automatic changelog generation for PR #5005 [ci skip] CitadelStationBot 2018-01-21 23:10:59 -06:00
  • 1beea71328 Merge pull request #5005 from Citadel-Station-13/upstream-merge-34720 LetterJay 2018-01-21 23:10:57 -06:00
  • 9a96950032 Merge pull request #5004 from Citadel-Station-13/upstream-merge-34723 LetterJay 2018-01-21 23:10:35 -06:00
  • 5aaba3c138 Merge pull request #5002 from Citadel-Station-13/upstream-merge-34715 LetterJay 2018-01-21 23:10:14 -06:00
  • a48cc4c630 Automatic changelog generation for PR #4996 [ci skip] CitadelStationBot 2018-01-21 23:10:02 -06:00
  • 6b998377ca Merge pull request #4996 from Citadel-Station-13/upstream-merge-34686 LetterJay 2018-01-21 23:10:00 -06:00
  • 84b9c4bb2b Update life.dm LetterJay 2018-01-21 23:09:22 -06:00
  • 61c245ebef Update candle.dm LetterJay 2018-01-21 23:07:11 -06:00
  • e51b346aa6 Datum var cleanup CitadelStationBot 2018-01-21 21:39:47 -06:00
  • e84617f17b Datum var cleanup (#34314) Jordan Brown 2018-01-21 22:38:56 -05:00
  • 12474a9875 Adds the camera and it's film to the autolathe and changes the materials on them CitadelStationBot 2018-01-21 21:24:18 -06:00
  • c2f5a85394 Adds the camera to the autolathe and changes the materials (#34636) Dax Dupont 2018-01-22 04:23:48 +01:00
  • b3f8fa0b10 Fix radio jammers affecting other z-levels CitadelStationBot 2018-01-21 21:18:00 -06:00
  • 4f33c20fba Fix radio jammers affecting other z-levels (#34705) Tad Hardesty 2018-01-21 19:16:44 -08:00
  • 84b864eff7 Fixes holes in station showing up white on photos. CitadelStationBot 2018-01-21 21:17:49 -06:00
  • 22f64c3b1f Fixes holes in station showing up white on photos. (#34697) AnturK 2018-01-22 04:17:36 +01:00
  • 39ba233ff9 Switches database connector over to mariadb CitadelStationBot 2018-01-21 21:16:37 -06:00
  • d9a0133a96 Switches database connector over to mariadb (#34708) Kyle Spier-Swenson 2018-01-21 19:16:06 -08:00
  • 88b4a41fe2 Reduces spaces in the Lepidopterian language. MoreRobustThanYou 2018-01-21 22:14:14 -05:00
  • 0fb016bc11 Removes unused consts from dbcore CitadelStationBot 2018-01-21 21:15:18 -06:00
  • 006b9c95f2 Removes unused consts from dbcore (#34711) Jordan Brown 2018-01-21 22:14:34 -05:00
  • 2ddbc8fe71 Fixes each monkey having it's own individual monkey_team CitadelStationBot 2018-01-21 21:15:10 -06:00
  • c889a965df Fixes each monkey having it's own individual monkey_team (#34709) MoreRobustThanYou 2018-01-21 22:15:07 -05:00
  • 7b24f23b38 Removes magic numbers from the set_light calls in light fixtures CitadelStationBot 2018-01-21 21:13:57 -06:00
  • 9e6ce24a57 removes magic numbers from the set_light var in lights (#34714) deathride58 2018-01-22 03:13:33 +00:00
  • 841bf18c6b Syndicate+Pirate mobs now give off light if appropriate CitadelStationBot 2018-01-21 21:08:40 -06:00
  • 372d6505ed make pretty light go light light (#34720) MMMiracles 2018-01-21 22:08:35 -05:00
  • 7e94e67f86 City of cogs atmos is now planetary, slowly resets CitadelStationBot 2018-01-21 21:07:29 -06:00
  • 3ef5dc14b5 Rebee atmos (#34723) KorPhaeron 2018-01-21 21:07:10 -06:00
  • fac6caffca Longer lasting candles. scrubs2009 2018-01-20 17:12:29 -06:00
  • d1b2bf06c8 Removes an unused proc CitadelStationBot 2018-01-21 18:13:02 -06:00
  • 5b7d74a80d Removes an unused proc Jordan Brown 2018-01-20 18:09:56 -05:00
  • 193c4d6971 Automatic changelog generation for PR #5001 [ci skip] CitadelStationBot 2018-01-21 16:42:55 -06:00
  • 28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633 deathride58 2018-01-21 22:42:53 +00:00
  • 5bc5df68db Automatic changelog generation for PR #4999 [ci skip] CitadelStationBot 2018-01-21 16:41:35 -06:00
  • fafdad4ce9 Merge pull request #4999 from Citadel-Station-13/upstream-merge-34614 deathride58 2018-01-21 22:41:33 +00:00
  • 625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606 deathride58 2018-01-21 22:41:13 +00:00
  • 07b6d8ab11 Automatic changelog generation for PR #4997 [ci skip] CitadelStationBot 2018-01-21 16:39:55 -06:00
  • 83135ca4e0 Merge pull request #4997 from Citadel-Station-13/upstream-merge-34567 deathride58 2018-01-21 22:39:53 +00:00
  • 84b02025c9 Merge branch 'master' into upstream-merge-34686 deathride58 2018-01-21 22:38:47 +00:00
  • 130b0f8d0d Merge pull request #4995 from Citadel-Station-13/upstream-merge-34695 deathride58 2018-01-21 22:37:52 +00:00
  • 038591d11f Merge pull request #4994 from Citadel-Station-13/upstream-merge-34629 deathride58 2018-01-21 22:37:34 +00:00
  • 3a34f68f9d Automatic changelog generation for PR #4993 [ci skip] CitadelStationBot 2018-01-21 16:37:10 -06:00
  • 69b636f832 Merge pull request #4993 from Citadel-Station-13/upstream-merge-34692 deathride58 2018-01-21 22:37:08 +00:00
  • 0ce61fb375 Merge pull request #4987 from Citadel-Station-13/upstream-merge-34674 deathride58 2018-01-21 22:36:50 +00:00
  • 3e26ab5ceb Merge pull request #4990 from Citadel-Station-13/upstream-merge-34678 deathride58 2018-01-21 22:36:24 +00:00
  • c408f37b4c Update life.dm LetterJay 2018-01-21 14:21:23 -06:00
  • 574bc8fe25 Update title.dm LetterJay 2018-01-21 14:20:22 -06:00
  • 6094f87105 Update life.dm LetterJay 2018-01-21 14:20:03 -06:00
  • 923b72e138 Update ghost.dm LetterJay 2018-01-21 14:19:48 -06:00
  • e02d7ae786 Update life.dm LetterJay 2018-01-21 14:14:19 -06:00
  • 5d880be1e2 Refactor weather to use Z traits, assorted related cleanup CitadelStationBot 2018-01-21 13:34:04 -06:00
  • 4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633) Tad Hardesty 2018-01-21 11:33:11 -08:00
  • 4451444d27 Lets check_dock be silent CitadelStationBot 2018-01-21 12:34:42 -06:00
  • 2054fc6433 lets check_dock be silent (#34614) Emmett Gaines 2018-01-21 13:34:17 -05:00
  • 8dead1da6a Config dir again except this time it works Jordan Brown 2018-01-21 13:32:12 -05:00
  • 02c005c0e2 Fixes Revs & Clockcultists being valid for mindswap CitadelStationBot 2018-01-21 12:29:12 -06:00
  • 68cfdb617b Fixes rev mindswap (#34567) ShizCalev 2018-01-21 13:28:41 -05:00
  • f692ffaa0c Automatic changelog generation for PR #4992 [ci skip] CitadelStationBot 2018-01-21 12:01:45 -06:00
  • a074e10815 Merge pull request #4992 from Citadel-Station-13/upstream-merge-34679 LetterJay 2018-01-21 12:01:43 -06:00
  • ba8122eebe Merge pull request #4991 from Citadel-Station-13/upstream-merge-34646 LetterJay 2018-01-21 11:57:07 -06:00
  • c18ce156e2 Merge pull request #4989 from Citadel-Station-13/upstream-merge-34625 LetterJay 2018-01-21 11:56:50 -06:00
  • 977b57573d Automatic changelog generation for PR #4988 [ci skip] CitadelStationBot 2018-01-21 11:56:42 -06:00
  • d60e61ecbc Merge pull request #4988 from Citadel-Station-13/upstream-merge-34691 LetterJay 2018-01-21 11:56:40 -06:00
  • c158d2f6dd Update game.dm LetterJay 2018-01-21 11:56:09 -06:00
  • 327d4401cd Automatic changelog generation for PR #4986 [ci skip] CitadelStationBot 2018-01-21 11:55:54 -06:00
  • d24a9d02d3 Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497 LetterJay 2018-01-21 11:55:52 -06:00
  • 5029e1294f Automatic changelog generation for PR #4985 [ci skip] CitadelStationBot 2018-01-21 11:55:25 -06:00
  • a415630f0e Merge pull request #4985 from Citadel-Station-13/upstream-merge-34515 LetterJay 2018-01-21 11:55:23 -06:00
  • 26c34990fc Automatic changelog generation for PR #4984 [ci skip] CitadelStationBot 2018-01-21 11:54:18 -06:00
  • a29c1bee0b Merge pull request #4984 from Citadel-Station-13/upstream-merge-34485 LetterJay 2018-01-21 11:54:16 -06:00
  • 15678c0ba7 Merge pull request #4983 from Citadel-Station-13/upstream-merge-34668 LetterJay 2018-01-21 11:53:08 -06:00
  • b59c02f443 Merge pull request #4982 from Citadel-Station-13/upstream-merge-34630 LetterJay 2018-01-21 11:52:41 -06:00
  • a138cc3e6a Merge pull request #4980 from Citadel-Station-13/upstream-merge-34687 LetterJay 2018-01-21 11:51:22 -06:00
  • 9d8a375adc Update README.md LetterJay 2018-01-21 11:50:40 -06:00
  • 81b425eb24 Merge pull request #4979 from Citadel-Station-13/upstream-merge-34683 LetterJay 2018-01-21 11:50:07 -06:00
  • b93bd3ca4c Automatic changelog generation for PR #4978 [ci skip] CitadelStationBot 2018-01-21 11:49:53 -06:00
  • e8e15dbc39 Merge pull request #4978 from Citadel-Station-13/upstream-merge-34682 LetterJay 2018-01-21 11:49:51 -06:00
  • d37a2bc93a Merge pull request #4977 from Citadel-Station-13/upstream-merge-34632 LetterJay 2018-01-21 11:49:36 -06:00
  • 9840a18b5a Merge pull request #4975 from Citadel-Station-13/upstream-merge-34654 LetterJay 2018-01-21 11:49:13 -06:00
  • 7a43017325 Merge pull request #4974 from Citadel-Station-13/upstream-merge-34656 LetterJay 2018-01-21 11:48:56 -06:00
  • e3df465eba Merge branch 'master' into upstream-merge-34667 LetterJay 2018-01-21 11:48:51 -06:00
  • 5e7710ee64 Automatic changelog generation for PR #4954 [ci skip] CitadelStationBot 2018-01-21 11:48:09 -06:00