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

Commit Graph

  • 7a4aad91cb Merge pull request #7171 from Citadel-Station-13/upstream-merge-38552 LetterJay 2018-06-18 22:00:13 -05:00
  • b7047f0489 Merge pull request #7170 from Citadel-Station-13/upstream-merge-38558 LetterJay 2018-06-18 22:00:00 -05:00
  • 507422de14 Automatic changelog generation for PR #7162 [ci skip] CitadelStationBot 2018-06-18 21:58:43 -05:00
  • 7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539 LetterJay 2018-06-18 21:58:42 -05:00
  • 50da00b26c Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540 LetterJay 2018-06-18 21:58:15 -05:00
  • c055bfc9d3 Merge pull request #7175 from Citadel-Station-13/upstream-merge-38581 LetterJay 2018-06-18 21:55:48 -05:00
  • cc36aa378d Dsay now shows admin rank instead of ADMIN letterjay 2018-06-18 19:17:56 -05:00
  • cf96c7dd11 Dsay now shows admin rank instead of ADMIN (#38555) Jordan Brown 2018-06-18 20:17:30 -04:00
  • debe1cd972 Makes a thing use its macro letterjay 2018-06-18 19:16:44 -05:00
  • 99fee78179 Makes a thing use its macro (#38556) Jordan Brown 2018-06-18 20:16:57 -04:00
  • af414d7d4b Fixes failing tools/dependencies builds succeeding the entire build letterjay 2018-06-18 15:27:37 -05:00
  • aeb047d33f Fixes failing tools/dependencies builds succeeding the entire build (#38581) Jordan Brown 2018-06-18 16:27:41 -04:00
  • 97531c61ff Update coil.dm kevinz000 2018-06-18 12:04:19 -07:00
  • 8fd79f9912 Automatic changelog generation for PR #7148 [ci skip] CitadelStationBot 2018-06-18 13:54:01 -05:00
  • aee56b1f3d lets dogborg tongues reduce firestacks when they lick faces (#7148) deathride58 2018-06-18 18:53:59 +00:00
  • db25067491 adds missing /'s at the starts of some obj instances (#7169) CitadelStationBot 2018-06-18 13:53:33 -05:00
  • 75def268a6 Automatic changelog generation for PR #7165 [ci skip] CitadelStationBot 2018-06-18 13:53:16 -05:00
  • 7593a2b931 Fixes airless turfs in catgirl containment facility (#7165) CitadelStationBot 2018-06-18 13:53:14 -05:00
  • 27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141) Cw 3040 2018-06-18 14:52:11 -04:00
  • 03a22ca16d [MIRROR] Transit space refactor (#7130) CitadelStationBot 2018-06-18 13:51:02 -05:00
  • 69504f68ce Allow admin ghosts to use .p and .d say prefixes letterjay 2018-06-18 13:16:06 -05:00
  • 684ceb2125 Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode Jordan Brown 2018-06-18 14:15:54 -04:00
  • 57f76091cc Fix gulag shuttle moving instantly letterjay 2018-06-18 13:13:35 -05:00
  • 4ad2dd22ef Merge pull request #38552 from AutomaticFrenzy/patch/labor-shuttle Jordan Brown 2018-06-18 14:13:09 -04:00
  • ef120f38ea Replaces names in plasmaman.txt letterjay 2018-06-18 13:12:21 -05:00
  • 4a233caf74 Merge pull request #38558 from erwgd/permanentchemnames Jordan Brown 2018-06-18 14:12:31 -04:00
  • 389e9584a3 Merge pull request #7167 from Citadel-Station-13/upstream-merge-38521 LetterJay 2018-06-18 12:30:52 -05:00
  • 0cb7361eb8 Automatic changelog generation for PR #7166 [ci skip] CitadelStationBot 2018-06-18 12:30:29 -05:00
  • 81b88d0d85 Merge pull request #7166 from Citadel-Station-13/upstream-merge-38543 LetterJay 2018-06-18 12:30:26 -05:00
  • d1f9716101 Automatic changelog generation for PR #7164 [ci skip] CitadelStationBot 2018-06-18 12:29:56 -05:00
  • 34254116bc Merge pull request #7164 from Citadel-Station-13/upstream-merge-38527 LetterJay 2018-06-18 12:29:54 -05:00
  • 43cfea2cb4 Automatic changelog generation for PR #7160 [ci skip] CitadelStationBot 2018-06-18 12:28:44 -05:00
  • fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 LetterJay 2018-06-18 12:28:42 -05:00
  • 119fb6abf6 Merge pull request #7159 from Citadel-Station-13/upstream-merge-38542 LetterJay 2018-06-18 12:28:11 -05:00
  • e79c48256c Automatic changelog generation for PR #7158 [ci skip] CitadelStationBot 2018-06-18 12:27:47 -05:00
  • 6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533 LetterJay 2018-06-18 12:27:45 -05:00
  • 83acec5051 Automatic changelog generation for PR #7157 [ci skip] CitadelStationBot 2018-06-18 12:23:05 -05:00
  • 29ae18fb1a Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461 LetterJay 2018-06-18 12:23:03 -05:00
  • 33b8ea8475 Merge pull request #7155 from Citadel-Station-13/upstream-merge-38536 LetterJay 2018-06-18 12:19:50 -05:00
  • ea007a5f36 Automatic changelog generation for PR #7154 [ci skip] CitadelStationBot 2018-06-18 12:18:34 -05:00
  • 62490e07a8 Merge pull request #7154 from Citadel-Station-13/upstream-merge-38551 LetterJay 2018-06-18 12:18:30 -05:00
  • e70b505d5a Automatic changelog generation for PR #7153 [ci skip] CitadelStationBot 2018-06-18 10:13:08 -05:00
  • d42c0d42de Merge pull request #7153 from Citadel-Station-13/upstream-merge-38550 LetterJay 2018-06-18 10:13:05 -05:00
  • 22e866d4f2 Automatic changelog generation for PR #7151 [ci skip] CitadelStationBot 2018-06-18 10:12:39 -05:00
  • afb9b5992a Merge pull request #7151 from LetterN/patch-2 LetterJay 2018-06-18 10:12:36 -05:00
  • 631cdcd4a7 Automatic changelog generation for PR #7146 [ci skip] CitadelStationBot 2018-06-18 10:11:52 -05:00
  • 75f0dfcf35 Merge pull request #7146 from deathride58/loocdudewtf LetterJay 2018-06-18 10:11:48 -05:00
  • 44c47794b7 Automatic changelog generation for PR #7145 [ci skip] CitadelStationBot 2018-06-18 10:11:09 -05:00
  • 56286eefaa Merge pull request #7145 from Citadel-Station-13/upstream-merge-38523 LetterJay 2018-06-18 10:11:06 -05:00
  • 78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524 LetterJay 2018-06-18 10:10:49 -05:00
  • 5bd6607137 Automatic changelog generation for PR #7142 [ci skip] CitadelStationBot 2018-06-18 10:10:10 -05:00
  • e298e283ee Merge pull request #7142 from Citadel-Station-13/upstream-merge-38504 LetterJay 2018-06-18 10:10:07 -05:00
  • 83d8373711 Automatic changelog generation for PR #7138 [ci skip] CitadelStationBot 2018-06-18 10:09:44 -05:00
  • c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 LetterJay 2018-06-18 10:09:42 -05:00
  • 923a43ca5e Automatic changelog generation for PR #7137 [ci skip] CitadelStationBot 2018-06-18 10:09:37 -05:00
  • c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 LetterJay 2018-06-18 10:09:20 -05:00
  • 0253107d67 Automatic changelog generation for PR #7134 [ci skip] CitadelStationBot 2018-06-18 09:53:09 -05:00
  • 90df70a8f1 Merge pull request #7134 from Citadel-Station-13/upstream-merge-38509 LetterJay 2018-06-18 09:53:05 -05:00
  • 8421e41fbe Automatic changelog generation for PR #7133 [ci skip] CitadelStationBot 2018-06-18 09:52:28 -05:00
  • 8393a6b34b Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510 LetterJay 2018-06-18 09:52:24 -05:00
  • 937d2b20fe Automatic changelog generation for PR #7125 [ci skip] CitadelStationBot 2018-06-18 09:51:08 -05:00
  • aa0e383a2c Merge pull request #7125 from Citadel-Station-13/upstream-merge-38490 LetterJay 2018-06-18 09:50:56 -05:00
  • a97514965a Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486 LetterJay 2018-06-18 09:50:35 -05:00
  • 67991e4a3b Automatic changelog generation for PR #7123 [ci skip] CitadelStationBot 2018-06-18 09:44:00 -05:00
  • 30bd4c5944 Merge pull request #7123 from Citadel-Station-13/upstream-merge-38482 LetterJay 2018-06-18 09:43:56 -05:00
  • 69966c026c Fix protolathe in Pubby circuit lab letterjay 2018-06-18 09:39:14 -05:00
  • ce66967811 Merge pull request #38521 from AutomaticFrenzy/patch/pubby Jordan Brown 2018-06-17 12:10:39 -04:00
  • c9423e0044 Fix non-secure windoors not supporting One Required access mode letterjay 2018-06-18 09:39:00 -05:00
  • 896942dcf1 Fix non-secure windoors not supporting One Required access mode (#38543) Tad Hardesty 2018-06-17 09:10:57 -07:00
  • 7651a1b96b Fix ripples appearing too broadly and disappearing too soon letterjay 2018-06-18 09:38:42 -05:00
  • a70cbed1f7 Merge pull request #38527 from AutomaticFrenzy/patch/ripples Jordan Brown 2018-06-17 12:11:33 -04:00
  • 38b6926530 Adds New Shuttle Chairs letterjay 2018-06-18 09:38:25 -05:00
  • 96b620d540 Adds New Shuttle Chairs (#38539) fludd12 2018-06-17 12:16:48 -04:00
  • 100dadca1a Cleans up supermatter related varedits letterjay 2018-06-18 09:38:16 -05:00
  • 9b1f891a29 Cleans up supermatter related varedits (#38540) 81Denton 2018-06-17 18:32:42 +02:00
  • 343a20ed41 [READY] advanced foam extinguisers [READY] letterjay 2018-06-18 09:38:08 -05:00
  • 1a42719d80 Advanced foam extinguisers (#38270) Tlaltecuhtli 2018-06-17 22:37:34 +02:00
  • 2939115cfb Some minor cleanup to RegisterSignal letterjay 2018-06-18 09:37:57 -05:00
  • 548d498a5e Merge pull request #38542 from ninjanomnom/do-you-have-a-callback-license Jordan Brown 2018-06-17 20:30:48 -04:00
  • 18b1bdbbe9 Adds dance machine, drink dispensers, flavor to beach bum ruin letterjay 2018-06-18 09:37:48 -05:00
  • 241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 81Denton 2018-06-18 02:50:21 +02:00
  • f2e370c7d1 Fixes the Blob being banished to the shadow realm letterjay 2018-06-18 09:37:35 -05:00
  • ba6c5324f0 Fixes the Blob being banished to the shadow realm (#38461) CitrusGender 2018-06-17 21:06:18 -04:00
  • 3fe0ec584c Automatic changelog generation for PR #7131 [ci skip] CitadelStationBot 2018-06-18 09:37:52 -05:00
  • fc7f29c7bc Merge pull request #7131 from Citadel-Station-13/upstream-merge-38329 LetterJay 2018-06-18 09:37:47 -05:00
  • 0af6946aad Update node dependencies Tad Hardesty 2018-06-17 23:51:39 -07:00
  • 46c3dc3d2b Fix item fortification scrolls stacking letterjay 2018-06-18 09:36:28 -05:00
  • 221e539eb8 Fix item fortification scrolls stacking (#38551) Tad Hardesty 2018-06-18 01:02:26 -07:00
  • 28bfc04496 Fix repairing Cyborg headlamp even when its panel is closed letterjay 2018-06-18 09:35:42 -05:00
  • b5478b6e9d Fix repairing Cyborg headlamp even when its panel is closed (#38550) Tad Hardesty 2018-06-18 01:03:21 -07:00
  • 0bd2d9e6fe Update game_options.txt Letter N 2018-06-18 14:58:13 +08:00
  • 5813950aff fixes shock collars Letter N 2018-06-18 14:28:43 +08:00
  • b806ee92f3 Merge branch 'master' into upstream-merge-30862 kevinz000 2018-06-17 20:04:06 -07:00
  • 6a8f029e30 Update flashbang.dm kevinz000 2018-06-17 20:02:49 -07:00
  • 46c2eebb94 Update tgstation.dme kevinz000 2018-06-17 12:55:29 -07:00
  • 7fd0e7ced6 Adds requested comment Poly 2018-06-17 06:50:43 -07:00
  • 842b64646b Update custom_items.dm deathride58 2018-06-17 05:44:13 -04:00
  • bf378cdc36 prevents the vast majority of IC in LOOC cases deathride58 2018-06-17 04:49:19 -04:00
  • cf5b0aeb45 Fix Meta and Delta escape pod rooms having no air letterjay 2018-06-17 03:15:29 -05:00
  • a5a2681baa Fix Meta and Delta escape pod rooms having no air (#38523) Tad Hardesty 2018-06-17 01:13:45 -07:00