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

Commit Graph

  • 335b6cde56 Merge branch 'master' into upstream-merge-26813 kevinz000 2017-05-07 22:31:16 -07:00
  • a87cee8a05 copy-paste-this-from-tg kevinz000 2017-05-07 22:30:06 -07:00
  • 68f7ea7fd0 handled rejects kevinz000 2017-05-07 22:30:28 -07:00
  • 2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 kevinz000 2017-05-07 22:28:00 -07:00
  • 066c8e8de8 Merge pull request #720 from Citadel-Station-13/upstream-merge-26822 kevinz000 2017-05-07 22:27:05 -07:00
  • 48d9e2e349 fixes rejects kevinz000 2017-05-07 22:24:26 -07:00
  • 5d2f131d07 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822 kevinz000 2017-05-07 22:22:24 -07:00
  • 67742f6f8d Automatic changelog generation for PR #829 [ci skip] CitadelStationBot 2017-05-07 21:39:25 -05:00
  • 30934570b8 Merge pull request #829 from Citadel-Station-13/upstream-merge-26988 kevinz000 2017-05-07 19:39:24 -07:00
  • 023ee52e52 Automatic changelog generation for PR #676 [ci skip] CitadelStationBot 2017-05-07 21:37:36 -05:00
  • 13b0ae2b45 Merge pull request #676 from Citadel-Station-13/upstream-merge-26725 kevinz000 2017-05-07 19:37:35 -07:00
  • 03a52b2bc9 Merge pull request #836 from Citadel-Station-13/upstream-merge-26984 kevinz000 2017-05-07 19:21:56 -07:00
  • e3f123d5bb Merge pull request #821 from Citadel-Station-13/upstream-merge-26970 kevinz000 2017-05-07 19:19:44 -07:00
  • 68e1087825 Merge pull request #823 from Citadel-Station-13/upstream-merge-26959 kevinz000 2017-05-07 19:17:10 -07:00
  • 6c293e3e3d Merge pull request #716 from Citadel-Station-13/upstream-merge-26768 kevinz000 2017-05-07 19:15:02 -07:00
  • eb9caea261 Merge pull request #658 from Citadel-Station-13/upstream-merge-26670 kevinz000 2017-05-07 19:14:06 -07:00
  • 2f55a67b7a Delete packs.dm.rej kevinz000 2017-05-07 19:13:39 -07:00
  • 18abfb70c9 Update packs.dm kevinz000 2017-05-07 19:13:29 -07:00
  • 2a8acb13d2 Merge pull request #840 from Citadel-Station-13/upstream-merge-26966 kevinz000 2017-05-07 19:07:59 -07:00
  • 09dbd467bb Merge pull request #820 from Citadel-Station-13/upstream-merge-26976 kevinz000 2017-05-07 19:07:41 -07:00
  • c91aa2e66e Automatic changelog generation for PR #841 [ci skip] CitadelStationBot 2017-05-07 21:06:31 -05:00
  • cab4c53f06 Merge pull request #841 from Citadel-Station-13/upstream-merge-26940 kevinz000 2017-05-07 19:06:30 -07:00
  • 3e593c4f7d Automatic changelog generation for PR #824 [ci skip] CitadelStationBot 2017-05-07 21:05:51 -05:00
  • cb77797bd5 Merge pull request #824 from Citadel-Station-13/upstream-merge-26290 kevinz000 2017-05-07 19:05:50 -07:00
  • bdbc1ecb5c no admins txt changing kevinz000 2017-05-07 19:05:19 -07:00
  • 47c0304a4b Corrects get id query to ckey CitadelStationBot 2017-05-07 19:40:58 -05:00
  • be3a06e801 Merge pull request #843 from Citadel-Station-13/revert-767-upstream-merge-26876 LetterJay 2017-05-07 19:49:47 -04:00
  • 2efe90055f Revert "[MIRROR] Fixes say verbs not working" LetterJay 2017-05-07 19:41:33 -04:00
  • 61a7897962 Plastic sheet production - Chemistry recipe CitadelStationBot 2017-05-07 18:23:05 -05:00
  • 884338d048 Fixes being able to stand on chasms CitadelStationBot 2017-05-07 18:06:44 -05:00
  • db468a1dd6 Adds several weapons and cost adjustments to Gangtool CitadelStationBot 2017-05-07 18:00:26 -05:00
  • e3b3921bf2 Fixes clockwork obelisk logic CitadelStationBot 2017-05-07 17:15:22 -05:00
  • 6d2b02dabd Allows Mediborg organ storage to hold inorganic bodyparts CitadelStationBot 2017-05-07 17:14:17 -05:00
  • 181eee013e [READY]DATUM VERBS AND TOP MENUS! CitadelStationBot 2017-05-07 17:07:59 -05:00
  • 53d43227ab Fixes this annoying ass thing in the bandb I should have fixed before. CitadelStationBot 2017-05-07 17:05:44 -05:00
  • a69b9c1b18 Corrects Baseturfs from Lava to Space CitadelStationBot 2017-05-07 17:01:36 -05:00
  • dc7dbc5ec9 Automatic changelog generation for PR #827 [ci skip] CitadelStationBot 2017-05-07 15:41:33 -05:00
  • 75ca44a767 Merge pull request #827 from LetterJay/snap LetterJay 2017-05-07 15:41:32 -05:00
  • 482ac95873 Merge pull request #822 from Citadel-Station-13/upstream-merge-26987 kevinz000 2017-05-07 13:07:14 -07:00
  • 92f8a8b1b0 Automatic changelog generation for PR #825 [ci skip] CitadelStationBot 2017-05-07 14:59:11 -05:00
  • 78d64cbeed Merge pull request #825 from Citadel-Station-13/upstream-merge-26941 kevinz000 2017-05-07 12:59:10 -07:00
  • 0d0cebb1fd Merge pull request #826 from Citadel-Station-13/upstream-merge-26938 kevinz000 2017-05-07 12:58:57 -07:00
  • 659139ca1c finger snap emote LetterJay 2017-05-07 12:41:45 -05:00
  • 1410fbc19c Merge branch 'master' of https://github.com/LetterJay/Citadel-Station-13 LetterJay 2017-05-07 11:52:25 -05:00
  • 1a5050692b Fixes his grace CtrlClick CitadelStationBot 2017-05-07 11:33:55 -05:00
  • b0cceb8766 C4 planting takes 3 seconds, down from 5 CitadelStationBot 2017-05-07 09:31:51 -05:00
  • cd95e42b69 Merge pull request #753 from Citadel-Station-13/upstream-merge-26870 kevinz000 2017-05-07 07:08:06 -07:00
  • d8d49803b7 Add watertank, shower, sink to mining station and gulag CitadelStationBot 2017-05-07 08:59:19 -05:00
  • 617bb4ed38 Mega arachnid CitadelStationBot 2017-05-07 08:55:11 -05:00
  • 281f382605 Sigils of Transgression are brighter CitadelStationBot 2017-05-07 08:54:06 -05:00
  • 27e7434320 Fixes an inconsistency with the Banana Honk drink CitadelStationBot 2017-05-07 08:54:02 -05:00
  • 164b830f23 Fixes away gateway CitadelStationBot 2017-05-07 08:52:57 -05:00
  • 086ea81785 Automatic changelog generation for PR #748 [ci skip] CitadelStationBot 2017-05-07 08:24:51 -05:00
  • d9908a74a7 Merge pull request #748 from Citadel-Station-13/upstream-merge-26808 kevinz000 2017-05-07 06:24:50 -07:00
  • ab8dfe3b6d Automatic changelog generation for PR #801 [ci skip] CitadelStationBot 2017-05-07 08:24:00 -05:00
  • cc25c18196 Merge pull request #801 from Citadel-Station-13/upstream-merge-26921 kevinz000 2017-05-07 06:23:59 -07:00
  • bbdcff81bb Cultists of Nar-sie have their own language CitadelStationBot 2017-05-07 06:07:21 -05:00
  • 4a6b49d6a9 Merge pull request #752 from Citadel-Station-13/upstream-merge-26864 kevinz000 2017-05-06 22:10:17 -07:00
  • 2f2c850937 Delete scripture_applications.dm.rej kevinz000 2017-05-06 22:09:58 -07:00
  • 61baae0544 Merge branch 'master' into upstream-merge-26864 kevinz000 2017-05-06 22:09:35 -07:00
  • c1a9bb5864 Update scripture_applications.dm kevinz000 2017-05-06 22:08:00 -07:00
  • 14fe4948e9 Merge pull request #652 from Citadel-Station-13/upstream-merge-26685 kevinz000 2017-05-06 22:03:08 -07:00
  • 52f5226547 Merge pull request #750 from Citadel-Station-13/upstream-merge-26851 kevinz000 2017-05-06 22:00:16 -07:00
  • 236c91a945 Merge pull request #755 from Citadel-Station-13/upstream-merge-26809 kevinz000 2017-05-06 21:59:40 -07:00
  • e528ec823c Merge pull request #751 from Citadel-Station-13/upstream-merge-26841 kevinz000 2017-05-06 21:45:38 -07:00
  • f7937b2f7e Automatic changelog generation for PR #756 [ci skip] CitadelStationBot 2017-05-06 23:43:09 -05:00
  • 035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848 kevinz000 2017-05-06 21:43:08 -07:00
  • 1c7fa59d6c Merge pull request #798 from Citadel-Station-13/upstream-merge-26910 kevinz000 2017-05-06 21:42:22 -07:00
  • 5ac3bb924f Merge pull request #799 from Citadel-Station-13/upstream-merge-26939 kevinz000 2017-05-06 21:41:56 -07:00
  • 83a506803a Merge pull request #695 from Citadel-Station-13/upstream-merge-24002 kevinz000 2017-05-06 21:36:41 -07:00
  • 7fa53c5ce4 Delete world.dm.rej kevinz000 2017-05-06 21:36:15 -07:00
  • 48f9fa62c9 Automatic changelog generation for PR #792 [ci skip] CitadelStationBot 2017-05-06 23:35:16 -05:00
  • 32a215ab5e Merge pull request #792 from Citadel-Station-13/upstream-merge-26917 kevinz000 2017-05-06 21:35:15 -07:00
  • 51442e4930 Merge pull request #802 from Citadel-Station-13/upstream-merge-26930 kevinz000 2017-05-06 21:34:07 -07:00
  • 286e492df8 Merge pull request #757 from Citadel-Station-13/upstream-merge-26846 kevinz000 2017-05-06 21:31:47 -07:00
  • c8dbcb8597 Merge pull request #754 from Citadel-Station-13/upstream-merge-26863 kevinz000 2017-05-06 21:30:12 -07:00
  • c93ac289ae Merge pull request #766 from Citadel-Station-13/upstream-merge-26850 kevinz000 2017-05-06 21:29:42 -07:00
  • 102b28b1c1 Delete deadsay.dm.rej kevinz000 2017-05-06 21:28:23 -07:00
  • 1168d06c9e Merge pull request #759 from Citadel-Station-13/upstream-merge-26849 kevinz000 2017-05-06 21:25:06 -07:00
  • fb0aa3597f Automatic changelog generation for PR #800 [ci skip] CitadelStationBot 2017-05-06 23:24:47 -05:00
  • a1cb1d456d Merge pull request #800 from Citadel-Station-13/upstream-merge-26934 kevinz000 2017-05-06 21:24:46 -07:00
  • 32d81b8624 Merge pull request #736 from Citadel-Station-13/upstream-merge-26803 kevinz000 2017-05-06 21:24:15 -07:00
  • f5aab140bf Automatic changelog generation for PR #760 [ci skip] CitadelStationBot 2017-05-06 23:23:47 -05:00
  • 0e718e32cc Merge pull request #760 from Citadel-Station-13/upstream-merge-26804 kevinz000 2017-05-06 21:23:46 -07:00
  • d31caa1870 Automatic changelog generation for PR #815 [ci skip] CitadelStationBot 2017-05-06 23:19:34 -05:00
  • e0139ce2ce Merge pull request #815 from Citadel-Station-13/upstream-merge-26960 kevinz000 2017-05-06 21:19:33 -07:00
  • 91955ccb05 Delete Sleeper.dm.rej kevinz000 2017-05-06 21:04:22 -07:00
  • 6880e7c373 Update Sleeper.dm kevinz000 2017-05-06 21:03:17 -07:00
  • b7621ff9fe Merge pull request #813 from Citadel-Station-13/upstream-merge-26937 kevinz000 2017-05-06 20:57:55 -07:00
  • db50cc8c94 Merge pull request #812 from Citadel-Station-13/upstream-merge-26949 kevinz000 2017-05-06 20:57:17 -07:00
  • fc7be7e32b Remove empty description tag from right-most tiles of Space Station 13 sign CitadelStationBot 2017-05-06 20:48:44 -05:00
  • bfe7441f9b Merge pull request #791 from Citadel-Station-13/upstream-merge-26867 kevinz000 2017-05-06 15:41:24 -07:00
  • 4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778 kevinz000 2017-05-06 15:26:10 -07:00
  • df204497cd Elevators CitadelStationBot 2017-05-06 16:29:50 -05:00
  • d43e64bcc3 Merge pull request #774 from Citadel-Station-13/upstream-merge-26805 kevinz000 2017-05-06 14:24:08 -07:00
  • 8e3b375bae Automatic changelog generation for PR #764 [ci skip] CitadelStationBot 2017-05-06 16:23:04 -05:00
  • e5249ff8d0 Merge pull request #764 from Citadel-Station-13/upstream-merge-26855 kevinz000 2017-05-06 14:23:03 -07:00
  • 9035100cf4 Automatic changelog generation for PR #809 [ci skip] CitadelStationBot 2017-05-06 16:22:09 -05:00
  • 329190d660 Merge pull request #809 from Citadel-Station-13/upstream-merge-26933 kevinz000 2017-05-06 14:22:08 -07:00
  • d7bdb49283 ORM fixes CitadelStationBot 2017-05-06 16:20:39 -05:00