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

Commit Graph

  • 64ced3f6f4 Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114 LetterJay 2017-10-01 16:56:24 -04:00
  • 1ecebee19d Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171 LetterJay 2017-10-01 16:55:54 -04:00
  • 16e47ee789 Automatic changelog generation for PR #3059 [ci skip] CitadelStationBot 2017-10-01 15:55:19 -05:00
  • 39741c4706 Merge pull request #3059 from Citadel-Station-13/upstream-merge-31082 LetterJay 2017-10-01 16:55:18 -04:00
  • e54e4c3cd9 Revert "Prompt for observer confirmation now happens when you click it initially" CitadelStationBot 2017-10-01 15:50:27 -05:00
  • e2dd424fb0 Revert "Prompt for observer confirmation now happens when you click it initially" oranges 2017-10-02 09:35:15 +13:00
  • 353739071f Update lib_items.dm LetterJay 2017-10-01 15:46:53 -05:00
  • 76d6402a9d Update windoor_assembly.dm LetterJay 2017-10-01 15:46:31 -05:00
  • 4a4ecdf211 Update transit_tube_construction.dm LetterJay 2017-10-01 15:46:20 -05:00
  • 0480bebc8b Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167 LetterJay 2017-10-01 16:38:27 -04:00
  • 1c00a8ba29 Update recycler.dm LetterJay 2017-10-01 15:38:09 -05:00
  • 0df550542d Automatic changelog generation for PR #3053 [ci skip] CitadelStationBot 2017-10-01 15:37:32 -05:00
  • 77bdebd020 Merge pull request #3053 from Citadel-Station-13/upstream-merge-31155 LetterJay 2017-10-01 16:37:31 -04:00
  • cef0d9ef68 Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165 LetterJay 2017-10-01 16:35:53 -04:00
  • f3ae038f6c Update cargo.dm LetterJay 2017-10-01 15:35:27 -05:00
  • 5b81614e87 Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200 LetterJay 2017-10-01 16:32:46 -04:00
  • 018300507a Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162 LetterJay 2017-10-01 16:32:24 -04:00
  • 0e50bc7884 Merge pull request #3049 from Citadel-Station-13/upstream-merge-31203 LetterJay 2017-10-01 16:32:12 -04:00
  • c8647565fc Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157 LetterJay 2017-10-01 16:32:00 -04:00
  • f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145 LetterJay 2017-10-01 16:31:44 -04:00
  • 1d3f476b2c Automatic changelog generation for PR #3042 [ci skip] CitadelStationBot 2017-10-01 15:30:41 -05:00
  • f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605 LetterJay 2017-10-01 16:30:40 -04:00
  • 3d2b5e99c9 Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143 LetterJay 2017-10-01 16:29:35 -04:00
  • 8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132 LetterJay 2017-10-01 16:29:13 -04:00
  • 2d8e3b301f Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128 LetterJay 2017-10-01 16:29:04 -04:00
  • 18fbfd7a2d Maplist is loaded regardless of maprotation config setting CitadelStationBot 2017-10-01 15:27:51 -05:00
  • 4d610b95bd Maplist is loaded regardless of maprotation config setting (#31172) Jordan Brown 2017-10-01 16:27:23 -04:00
  • 676abb946c Update halloween.dm LetterJay 2017-10-01 15:26:56 -05:00
  • f1f99fc26c Update electrical_storm.dm LetterJay 2017-10-01 15:26:32 -05:00
  • 00aa312610 Update carp_migration.dm LetterJay 2017-10-01 15:26:15 -05:00
  • 8531fa95b6 Edits to code/controllers/configuration/entries autotag Config Update CitadelStationBot 2017-10-01 15:25:40 -05:00
  • fef5c53791 Merge pull request #31173 from tgstation/Cyberboss-patch-3 oranges 2017-10-02 09:25:35 +13:00
  • 16f48d2df5 Ashwalker tendrils now drop everything on victims before consuming CitadelStationBot 2017-10-01 15:22:26 -05:00
  • 4274a875db Ashwalker tendrils now drop everything on victims before consuming (#31177) kevinz000 2017-10-01 13:21:23 -07:00
  • bdbe19014a Fixes viruses not calling Start on their symptoms when spreading CitadelStationBot 2017-10-01 15:22:19 -05:00
  • d274843958 Fixes viruses not calling Start on their symptoms when spreading XDTM 2017-09-30 21:11:06 +02:00
  • 1057b4b636 Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137 LetterJay 2017-10-01 16:21:08 -04:00
  • e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138 LetterJay 2017-10-01 16:20:56 -04:00
  • eeeae1b855 Fixes grown runtime spam oranges 2017-10-02 09:19:21 +13:00
  • cc1abcb6d2 Fixes space vision CitadelStationBot 2017-10-01 15:15:54 -05:00
  • d701230090 Merge pull request #31114 from AnturK/spacevision oranges 2017-10-02 09:15:24 +13:00
  • 82981339ed Adds desc to things lacking them. bawhoppen 2017-10-01 15:07:10 -05:00
  • 59f30049c4 Repairs and Intensifies Secret Satchels CitadelStationBot 2017-10-01 15:02:23 -05:00
  • 48212ee000 Merge pull request #31082 from Incoming5643/Satchel_Fix oranges 2017-10-02 09:01:49 +13:00
  • b2a01d688d Merge pull request #3044 from Citadel-Station-13/upstream-merge-31136 LetterJay 2017-10-01 15:56:43 -04:00
  • 6abc1b76d8 Automatic changelog generation for PR #3043 [ci skip] CitadelStationBot 2017-10-01 14:55:30 -05:00
  • e17455165c Merge pull request #3043 from Citadel-Station-13/upstream-merge-31144 LetterJay 2017-10-01 15:55:29 -04:00
  • 35f771c2d0 Automatic changelog generation for PR #3032 [ci skip] CitadelStationBot 2017-10-01 14:49:46 -05:00
  • 21302e3fdc Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141 LetterJay 2017-10-01 15:49:44 -04:00
  • e3810ef517 Merge branch 'master' into upstream-merge-31128 LetterJay 2017-10-01 15:46:15 -04:00
  • 6ca3deb8d1 Merge branch 'master' into upstream-merge-31129 LetterJay 2017-10-01 15:45:54 -04:00
  • 6bbc71656d Prompt for observer confirmation now happens when you click it initially CitadelStationBot 2017-10-01 14:43:52 -05:00
  • c56bb27bbd Merge pull request #31167 from tgstation/Cyberboss-patch-2 oranges 2017-10-02 08:43:24 +13:00
  • 6572781b63 Update forced_movement.dm LetterJay 2017-10-01 14:43:06 -05:00
  • 19abe58f05 Automatic changelog generation for PR #3033 [ci skip] CitadelStationBot 2017-10-01 14:42:37 -05:00
  • fafd98ed0e Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142 LetterJay 2017-10-01 15:42:35 -04:00
  • 9efb3505a0 Automatic changelog generation for PR #3031 [ci skip] CitadelStationBot 2017-10-01 14:42:14 -05:00
  • 40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117 LetterJay 2017-10-01 15:42:12 -04:00
  • e346321413 Merge pull request #3030 from Citadel-Station-13/upstream-merge-31116 LetterJay 2017-10-01 15:28:16 -04:00
  • 5ec781502c Merge branch 'master' into upstream-merge-31116 LetterJay 2017-10-01 15:09:10 -04:00
  • 4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069 LetterJay 2017-10-01 15:08:21 -04:00
  • bf2155ec21 Merge pull request #3018 from Citadel-Station-13/upstream-merge-31083 LetterJay 2017-10-01 15:08:10 -04:00
  • eb24540ba3 Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108 LetterJay 2017-10-01 15:07:43 -04:00
  • 698a2b4ac4 Lastest CitadelStationBot 2017-10-01 13:11:05 -05:00
  • d76eb00634 Update viral.dm kevinz000 2017-09-30 11:17:11 -07:00
  • 490885a36f update LetterJay 2017-10-01 13:02:52 -05:00
  • 69f354718c Update tgstation.dme LetterJay 2017-10-01 13:02:25 -05:00
  • c2ee5f7e23 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-10-01 12:22:41 -05:00
  • 3a83b28bae Adds the Cargo-Tech-of-the-Shift award Jordan Brown 2017-10-01 10:42:31 -04:00
  • f389d82722 Removes random junk from Metastation evidence closets CitadelStationBot 2017-10-01 09:27:55 -05:00
  • c6aec36f67 Merge pull request #31151 from Bawhoppen/122123 Jordan Brown 2017-10-01 10:27:10 -04:00
  • 8636b0a942 Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too kevinz000 2017-10-01 07:25:45 -07:00
  • 5bd37f17a1 Fixes station name in cargo stock displays CitadelStationBot 2017-10-01 09:26:37 -05:00
  • e79cd3369f Fixes station name in cargo stock displays (#31155) vuonojenmustaturska 2017-10-01 17:26:11 +03:00
  • fa75534e7d fixes delete hotkey triggering messages when the user isn't even a living mob CitadelStationBot 2017-10-01 09:25:28 -05:00
  • 40bcb74a56 Fixes delete hotkey triggering messages when the user isn't even a living mob (#31165) kevinz000 2017-10-01 07:25:25 -07:00
  • d1c99d23d0 Fixes warning spam CitadelStationBot 2017-10-01 08:43:36 -05:00
  • 9082c8d241 Merge pull request #31200 from AnturK/pleasestop Jordan Brown 2017-10-01 09:43:05 -04:00
  • ec46b492d3 Fixes plasma cutters only hitting one tile CitadelStationBot 2017-10-01 08:42:26 -05:00
  • b13f2012fb Update closed.dm kevinz000 2017-09-30 07:34:51 -07:00
  • 055b0e5584 Fixes paper writing CitadelStationBot 2017-10-01 08:41:16 -05:00
  • c4dd7ffdbd Fixes paper writing (#31203) AnturK 2017-10-01 15:41:14 +02:00
  • 004700de62 Fixes events with sleeps. CitadelStationBot 2017-10-01 07:34:02 -05:00
  • cae3dd615d Fixes events with sleeps. AnturK 2017-09-30 15:47:33 +02:00
  • 6e8f56edfd Fixes aliums being able to attack the SM crystal CitadelStationBot 2017-10-01 05:04:30 -05:00
  • 770a0a1154 Fixes aliums being able to attack the SM crystal ShizCalev 2017-09-30 01:07:23 -04:00
  • 9f05ef16df Merge branch 'master' into upstream-merge-31108 LetterJay 2017-10-01 04:31:36 -04:00
  • 58ff06a44b Merge pull request #3005 from Citadel-Station-13/upstream-merge-31000 LetterJay 2017-10-01 04:30:34 -04:00
  • 926db45b54 Update world.dm LetterJay 2017-10-01 03:06:11 -05:00
  • 80a84db919 Update adminhelp.dm LetterJay 2017-10-01 02:39:24 -05:00
  • ef10ac589a Update getrev.dm LetterJay 2017-10-01 02:39:07 -05:00
  • 346ec9a0bf Update README.md LetterJay 2017-10-01 02:38:14 -05:00
  • 0ab234ceb0 Merge branch 'master' into upstream-merge-31000 LetterJay 2017-10-01 03:31:49 -04:00
  • 22b148f078 Merge pull request #3014 from Citadel-Station-13/upstream-merge-31140 LetterJay 2017-10-01 03:26:42 -04:00
  • 659a8d4053 Merge pull request #3002 from Citadel-Station-13/upstream-merge-31037 LetterJay 2017-10-01 03:26:26 -04:00
  • 37942a2279 Update hostile.dm LetterJay 2017-10-01 01:57:49 -05:00
  • 49c63dd794 Update randomverbs.dm LetterJay 2017-10-01 01:57:03 -05:00
  • f621fb704b Merge branch 'master' into upstream-merge-31069 LetterJay 2017-10-01 02:56:28 -04:00
  • 4be6f22669 Merge branch 'master' into upstream-merge-31108 LetterJay 2017-10-01 02:53:27 -04:00
  • 92c3a48507 Merge branch 'master' into upstream-merge-31140 LetterJay 2017-10-01 02:53:18 -04:00