Commit Graph

7099 Commits

Author SHA1 Message Date
MoreRobustThanYou
fdffebb3b8 You can now drag-drop people into open DNA scanners (#31646) 2017-10-13 16:28:24 -05:00
LetterJay
b9c07e7f66 Merge pull request #3363 from Citadel-Station-13/upstream-merge-31607
[MIRROR] Fixes preferences generation
2017-10-13 11:24:46 -04:00
LetterJay
6367e4263b Merge pull request #3360 from Citadel-Station-13/upstream-merge-31602
[MIRROR] Fixes diagonal tunnels
2017-10-13 11:24:26 -04:00
CitadelStationBot
9ffa0caeb0 Fixes preferences generation 2017-10-13 09:16:03 -05:00
kevinz000
c84a270403 Fixes preferences generation (#31607) 2017-10-13 09:16:03 -05:00
CitadelStationBot
57cf294fd3 Fixes diagonal tunnels 2017-10-13 09:14:35 -05:00
Jordan Brown
9d448fda76 Merge pull request #31602 from AnturK/tunnels
Fixes diagonal tunnels
2017-10-13 09:14:34 -05:00
LetterJay
692e226d24 Merge pull request #3346 from Citadel-Station-13/upstream-merge-31621
[MIRROR] Add require_comms_key = TRUE to some topic that need it
2017-10-13 08:58:00 -04:00
LetterJay
65b1d73722 Merge pull request #3357 from Citadel-Station-13/upstream-merge-31643
[MIRROR] Activates global warming
2017-10-13 08:09:20 -04:00
LetterJay
09d929e9ca Merge branch 'master' into upstream-merge-31643 2017-10-13 07:59:09 -04:00
LetterJay
58b8a02802 Update gas_mixture.dm 2017-10-13 02:59:04 -05:00
LetterJay
2e8b198d9a Merge branch 'master' into upstream-merge-31621 2017-10-13 03:58:03 -04:00
LetterJay
b08f278127 Merge pull request #3320 from Citadel-Station-13/upstream-merge-31580
[MIRROR] Fixes init times
2017-10-13 02:02:16 -04:00
LetterJay
5b292cebb3 Merge pull request #3344 from Citadel-Station-13/upstream-merge-31581
[MIRROR] Fixes space transition (again)
2017-10-13 02:02:04 -04:00
LetterJay
6f9d1893ca Merge pull request #3342 from Citadel-Station-13/upstream-merge-31396
[MIRROR] Adds tick check to ore boxes
2017-10-13 02:01:52 -04:00
LetterJay
15fd2f3498 Merge pull request #3343 from Citadel-Station-13/upstream-merge-31573
[MIRROR] Updates out of date URL in CONTRIBUTING.md
2017-10-13 02:01:36 -04:00
LetterJay
fb444f173a Merge pull request #3351 from Citadel-Station-13/upstream-merge-31582
[MIRROR] Notify admins when someone activates a smoke machine
2017-10-13 02:00:46 -04:00
LetterJay
51f5d5423c Merge pull request #3358 from Citadel-Station-13/upstream-merge-31502
[MIRROR] Adds a fireball from the heavens as an admin smite
2017-10-13 00:21:01 -04:00
CitadelStationBot
157cf09673 Automatic changelog generation for PR #3356 [ci skip] 2017-10-12 23:20:56 -05:00
LetterJay
f488fa3ac3 Merge pull request #3356 from Citadel-Station-13/upstream-merge-31565
[MIRROR] Stargazers are now station-restricted, and cogged APCs are now quiet
2017-10-13 00:20:54 -04:00
CitadelStationBot
183eae83f1 Automatic changelog generation for PR #3353 [ci skip] 2017-10-12 23:20:47 -05:00
LetterJay
f4852314dd Merge pull request #3353 from Citadel-Station-13/upstream-merge-31588
[MIRROR] Fixes stationary mob parallax
2017-10-13 00:20:46 -04:00
LetterJay
b43a207390 Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586
[MIRROR] Fixes canisters breaking multiple times
2017-10-13 00:20:38 -04:00
CitadelStationBot
ddc9d1b34a Automatic changelog generation for PR #3348 [ci skip] 2017-10-12 23:07:15 -05:00
LetterJay
116f06f428 Merge pull request #3348 from Citadel-Station-13/upstream-merge-31579
[MIRROR] Fixes foam darts on cardboard cutouts and shooting range targets
2017-10-13 00:07:14 -04:00
LetterJay
ea7b3d101d Merge pull request #3347 from Citadel-Station-13/upstream-merge-31585
[MIRROR] Fixes empty light fixtures showing as working lights in DM
2017-10-13 00:06:06 -04:00
CitadelStationBot
4af4323069 Automatic changelog generation for PR #3341 [ci skip] 2017-10-12 23:04:50 -05:00
LetterJay
31914b7723 Merge pull request #3341 from Citadel-Station-13/upstream-merge-31549
[MIRROR] Fixes plastic explosive issues
2017-10-13 00:04:47 -04:00
CitadelStationBot
76c5cc353f Automatic changelog generation for PR #3340 [ci skip] 2017-10-12 23:03:52 -05:00
LetterJay
0c926658f8 Merge pull request #3340 from Citadel-Station-13/upstream-merge-31558
[MIRROR] Fixes black carpet sprites.
2017-10-13 00:03:50 -04:00
LetterJay
5457e15b8b Merge pull request #3338 from Citadel-Station-13/upstream-merge-31567
[MIRROR] RESTORES THE CHAIN OF COMMAND ON DELTA STATION
2017-10-13 00:03:22 -04:00
LetterJay
47c6775447 Merge pull request #3337 from Citadel-Station-13/upstream-merge-31572
[MIRROR] Fix TGUI compiler git updates
2017-10-13 00:01:37 -04:00
LetterJay
b0f1ecda37 Merge pull request #3336 from Citadel-Station-13/upstream-merge-31569
[MIRROR] Fixes conveyor belt layering
2017-10-12 23:55:05 -04:00
LetterJay
f072cac695 Merge pull request #3335 from Citadel-Station-13/upstream-merge-31618
[MIRROR] Fixes topic key validation
2017-10-12 23:54:03 -04:00
LetterJay
69d27f7231 Merge pull request #3334 from Citadel-Station-13/upstream-merge-31619
[MIRROR] Fixes adminwho having namecheck as a keyword
2017-10-12 23:50:00 -04:00
LetterJay
aaa76a47f5 Merge pull request #3333 from Citadel-Station-13/upstream-merge-31617
[MIRROR] Fixes topic handlers
2017-10-12 23:49:26 -04:00
LetterJay
25396db2df Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605
[MIRROR] Fixes cryo
2017-10-12 23:45:42 -04:00
LetterJay
d02dcb496e Merge pull request #3331 from Citadel-Station-13/upstream-merge-31542
[MIRROR] makes vacuums "cold", sort of
2017-10-12 23:40:55 -04:00
CitadelStationBot
1a59fa8691 Automatic changelog generation for PR #3330 [ci skip] 2017-10-12 22:38:02 -05:00
LetterJay
0263f44791 Merge pull request #3330 from Citadel-Station-13/upstream-merge-31554
[MIRROR] Fix lavaland turfs looking awkward to AIs
2017-10-12 23:38:00 -04:00
LetterJay
3ee44b45f9 Merge pull request #3329 from Citadel-Station-13/upstream-merge-31556
[MIRROR] Fixes client vv not working.
2017-10-12 23:27:54 -04:00
LetterJay
b1232af6f5 Merge pull request #3327 from Citadel-Station-13/upstream-merge-31610
[MIRROR] Fix world/Topic calling the wrong handler proc
2017-10-12 23:25:34 -04:00
CitadelStationBot
db9d3501a8 Adds a fireball from the heavens as an admin smite 2017-10-12 20:37:58 -05:00
Armhulen
49d5d08456 Adds a fireball from the heavens as an admin smite (#31502)
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
2017-10-12 20:37:58 -05:00
Jordan Brown
14dcd3aee5 Activates global warming 2017-10-12 20:04:15 -05:00
CitadelStationBot
2529e04483 Stargazers are now station-restricted, and cogged APCs are now quiet 2017-10-12 18:32:38 -05:00
Ashe Higgs
f9436e53c4 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks

* Includes a blob_allowed check
2017-10-12 18:32:37 -05:00
CitadelStationBot
71105464b7 Fixes stationary mob parallax 2017-10-12 16:07:12 -05:00
Jordan Brown
7ef36802ff Merge pull request #31588 from ninjanomnom/shuttle-parallax
Fixes stationary mob parallax
2017-10-12 16:07:12 -05:00
CitadelStationBot
1faba6dae6 Notify admins when someone activates a smoke machine 2017-10-12 16:03:50 -05:00