Commit Graph
10476 Commits
Author SHA1 Message Date
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJayandGitHub a98178251d Merge pull request #4444 from Citadel-Station-13/upstream-merge-33531
[MIRROR] [READY]Cyborg jousting with spears!
2017-12-19 17:31:26 -06:00
CitadelStationBot a59b693555 Automatic changelog generation for PR #4458 [ci skip] 2017-12-19 17:01:56 -06:00
LetterJayandGitHub b98e41e994 Merge pull request #4458 from Citadel-Station-13/Diseases
Disease Outbreak event may now also spread randomly generated advanced viruses
2017-12-19 17:01:53 -06:00
LetterJayandGitHub 516db4851f Update disease_outbreak.dm 2017-12-19 16:53:21 -06:00
LetterJayandGitHub 16f1a07b92 diseases 2017-12-19 16:41:09 -06:00
CitadelStationBot edbe78cce8 Automatic changelog generation for PR #4382 [ci skip] 2017-12-19 13:49:34 -06:00
deathride58andGitHub d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307
[MIRROR] Adds config inclusion system
2017-12-19 19:49:32 +00:00
deathride58andGitHub 65412db421 Update game_options.dm 2017-12-19 14:34:06 -05:00
CitadelStationBot 3e932074ba [READY]Cyborg jousting with spears! 2017-12-18 20:54:21 -06:00
kevinz000andCitadelStationBot 8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
CitadelStationBot d5708c981a Automatic changelog generation for PR #4442 [ci skip] 2017-12-18 20:42:10 -06:00
LetterJayandGitHub b74f23a22c Merge pull request #4442 from Citadel-Station-13/upstream-merge-33209
[MIRROR] [Ready] Adds abductor Mind Interface Devices, and a gland HUD
2017-12-18 20:42:00 -06:00
CitadelStationBot b2dffe5d75 [Ready] Adds abductor Mind Interface Devices, and a gland HUD 2017-12-18 20:29:37 -06:00
XDTMandCitadelStationBot 6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)
* Adds abductor Mind Interface Devices, and a gland HUD

* .
2017-12-18 20:29:37 -06:00
LetterJayandGitHub 9710f0f842 Merge pull request #4439 from Citadel-Station-13/ServerAPI
Updates server API to preoper version
2017-12-18 19:30:26 -06:00
LetterJayandGitHub 76e6cb4e48 Update server_tools.dm 2017-12-18 17:31:07 -06:00
CitadelStationBot ec42803331 Automatic changelog generation for PR #4437 [ci skip] 2017-12-18 17:28:28 -06:00
LetterJayandGitHub c9a47bc6f4 Merge pull request #4437 from Citadel-Station-13/upstream-merge-33510
[MIRROR] Makes the chemical smoke machine use stock parts for things
2017-12-18 17:28:26 -06:00
LetterJayandGitHub c9e131883d Merge branch 'master' into ServerAPI 2017-12-18 17:22:10 -06:00
LetterJayandGitHub 2f7c4ecc6f Update README.md 2017-12-18 16:44:45 -06:00
LetterJayandGitHub a9ed49d775 Update README.md 2017-12-18 16:44:13 -06:00
LetterJayandGitHub 75d0b6c942 Update tgstation.dme 2017-12-18 16:43:05 -06:00
LetterJayandGitHub 390c24b3fd Create server_tools.config.dm 2017-12-18 16:42:17 -06:00
LetterJayandGitHub 5f237c595b Merge pull request #4436 from Citadel-Station-13/upstream-merge-33615
[MIRROR] Adds reloading sounds to guns
2017-12-18 15:51:06 -06:00
LetterJayandGitHub f8efa8fe9e Merge pull request #4432 from Citadel-Station-13/upstream-merge-33605
[MIRROR] Adds repeated message squashing to chat.
2017-12-18 15:28:17 -06:00
LetterJayandGitHub 7f75b114b4 Merge pull request #4431 from Citadel-Station-13/upstream-merge-33613
[MIRROR] deep fryers are quieter now...
2017-12-18 15:27:57 -06:00
LetterJayandGitHub e933d69a22 Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
2017-12-18 15:27:12 -06:00
LetterJayandGitHub 06617159b7 Merge pull request #4428 from Citadel-Station-13/upstream-merge-33419
[MIRROR] Lollipop dispensers can push lollipops into people's hands
2017-12-18 15:27:03 -06:00
LetterJayandGitHub 6e5bd180fa Merge pull request #4427 from Citadel-Station-13/upstream-merge-33598
[MIRROR] Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking
2017-12-18 15:26:42 -06:00
LetterJayandGitHub da58957c23 Merge pull request #4425 from Citadel-Station-13/upstream-merge-33607
[MIRROR] Dance Machine now obeys instrument preference
2017-12-18 15:26:33 -06:00
LetterJayandGitHub d32be2c48f Merge pull request #4419 from Citadel-Station-13/upstream-merge-33626
[MIRROR] gives credit to people who more than deserve it
2017-12-18 15:26:21 -06:00
CitadelStationBot 3454d65859 Automatic changelog generation for PR #4417 [ci skip] 2017-12-18 15:25:49 -06:00
LetterJayandGitHub 4a835b47ce Merge pull request #4417 from Citadel-Station-13/upstream-merge-33586
[MIRROR] Disables clockcult power alerts to ghosts when it's not clockcult
2017-12-18 15:25:46 -06:00
CitadelStationBot 573638d9a6 Automatic changelog generation for PR #4416 [ci skip] 2017-12-18 15:25:35 -06:00
LetterJayandGitHub 7df9c3b5fc Merge pull request #4416 from Citadel-Station-13/upstream-merge-33566
[MIRROR] Fixes race swap ruining rounds
2017-12-18 15:25:33 -06:00
LetterJayandGitHub ba5306c8fe Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568
[MIRROR] Fixes zombie stun immunity, more pep in their step
2017-12-18 15:25:13 -06:00
LetterJayandGitHub 15adc5d0b0 Update st_interface.dm 2017-12-18 15:24:23 -06:00
LetterJayandGitHub a85f5eea6b Update server_tools.dm 2017-12-18 15:23:55 -06:00
LetterJayandGitHub 7510667932 Update st_commands.dm 2017-12-18 15:22:55 -06:00
LetterJayandGitHub 97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553
[MIRROR] Rebalances Marauder shields
2017-12-18 15:21:07 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 8662e4a53c Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050
[MIRROR] Mi-go
2017-12-18 15:20:00 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 0643aa4fc0 Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542
[MIRROR] Fixes mecha drifting.
2017-12-18 15:19:13 -06:00
LetterJayandGitHub 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
nicbnandCitadelStationBot da25df9329 Makes the chemical smoke machine use stock parts for things 2017-12-18 15:15:33 -06:00
CitadelStationBot 6238f33b52 Adds reloading sounds to guns 2017-12-18 15:15:25 -06:00