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

Commit Graph

  • 1c9a15f74d Update emergency.dm LetterJay 2017-06-29 05:07:12 -05:00
  • 988bd998a9 Automatic changelog generation for PR #1810 [ci skip] CitadelStationBot 2017-06-29 04:47:21 -05:00
  • 5965f220c0 Merge pull request #1810 from Citadel-Station-13/upstream-merge-28635 LetterJay 2017-06-29 04:47:17 -05:00
  • 8cd84f7496 Update emergency.dm LetterJay 2017-06-29 04:44:26 -05:00
  • 447a81bcad Update tgui.js LetterJay 2017-06-29 04:37:52 -05:00
  • 82f33ca772 Update sm_monitor.dm LetterJay 2017-06-29 04:35:35 -05:00
  • fbb0378072 Updates blender descriptions (#1660) CitadelStationBot 2017-06-29 00:14:40 -05:00
  • 98ff55f786 Adds heartbeats CitadelStationBot 2017-06-28 14:01:39 -05:00
  • c5aa34c8e9 Merge pull request #1811 from Citadel-Station-13/upstream-merge-28847 LetterJay 2017-06-28 13:59:43 -05:00
  • 5c9f09dc07 Merge pull request #1807 from Citadel-Station-13/upstream-merge-28868 LetterJay 2017-06-28 13:58:07 -05:00
  • 28a4a7f661 Merge pull request #1806 from Citadel-Station-13/upstream-merge-28866 LetterJay 2017-06-28 13:57:47 -05:00
  • a620ef5ad3 Adds auto labelling of changes to the SQL, icons, and sounds trees. Also autolabels reverts CitadelStationBot 2017-06-28 12:08:30 -05:00
  • d1a77ef774 Ports bay's supermatter monitor modular program CitadelStationBot 2017-06-28 10:05:53 -05:00
  • 1e7c986ab5 Fixes emergency shuttle endgame state CitadelStationBot 2017-06-28 08:31:55 -05:00
  • bdc234ea4b Fixes lings losing organs on humanization CitadelStationBot 2017-06-28 08:31:51 -05:00
  • bae20af5ff makes virology window larger CitadelStationBot 2017-06-28 08:28:44 -05:00
  • d2ff4f2374 Cogscarabs will now visually flip over when stunned (#1535) CitadelStationBot 2017-06-28 04:09:05 -05:00
  • b6829d12b1 Automatic changelog generation for PR #1609 [ci skip] CitadelStationBot 2017-06-28 04:07:44 -05:00
  • c7d4809579 Reduces default brig times to be consistent with suggested policy. (#1609) CitadelStationBot 2017-06-28 04:07:43 -05:00
  • c06dd78ee0 Automatic changelog generation for PR #1681 [ci skip] CitadelStationBot 2017-06-28 04:01:36 -05:00
  • ec253c4e28 [MIRROR] cryotube pod improvements (#1681) CitadelStationBot 2017-06-28 04:01:35 -05:00
  • 237691f6fd [MIRROR] Fixes problems that were in the original PR (#1419) CitadelStationBot 2017-06-28 03:02:50 -05:00
  • 32f904356d [MIRROR] Removes check_tick from ORM ui_data (#1415) CitadelStationBot 2017-06-28 02:28:00 -05:00
  • c975135425 Automatic changelog generation for PR #1414 [ci skip] CitadelStationBot 2017-06-28 02:24:57 -05:00
  • 65736b7e23 [MIRROR] Ports the Ore Redemption Machine to TGUI (#1414) CitadelStationBot 2017-06-28 02:24:55 -05:00
  • 789064a3a5 Clean up .rej files Poojawa 2017-06-28 02:24:03 -05:00
  • a7c18e65bc [MIRROR] fix .html files being invalid types (#1413) CitadelStationBot 2017-06-28 01:43:48 -05:00
  • 92da94ca2a [MIRROR] Fixes mapmerge (#1296) CitadelStationBot 2017-06-28 01:43:26 -05:00
  • f3ec10704c Automatic changelog generation for PR #1714 [ci skip] CitadelStationBot 2017-06-27 22:59:33 -05:00
  • 196db74cbe Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588 LetterJay 2017-06-27 22:59:32 -05:00
  • da68472e07 Automatic changelog generation for PR #1798 [ci skip] CitadelStationBot 2017-06-27 22:53:41 -05:00
  • 7f250e742a Merge pull request #1798 from Citadel-Station-13/upstream-merge-28856 LetterJay 2017-06-27 22:53:40 -05:00
  • 79da431a44 Automatic changelog generation for PR #1770 [ci skip] CitadelStationBot 2017-06-27 21:25:51 -05:00
  • e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 LetterJay 2017-06-27 21:25:50 -05:00
  • ed4aa5a01a Straight jackets can now properly be put onto others CitadelStationBot 2017-06-27 15:34:06 -05:00
  • 10909c9dee Update oldstation.dmm LetterJay 2017-06-27 12:21:49 -05:00
  • 00925de5f3 Update energy_gun.dm LetterJay 2017-06-27 12:20:39 -05:00
  • 3f3f86e81a Merge pull request #1794 from Citadel-Station-13/upstream-merge-28853 LetterJay 2017-06-27 09:33:15 -05:00
  • d375e24818 Automatic changelog generation for PR #1793 [ci skip] CitadelStationBot 2017-06-27 09:32:43 -05:00
  • 5db1b0c06d Merge pull request #1793 from Citadel-Station-13/upstream-merge-28841 LetterJay 2017-06-27 09:32:41 -05:00
  • 6a38955803 Adds container types INJECTABLE and DRAWABLE CitadelStationBot 2017-06-27 08:19:49 -05:00
  • 360209314d Some fixes for the anomalous crystal CitadelStationBot 2017-06-27 08:13:38 -05:00
  • 56f9c0f82a Merge pull request #1756 from Citadel-Station-13/upstream-merge-28681 LetterJay 2017-06-27 08:05:25 -05:00
  • bb916b6040 Merge branch 'master' into upstream-merge-28681 LetterJay 2017-06-27 06:16:34 -05:00
  • 83fead2492 Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567 LetterJay 2017-06-27 06:14:42 -05:00
  • f85de2ddd5 Update PDA_types.dm LetterJay 2017-06-27 05:58:34 -05:00
  • 2158ea1e67 Merge branch 'master' into upstream-merge-28681 LetterJay 2017-06-27 05:14:45 -05:00
  • 8875fbefc5 Delete cart.dm.rej LetterJay 2017-06-27 05:12:25 -05:00
  • 9d6dec8975 Update cart.dm LetterJay 2017-06-27 05:12:05 -05:00
  • 163bcf0189 Delete PDA.dm.rej LetterJay 2017-06-27 05:11:20 -05:00
  • 926589fd58 Update PDA.dm LetterJay 2017-06-27 05:11:06 -05:00
  • 45b6931d9b Update computer.dm LetterJay 2017-06-27 00:28:52 -05:00
  • 07599125ef Automatic changelog generation for PR #1790 [ci skip] CitadelStationBot 2017-06-27 00:27:48 -05:00
  • 95a77e9dc1 Merge pull request #1790 from Citadel-Station-13/upstream-merge-28831 LetterJay 2017-06-27 00:27:47 -05:00
  • 3d1b8be7ce Automatic changelog generation for PR #1728 [ci skip] CitadelStationBot 2017-06-26 23:37:03 -05:00
  • fdf216bf48 Merge pull request #1728 from Citadel-Station-13/upstream-merge-28645 LetterJay 2017-06-26 23:37:01 -05:00
  • b79fdf0839 Delete tgstation.dme.rej LetterJay 2017-06-26 23:21:33 -05:00
  • ccf4306224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-06-26 23:19:54 -05:00
  • e2ccf1f52f rej cleanup LetterJay 2017-06-26 23:19:17 -05:00
  • 039dcb464f Delete tgui.js.rej LetterJay 2017-06-26 23:18:08 -05:00
  • b44d1d721b Update tgui.js LetterJay 2017-06-26 23:15:48 -05:00
  • 8022bc9046 Merge pull request #1792 from Citadel-Station-13/upstream-merge-28752 LetterJay 2017-06-26 23:04:19 -05:00
  • d99ccf36a2 Replaces old midi2piano with a new version CitadelStationBot 2017-06-26 22:06:15 -05:00
  • d97bb2d85d Fix modular consoles CitadelStationBot 2017-06-26 22:02:01 -05:00
  • bd0f0c794b Merge pull request #1789 from Citadel-Station-13/upstream-merge-28822 LetterJay 2017-06-26 21:17:17 -05:00
  • 89b2b47a83 Merge pull request #1788 from Citadel-Station-13/upstream-merge-28821 LetterJay 2017-06-26 21:17:05 -05:00
  • 0f23003c2f Fixes the Hierophant's walls runtiming CitadelStationBot 2017-06-26 15:59:25 -05:00
  • abeac9d2ae Fixes PAIs deleting their card on death CitadelStationBot 2017-06-26 15:55:15 -05:00
  • ba2e896d8c Merge pull request #1719 from Citadel-Station-13/upstream-merge-28636 LetterJay 2017-06-26 10:53:07 -05:00
  • 2434b27582 Automatic changelog generation for PR #1744 [ci skip] CitadelStationBot 2017-06-26 10:52:23 -05:00
  • 914434891a Merge pull request #1744 from Citadel-Station-13/upstream-merge-28685 LetterJay 2017-06-26 10:52:21 -05:00
  • 718aa79f50 Automatic changelog generation for PR #1768 [ci skip] CitadelStationBot 2017-06-26 10:51:53 -05:00
  • 090b8b5055 Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740 LetterJay 2017-06-26 10:51:51 -05:00
  • edcadfe83e Merge pull request #1787 from Citadel-Station-13/upstream-merge-28765 LetterJay 2017-06-26 10:10:34 -05:00
  • a076b8c54d Merge pull request #1786 from Citadel-Station-13/upstream-merge-28814 LetterJay 2017-06-26 10:10:17 -05:00
  • 9803f24547 Merge pull request #1785 from Citadel-Station-13/upstream-merge-28760 LetterJay 2017-06-26 10:10:00 -05:00
  • 89fc77521e Merge pull request #1784 from Citadel-Station-13/upstream-merge-28770 LetterJay 2017-06-26 10:09:34 -05:00
  • 90c1542e4b Automatic changelog generation for PR #1783 [ci skip] CitadelStationBot 2017-06-26 10:09:18 -05:00
  • 28cd2d6164 Merge pull request #1783 from Citadel-Station-13/upstream-merge-28644 LetterJay 2017-06-26 10:09:16 -05:00
  • b16aa00517 Small jungle trees CitadelStationBot 2017-06-26 09:42:52 -05:00
  • 10f3b3db50 Fixes the AI core being flammable CitadelStationBot 2017-06-26 09:38:44 -05:00
  • ac33b9defb Adds some neat tiles and walls for use on lavaland CitadelStationBot 2017-06-26 09:19:17 -05:00
  • 06e536de4f Fixes piggybacking giving person on top projectile density instead of the person on the bottom. CitadelStationBot 2017-06-26 09:01:53 -05:00
  • 028752c3de Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564 LetterJay 2017-06-26 09:00:54 -05:00
  • 5cf2065432 Ninja Dash CitadelStationBot 2017-06-26 08:57:46 -05:00
  • 165e684e9b Update shuttle.dm LetterJay 2017-06-26 08:01:38 -05:00
  • 61a8d76122 Update shuttle.dm LetterJay 2017-06-26 06:36:09 -05:00
  • 7d7078e7a6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-06-26 06:32:33 -05:00
  • a4526e8c39 cerestation.dmm LetterJay 2017-06-26 06:32:22 -05:00
  • 37aba60771 Automatic changelog generation for PR #1772 [ci skip] CitadelStationBot 2017-06-26 06:28:23 -05:00
  • 46c3108267 Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749 LetterJay 2017-06-26 06:28:22 -05:00
  • f4172fe029 Automatic changelog generation for PR #1778 [ci skip] CitadelStationBot 2017-06-26 06:26:47 -05:00
  • d3c2f5aee6 Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766 LetterJay 2017-06-26 06:26:46 -05:00
  • ec966f6814 Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750 LetterJay 2017-06-26 06:26:11 -05:00
  • e3b1838e63 Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600 LetterJay 2017-06-26 06:24:31 -05:00
  • 2552a1715f Automatic changelog generation for PR #1649 [ci skip] CitadelStationBot 2017-06-26 06:23:26 -05:00
  • 260ee23be8 Merge pull request #1649 from Citadel-Station-13/upstream-merge-28490 LetterJay 2017-06-26 06:23:25 -05:00
  • 46810f982f Automatic changelog generation for PR #1695 [ci skip] CitadelStationBot 2017-06-26 06:21:51 -05:00
  • 77295c30d4 Merge pull request #1695 from Citadel-Station-13/upstream-merge-28599 LetterJay 2017-06-26 06:21:50 -05:00
  • 75339a25c4 Merge pull request #1781 from Citadel-Station-13/upstream-merge-28782 LetterJay 2017-06-26 06:19:03 -05:00