Commit Graph

10405 Commits

Author SHA1 Message Date
LetterJay f650d8bb5e Update mousetrap.dm 2017-12-18 17:24:42 -06:00
LetterJay 0b75557816 Update shields.dm 2017-12-18 17:24:28 -06:00
LetterJay b1669b8179 Update severe.dm 2017-12-18 17:24:16 -06:00
LetterJay 6c50ca9157 Update item_attack.dm 2017-12-18 17:24:02 -06:00
LetterJay 9ccdb75e57 Update stat.dm 2017-12-18 17:23:52 -06:00
XDTM 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJay 3df26e3be6 Merge pull request #4413 from Citadel-Station-13/upstream-merge-33569
[MIRROR] Fixes a brain login runtime
2017-12-18 15:20:48 -06:00
LetterJay 8662e4a53c Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050
[MIRROR] Mi-go
2017-12-18 15:20:00 -06:00
LetterJay 747ba20ded Merge pull request #4410 from Citadel-Station-13/upstream-merge-33572
[MIRROR] Pings maintainers to review PRs in areas they are familiar with
2017-12-18 15:19:48 -06:00
LetterJay 629c0de334 Merge pull request #4406 from Citadel-Station-13/upstream-merge-33501
[MIRROR] Quick access hotkeys for backpack and belt
2017-12-18 15:19:33 -06:00
LetterJay 75fe7bfa65 Merge pull request #4402 from Citadel-Station-13/upstream-merge-33578
[MIRROR] Changes manage job slots to use a browser datum, also lets it be used before roundstart
2017-12-18 15:19:22 -06:00
LetterJay 0643aa4fc0 Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542
[MIRROR] Fixes mecha drifting.
2017-12-18 15:19:13 -06:00
LetterJay 5636d9dad3 Merge pull request #4397 from Citadel-Station-13/upstream-merge-33433
[MIRROR] Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter.
2017-12-18 15:17:49 -06:00
CitadelStationBot c12fdd08e2 Automatic changelog generation for PR #4377 [ci skip] 2017-12-17 21:26:10 -06:00
LetterJay bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
2017-12-17 21:26:08 -06:00
CitadelStationBot 4aa7e2e30b Automatic changelog generation for PR #4389 [ci skip] 2017-12-17 21:25:44 -06:00
LetterJay 21a9b09bf5 Merge pull request #4389 from Michiyamenotehifunana/NEB-consolidation
Consolidates NEB code into a modular package
2017-12-17 21:25:42 -06:00
LetterJay 91a26e66cf Merge pull request #4396 from Citadel-Station-13/upstream-merge-33513
[MIRROR] ahelp chat command is silent on success
2017-12-17 21:24:24 -06:00
CitadelStationBot 39a4d4c24f Automatic changelog generation for PR #4394 [ci skip] 2017-12-17 21:24:14 -06:00
LetterJay 781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530
[MIRROR] Fix shuttle autocalls when the round is already over
2017-12-17 21:24:12 -06:00
LetterJay cc3fddb0d7 Merge pull request #4393 from Citadel-Station-13/upstream-merge-33538
[MIRROR] Further emphasises the importance of round ID in issue template
2017-12-17 21:23:55 -06:00
LetterJay 78dcad12e4 Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527
[MIRROR] Adds some permission checks to admin/topic
2017-12-17 21:23:42 -06:00
CitadelStationBot 77b792d69a Automatic changelog generation for PR #4390 [ci skip] 2017-12-17 20:37:41 -06:00
LetterJay 6aa1a86f88 Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529
[MIRROR] Removed drone light in favor of night vision
2017-12-17 20:37:39 -06:00
LetterJay f3390aee98 Merge branch 'master' into NEB-consolidation 2017-12-17 20:37:34 -06:00
LetterJay 52701ebfee Merge pull request #4388 from Citadel-Station-13/upstream-merge-33517
[MIRROR] SSinput tweaks to address server side lag
2017-12-17 20:37:17 -06:00
LetterJay d0ddcbf66b Merge pull request #4387 from Citadel-Station-13/upstream-merge-33524
[MIRROR] Fixes missing mining hammer back sprite
2017-12-17 20:37:04 -06:00
LetterJay 1319ba6a21 Merge pull request #4386 from Citadel-Station-13/upstream-merge-33512
[MIRROR] Fixes gateway ignoring exile implants in simple mobs
2017-12-17 20:36:55 -06:00
CitadelStationBot f235a4e391 Automatic changelog generation for PR #4384 [ci skip] 2017-12-17 20:36:19 -06:00
LetterJay 4fe21eb44d Merge pull request #4384 from EtheoBoxxman/Bhijnbutt
Ash walker tendril no longer spawns chasm on death
2017-12-17 20:36:17 -06:00
CitadelStationBot 2c9e7abb0f Automatic changelog generation for PR #4375 [ci skip] 2017-12-17 20:28:09 -06:00
LetterJay 3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -06:00
LetterJay 1c380e3ed4 Update verbs.dm 2017-12-17 17:50:05 -06:00
LetterJay 3c5632bad2 Update pill.dm 2017-12-17 17:38:51 -06:00
LetterJay 67e7f62416 Update shock_kit.dm 2017-12-17 17:38:17 -06:00
LetterJay eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
LetterJay 5c3b500ba9 Update camera.dm 2017-12-17 17:38:00 -06:00
LetterJay 8d6d561950 Update beebox.dm 2017-12-17 17:37:53 -06:00
CitadelStationBot 9a30c288f0 Automatic changelog generation for PR #4346 [ci skip] 2017-12-17 17:36:19 -06:00
LetterJay aa09d859c7 Merge pull request #4346 from deathride58/oldpdarestoration
Restores the PDA sprites by cecily and toriate (And modularizes it)
2017-12-17 17:36:17 -06:00
CitadelStationBot 3e93e39a20 Fixes a brain login runtime 2017-12-17 04:11:17 -06:00
vuonojenmustaturska 3fc98677a0 Fixes a brain login runtime (#33569)
* Fixes a silly brain meme

* better
2017-12-17 04:11:17 -06:00
Armhulen 8a0aa32335 Mi-go 2017-12-17 04:11:01 -06:00
CitadelStationBot ba1d61a9f9 Pings maintainers to review PRs in areas they are familiar with 2017-12-17 04:10:51 -06:00
Jordan Brown 67ad417291 Pings maintainers to review PRs in areas they are familiar with (#33572)
* Pings maintainers to review PRs in areas they are familiar with

* Add ShizCalev to _maps

* air.dm

* Forgot this

* Fix ShizCalev

* Added more
2017-12-17 04:10:51 -06:00
Emmett Gaines e038319ba2 Quick access hotkeys for backpack and belt 2017-12-17 04:10:20 -06:00
CitadelStationBot fdee61b4f2 Changes manage job slots to use a browser datum, also lets it be used before roundstart 2017-12-17 04:09:45 -06:00
Jordan Brown 6a09d5c981 Merge pull request #33578 from lzimann/job
Changes manage job slots to use a browser datum, also lets it be used before roundstart
2017-12-17 04:09:45 -06:00
LetterJay 220e1cd8cf Merge pull request #4400 from Citadel-Station-13/revert-4329-tgsync_1
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:10:41 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00