Commit Graph
17655 Commits
Author SHA1 Message Date
CitadelStationBot 631cdcd4a7 Automatic changelog generation for PR #7146 [ci skip] 2018-06-18 10:11:52 -05:00
LetterJayandGitHub 75f0dfcf35 Merge pull request #7146 from deathride58/loocdudewtf
Prevents the vast majority of IC in LOOC cases
2018-06-18 10:11:48 -05:00
CitadelStationBot 44c47794b7 Automatic changelog generation for PR #7145 [ci skip] 2018-06-18 10:11:09 -05:00
LetterJayandGitHub 56286eefaa Merge pull request #7145 from Citadel-Station-13/upstream-merge-38523
[MIRROR] Fix Meta and Delta escape pod rooms having no air
2018-06-18 10:11:06 -05:00
LetterJayandGitHub 78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
2018-06-18 10:10:49 -05:00
CitadelStationBot 5bd6607137 Automatic changelog generation for PR #7142 [ci skip] 2018-06-18 10:10:10 -05:00
LetterJayandGitHub e298e283ee Merge pull request #7142 from Citadel-Station-13/upstream-merge-38504
[MIRROR] Makes the xeno nest ruin harder to cheese.
2018-06-18 10:10:07 -05:00
CitadelStationBot 83d8373711 Automatic changelog generation for PR #7138 [ci skip] 2018-06-18 10:09:44 -05:00
LetterJayandGitHub c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476
[MIRROR] [s] Fix launchpads creating way too many sparks
2018-06-18 10:09:42 -05:00
CitadelStationBot 923a43ca5e Automatic changelog generation for PR #7137 [ci skip] 2018-06-18 10:09:37 -05:00
LetterJayandGitHub c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496
[MIRROR] Fix being able to pull mirage borders, others
2018-06-18 10:09:20 -05:00
CitadelStationBot 0253107d67 Automatic changelog generation for PR #7134 [ci skip] 2018-06-18 09:53:09 -05:00
LetterJayandGitHub 90df70a8f1 Merge pull request #7134 from Citadel-Station-13/upstream-merge-38509
[MIRROR] Makes the caravan ambush ruin harder to cheese
2018-06-18 09:53:05 -05:00
CitadelStationBot 8421e41fbe Automatic changelog generation for PR #7133 [ci skip] 2018-06-18 09:52:28 -05:00
LetterJayandGitHub 8393a6b34b Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510
[MIRROR] Cleans up the chem synths jesus christ what the fuck
2018-06-18 09:52:24 -05:00
CitadelStationBot 937d2b20fe Automatic changelog generation for PR #7125 [ci skip] 2018-06-18 09:51:08 -05:00
LetterJayandGitHub aa0e383a2c Merge pull request #7125 from Citadel-Station-13/upstream-merge-38490
[MIRROR] Fixes missing creampies
2018-06-18 09:50:56 -05:00
LetterJayandGitHub a97514965a Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486
[MIRROR] Removes an unused open turf var
2018-06-18 09:50:35 -05:00
CitadelStationBot 67991e4a3b Automatic changelog generation for PR #7123 [ci skip] 2018-06-18 09:44:00 -05:00
LetterJayandGitHub 30bd4c5944 Merge pull request #7123 from Citadel-Station-13/upstream-merge-38482
[MIRROR] Add syndicate headset messages, squashes both together.
2018-06-18 09:43:56 -05:00
CitadelStationBot 3fe0ec584c Automatic changelog generation for PR #7131 [ci skip] 2018-06-18 09:37:52 -05:00
LetterJayandGitHub fc7f29c7bc Merge pull request #7131 from Citadel-Station-13/upstream-merge-38329
[MIRROR] [READY] [TESTED] Fusion Rework Episode V: The Phantom Fusion
2018-06-18 09:37:47 -05:00
deathride58 bf378cdc36 prevents the vast majority of IC in LOOC cases 2018-06-17 04:49:19 -04:00
letterjay cf5b0aeb45 Fix Meta and Delta escape pod rooms having no air 2018-06-17 03:15:29 -05:00
Tad Hardestyandletterjay a5a2681baa Fix Meta and Delta escape pod rooms having no air (#38523) 2018-06-17 03:15:28 -05:00
letterjay 9c3afbf4d4 Fix some of the Lavaland roundstart atmos active turfs 2018-06-17 03:15:08 -05:00
Tad Hardestyandletterjay 27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
letterjay eac8ca5333 Makes the xeno nest ruin harder to cheese. 2018-06-16 21:47:16 -05:00
Dax Dupontandletterjay f5132ba0fc Makes the xeno nest ruin harder to cheese. (#38504)
* Makes the xeno nest ruin harder to cheese.

* space
2018-06-16 21:47:16 -05:00
LetterJayandGitHub 98f6e8def0 Update randomverbs.dm 2018-06-16 16:47:19 -05:00
LetterJayandGitHub 162b827033 Update topic.dm 2018-06-16 16:44:42 -05:00
LetterJayandGitHub 68d33c79de Update admin_verbs.dm 2018-06-16 16:43:48 -05:00
LetterJayandGitHub 7f6f8eb21f Update admin.dm 2018-06-16 16:43:23 -05:00
LetterJayandGitHub 21af80d0d8 Merge pull request #7122 from Citadel-Station-13/upstream-merge-38493
[MIRROR] Corrects typos
2018-06-16 16:42:36 -05:00
CitadelStationBot ad7ef02b1e Automatic changelog generation for PR #7121 [ci skip] 2018-06-16 16:41:51 -05:00
LetterJayandGitHub 9b4b98de27 Merge pull request #7121 from Citadel-Station-13/upstream-merge-38481
[MIRROR] Fix security disposals on pubby and a few other things
2018-06-16 16:41:49 -05:00
CitadelStationBot d00f4c6885 Automatic changelog generation for PR #7120 [ci skip] 2018-06-16 16:41:17 -05:00
LetterJayandGitHub 5e25246058 Merge pull request #7120 from Citadel-Station-13/upstream-merge-38456
[MIRROR] Players who edited a circuit assembly can scan it as a ghost.
2018-06-16 16:41:15 -05:00
LetterJayandGitHub 2d5506a177 Merge pull request #7119 from Citadel-Station-13/upstream-merge-38515
[MIRROR] Makes travis fail fast
2018-06-16 16:40:51 -05:00
LetterJayandGitHub 337d2560aa Merge pull request #7118 from Citadel-Station-13/upstream-merge-38516
[MIRROR] Adds package-lock as requested by cyberboss
2018-06-16 16:39:52 -05:00
LetterJayandGitHub 6e3c5913c8 Merge pull request #7139 from Citadel-Station-13/revert-7096-upstream-merge-38434
Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers."
2018-06-16 16:18:58 -05:00
LetterJayandGitHub 5ee2ee38b3 Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers." 2018-06-16 16:18:50 -05:00
LetterJayandGitHub cc54931a66 Merge pull request #7096 from Citadel-Station-13/upstream-merge-38434
[MIRROR] Fixes chem heater trying to heat up empty beakers.
2018-06-16 16:18:42 -05:00
CitadelStationBot 4373f68e8d Automatic changelog generation for PR #7117 [ci skip] 2018-06-16 16:17:50 -05:00
LetterJayandGitHub 5cf9320999 Merge pull request #7117 from Citadel-Station-13/upstream-merge-38477
[MIRROR] [s] Prevent unbreakable ladders from being moved by shuttles
2018-06-16 16:17:45 -05:00
LetterJayandGitHub 351f43a392 Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500
[MIRROR] Fixes attacking wooden walls
2018-06-16 16:17:28 -05:00
LetterJayandGitHub 1a5021b9c5 Merge pull request #7112 from Citadel-Station-13/upstream-merge-38511
[MIRROR] Heating chems now mix at the right temps
2018-06-16 16:17:11 -05:00
CitadelStationBot 6061358f0e Automatic changelog generation for PR #7116 [ci skip] 2018-06-16 16:16:38 -05:00
LetterJayandGitHub c00f4f04d1 Merge pull request #7116 from Citadel-Station-13/upstream-merge-38489
[MIRROR] Some minor pubby shuttle tweaks
2018-06-16 16:16:36 -05:00
LetterJayandGitHub 8bc19c89e6 Merge pull request #7115 from Citadel-Station-13/upstream-merge-38487
[MIRROR] Moves arch component application to where archdrops is defined
2018-06-16 16:16:19 -05:00