shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • ee47d17a7e Automatic changelog generation for PR #1018 [ci skip] CitadelStationBot 2017-05-17 07:13:00 -05:00
  • 335c031ca5 Merge pull request #1018 from Citadel-Station-13/hat_fix LetterJay 2017-05-17 08:12:59 -04:00
  • 0a903340a5 Merge pull request #795 from Citadel-Station-13/upstream-merge-26974 LetterJay 2017-05-17 06:22:46 -04:00
  • 242bff4288 Prepends object names with 'The' in speech CitadelStationBot 2017-05-17 05:13:47 -05:00
  • 1948b007d1 fix roundstart/rej cleanup LetterJay 2017-05-17 05:08:51 -05:00
  • 932f323e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26974 LetterJay 2017-05-17 05:06:23 -05:00
  • bf3b6702c3 Stops people from beating a dead horse (revenant) CitadelStationBot 2017-05-17 05:03:31 -05:00
  • 013101bd48 Fixes spelling on the EM Pulse action CitadelStationBot 2017-05-17 05:01:25 -05:00
  • 5ea3d5c28d Automatic changelog generation for PR #780 [ci skip] CitadelStationBot 2017-05-17 04:44:09 -05:00
  • 63a4d0bfec Merge pull request #780 from Citadel-Station-13/upstream-merge-26776 LetterJay 2017-05-17 05:44:08 -04:00
  • 2d66148b44 Update holocall.dm LetterJay 2017-05-17 04:30:52 -05:00
  • 1ee7686a5b Update holocall.dm LetterJay 2017-05-17 04:26:16 -05:00
  • bdbedd33f4 Merge branch 'master' into upstream-merge-26776 LetterJay 2017-05-17 05:14:18 -04:00
  • e121ad79c9 commit LetterJay 2017-05-17 04:03:54 -05:00
  • ff21afdcbd Merge pull request #744 from Citadel-Station-13/upstream-merge-26828 LetterJay 2017-05-17 04:50:52 -04:00
  • f978e3d56e rej cleanup LetterJay 2017-05-17 03:50:34 -05:00
  • 3516852582 Automatic changelog generation for PR #734 [ci skip] CitadelStationBot 2017-05-17 03:49:14 -05:00
  • fe62f7b737 Merge pull request #734 from Citadel-Station-13/upstream-merge-26780 LetterJay 2017-05-17 04:49:13 -04:00
  • a3cc3087b3 warrghhlbrarrggll LetterJay 2017-05-16 23:55:38 -05:00
  • e03b4b7905 ooga booga lizard LetterJay 2017-05-16 23:46:37 -05:00
  • 46f5c4bb1b commit LetterJay 2017-05-16 23:35:54 -05:00
  • b4fea71c4c Merge pull request #1006 from Citadel-Station-13/CultFixes LetterJay 2017-05-17 00:09:45 -04:00
  • 133a032ed2 adds the correct dmi for the hunter hats directional facings. LetterJay 2017-05-16 23:08:23 -05:00
  • 45c283a935 applies the previous fixes for cult on a closed PR LetterJay 2017-05-16 22:59:41 -05:00
  • be1702ff0d Revert "CultFix" LetterJay 2017-05-16 22:49:23 -05:00
  • f3e8cd3e2d CultFix LetterJay 2017-05-16 21:36:07 -05:00
  • d557c03ca2 fix kevinz000 2017-05-16 17:09:39 -07:00
  • 7b41f8cd55 merge LetterJay 2017-05-16 16:22:57 -05:00
  • 2d7c5cdbd7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26991 LetterJay 2017-05-16 16:22:12 -05:00
  • de10ad3ad2 Automatic changelog generation for PR #807 [ci skip] CitadelStationBot 2017-05-16 16:13:31 -05:00
  • 4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 LetterJay 2017-05-16 17:13:30 -04:00
  • eac970c1f1 aids LetterJay 2017-05-16 16:00:28 -05:00
  • f71a918ac8 screen rem LetterJay 2017-05-16 15:53:44 -05:00
  • 9ff038ed8f rem LetterJay 2017-05-16 15:53:15 -05:00
  • ddee13467a fuck icons LetterJay 2017-05-16 15:52:22 -05:00
  • beb89985be icons LetterJay 2017-05-16 15:46:40 -05:00
  • 3ba7433371 Delete screen_alert.dmi LetterJay 2017-05-16 15:44:23 -05:00
  • 296ae25734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-05-16 15:27:46 -05:00
  • 42d354f9c8 cryo pod icon fix LetterJay 2017-05-16 15:27:30 -05:00
  • 61fd162ca8 Merge pull request #982 from Citadel-Station-13/upstream-merge-27298 LetterJay 2017-05-15 20:12:17 -04:00
  • f52625b18c Refactors supply talismans to be less shitcode CitadelStationBot 2017-05-15 17:54:16 -05:00
  • 1f66249428 Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband CitadelStationBot 2017-05-15 17:04:23 -05:00
  • 59b609c79d Reverts favoring empty positions CitadelStationBot 2017-05-15 10:36:56 -05:00
  • 9f63a77cb8 [Box] Area Power Fixes CitadelStationBot 2017-05-15 07:00:57 -05:00
  • db47433f40 Fixes Graviton Typo CitadelStationBot 2017-05-14 23:51:13 -05:00
  • 99297bb544 Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items kevinz000 2017-05-14 20:54:47 -07:00
  • 56ccce82c8 Automatic changelog generation for PR #913 [ci skip] CitadelStationBot 2017-05-14 22:36:23 -05:00
  • fc628bcb89 adds the holoparasite box, and adds it to traitor uplinks (#913) cebutris 2017-05-14 23:36:22 -04:00
  • c4901a4e7b Automatic changelog generation for PR #962 [ci skip] CitadelStationBot 2017-05-14 22:34:17 -05:00
  • 176c2003f9 [MIRROR] Enable Ambrosia Gaia, attempt balance (#962) CitadelStationBot 2017-05-14 22:34:15 -05:00
  • 148666efed Disables Gaia mutation (#928) CitadelStationBot 2017-05-14 22:30:29 -05:00
  • 3644e9585e Cerestation Tweaks MKV (#683) CitadelStationBot 2017-05-14 22:25:28 -05:00
  • 040ac1236d [MIRROR] woops i forgot to check tick cannons fill proc. (#968) CitadelStationBot 2017-05-14 22:23:39 -05:00
  • da615b1440 h kevinz000 2017-05-14 20:19:26 -07:00
  • 41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935) CitadelStationBot 2017-05-14 22:18:02 -05:00
  • b95d4e0459 [MIRROR] Land Claim Flag (#951) CitadelStationBot 2017-05-14 22:16:17 -05:00
  • 0c1ed5bf33 [MIRROR] LITERALLY CHANGES C4 PLANT TIME TO 3 SECONDS FROM 5 FOR THE 3RD TIME THIS WEEK (#932) CitadelStationBot 2017-05-14 22:13:29 -05:00
  • 4041df2b45 Automatic changelog generation for PR #973 [ci skip] CitadelStationBot 2017-05-14 22:12:01 -05:00
  • 226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) CitadelStationBot 2017-05-14 22:12:00 -05:00
  • 45a81d32a4 Adds round ID to MC panel (#846) CitadelStationBot 2017-05-14 22:10:22 -05:00
  • d0aec14afb Automatic changelog generation for PR #969 [ci skip] CitadelStationBot 2017-05-14 22:07:21 -05:00
  • b7adb8cd93 SMES units now accept charge even if the available input is less than the input rate. (#969) CitadelStationBot 2017-05-14 22:07:20 -05:00
  • fde364e82f The punisher! (#967) CitadelStationBot 2017-05-14 22:06:13 -05:00
  • e7c41603f0 new and improved kevinz000 2017-05-14 19:22:52 -07:00
  • 3b0b19f6b6 Fixes role polls CitadelStationBot 2017-05-14 19:42:51 -05:00
  • 230b2e6fc8 Fixes the ore redemption machine's sheet amount upgrade CitadelStationBot 2017-05-14 18:43:32 -05:00
  • 2c6cc491da right kevinz000 2017-05-14 14:15:38 -07:00
  • d15b0b9606 stuff kevinz000 2017-05-14 14:00:51 -07:00
  • 6c4a355379 Merge pull request #850 from Citadel-Station-13/upstream-merge-26980 LetterJay 2017-05-14 16:40:30 -04:00
  • 2cf744d69b Automatic changelog generation for PR #854 [ci skip] CitadelStationBot 2017-05-14 15:39:29 -05:00
  • 96e128ecb7 Merge pull request #854 from Citadel-Station-13/upstream-merge-27036 LetterJay 2017-05-14 16:39:28 -04:00
  • 7748c04f60 Merge pull request #871 from Citadel-Station-13/upstream-merge-27073 LetterJay 2017-05-14 16:38:49 -04:00
  • c05c7334a5 Merge pull request #923 from Citadel-Station-13/upstream-merge-27151 LetterJay 2017-05-14 16:36:49 -04:00
  • 051de8da99 Merge pull request #936 from Citadel-Station-13/upstream-merge-27184 LetterJay 2017-05-14 16:33:00 -04:00
  • ebd23c3adf Automatic changelog generation for PR #931 [ci skip] CitadelStationBot 2017-05-14 15:32:41 -05:00
  • bf26c247e0 Merge pull request #931 from Citadel-Station-13/upstream-merge-27167 LetterJay 2017-05-14 16:32:40 -04:00
  • e7040e57a9 Automatic changelog generation for PR #937 [ci skip] CitadelStationBot 2017-05-14 15:30:52 -05:00
  • 6718ea096d Merge pull request #937 from Citadel-Station-13/upstream-merge-27148 LetterJay 2017-05-14 16:30:51 -04:00
  • d3140e3251 Automatic changelog generation for PR #938 [ci skip] CitadelStationBot 2017-05-14 15:30:37 -05:00
  • e681a4b25f Merge pull request #938 from Citadel-Station-13/upstream-merge-27169 LetterJay 2017-05-14 16:30:36 -04:00
  • 191e549ae2 Automatic changelog generation for PR #940 [ci skip] CitadelStationBot 2017-05-14 15:30:17 -05:00
  • 8cce0f181a Merge pull request #940 from Citadel-Station-13/upstream-merge-27168 LetterJay 2017-05-14 16:30:16 -04:00
  • 42bb7a5ccd Merge pull request #941 from Citadel-Station-13/upstream-merge-27166 LetterJay 2017-05-14 16:29:59 -04:00
  • c329a74c4b Merge pull request #942 from Citadel-Station-13/upstream-merge-27173 LetterJay 2017-05-14 16:29:44 -04:00
  • cd68a8c4bb Automatic changelog generation for PR #944 [ci skip] CitadelStationBot 2017-05-14 15:29:19 -05:00
  • 5bdeefb050 Merge pull request #944 from Citadel-Station-13/upstream-merge-27175 LetterJay 2017-05-14 16:29:18 -04:00
  • 505a6c7124 Merge pull request #945 from Citadel-Station-13/upstream-merge-27180 LetterJay 2017-05-14 16:29:01 -04:00
  • 4d8972bfe0 Merge pull request #946 from Citadel-Station-13/upstream-merge-27181 LetterJay 2017-05-14 16:28:41 -04:00
  • ffbf47041d Merge pull request #949 from Citadel-Station-13/upstream-merge-27149 LetterJay 2017-05-14 16:28:19 -04:00
  • 1c422705d0 Merge pull request #950 from Citadel-Station-13/upstream-merge-27190 LetterJay 2017-05-14 16:28:05 -04:00
  • f838bb36ac Merge pull request #953 from Citadel-Station-13/upstream-merge-27203 LetterJay 2017-05-14 16:27:39 -04:00
  • e62ec09f50 Automatic changelog generation for PR #954 [ci skip] CitadelStationBot 2017-05-14 15:27:26 -05:00
  • d64e569d6c Merge pull request #954 from Citadel-Station-13/upstream-merge-27199 LetterJay 2017-05-14 16:27:25 -04:00
  • 6ab7cfe9b9 Merge pull request #957 from Citadel-Station-13/upstream-merge-27215 LetterJay 2017-05-14 16:27:08 -04:00
  • d307da185a Merge pull request #956 from Citadel-Station-13/upstream-merge-27197 LetterJay 2017-05-14 16:26:45 -04:00
  • a3d83323d5 Automatic changelog generation for PR #958 [ci skip] CitadelStationBot 2017-05-14 15:26:05 -05:00
  • cf1d9228f9 Merge pull request #958 from Citadel-Station-13/upstream-merge-27200 LetterJay 2017-05-14 16:26:04 -04:00
  • 9e94109c29 Merge pull request #959 from Citadel-Station-13/upstream-merge-27208 LetterJay 2017-05-14 16:25:44 -04:00
  • 54df11503f Merge pull request #960 from Citadel-Station-13/upstream-merge-27213 LetterJay 2017-05-14 16:25:16 -04:00
  • ddd139aea5 Automatic changelog generation for PR #963 [ci skip] CitadelStationBot 2017-05-14 15:24:14 -05:00