Commit Graph
12519 Commits
Author SHA1 Message Date
LetterJayandGitHub 72812999f1 Merge pull request #5044 from Citadel-Station-13/upstream-merge-34465
[MIRROR] Expands round end pop recording as json export
2018-01-23 08:24:08 -06:00
LetterJayandGitHub 65733375bd Merge pull request #5043 from Citadel-Station-13/upstream-merge-34804
[MIRROR] Expands our worst rule
2018-01-23 08:23:49 -06:00
LetterJayandGitHub 9544de1693 Merge pull request #5042 from Citadel-Station-13/upstream-merge-34733
[MIRROR] Fixes bot drop & bot assembly issues
2018-01-23 08:23:29 -06:00
CitadelStationBot 82a726031c Automatic changelog generation for PR #5041 [ci skip] 2018-01-23 08:23:12 -06:00
LetterJayandGitHub b603bb9fbb Merge pull request #5041 from Citadel-Station-13/upstream-merge-34767
[MIRROR] Fix replace_random_law runtime
2018-01-23 08:23:10 -06:00
LetterJayandGitHub acb333d403 Merge pull request #5040 from Citadel-Station-13/upstream-merge-34765
[MIRROR] Fixes APC controller runtime
2018-01-23 08:22:56 -06:00
LetterJayandGitHub a7270f43cd Merge pull request #5039 from Citadel-Station-13/upstream-merge-34750
[MIRROR] current sanity check in ark of the justicar
2018-01-23 08:21:10 -06:00
CitadelStationBot 212688a279 Automatic changelog generation for PR #5034 [ci skip] 2018-01-23 08:18:40 -06:00
LetterJayandGitHub 9f24bac5e6 Merge pull request #5034 from Citadel-Station-13/upstream-merge-34142
[MIRROR] Refactors infrared beams to update faster
2018-01-23 08:18:38 -06:00
LetterJayandGitHub ccf1f97478 Merge pull request #5033 from Citadel-Station-13/upstream-merge-34810
[MIRROR] [s]Fixes being able to lower w_class of transfer valves
2018-01-23 08:18:21 -06:00
LetterJayandGitHub 221e51d105 Merge pull request #5032 from Citadel-Station-13/upstream-merge-34803
[MIRROR] Adds the Wjohn as /icons folder codeowner
2018-01-23 08:17:59 -06:00
LetterJayandGitHub abf98762c8 Update CODEOWNERS 2018-01-23 08:17:53 -06:00
LetterJayandGitHub 54d4cdd8ab Merge pull request #5031 from Citadel-Station-13/upstream-merge-34725
[MIRROR] Fixes portal storm event
2018-01-23 08:17:33 -06:00
LetterJayandGitHub fa0823c27d Merge pull request #5030 from Citadel-Station-13/upstream-merge-34727
[MIRROR] Stops simple_animals from attacking mobs in godmode
2018-01-23 08:17:21 -06:00
CitadelStationBot c8851c7074 Automatic changelog generation for PR #5029 [ci skip] 2018-01-23 08:17:11 -06:00
LetterJayandGitHub 75af3bc248 Merge pull request #5029 from Citadel-Station-13/upstream-merge-34742
[MIRROR] Removes pulling claw instant messageless stun
2018-01-23 08:17:09 -06:00
CitadelStationBot 9a8f9bdc35 Automatic changelog generation for PR #5028 [ci skip] 2018-01-23 08:16:54 -06:00
LetterJayandGitHub 8ad54530a1 Merge pull request #5028 from Citadel-Station-13/upstream-merge-34759
[MIRROR] Consolidated t-ray scanner code
2018-01-23 08:16:52 -06:00
LetterJayandGitHub 0050a761cf Merge pull request #5027 from Citadel-Station-13/upstream-merge-34756
[MIRROR] Adds transform helpers to atom vv
2018-01-23 08:16:39 -06:00
CitadelStationBot 24c1812768 Expands round end pop recording as json export 2018-01-23 01:57:53 -06:00
JordieandCitadelStationBot 54466db36a Expands round end pop recording as json export (#34465)
* expands round end pop recording as json export

* 511 compatibility and fix

* readds feedback for ned
2018-01-23 01:57:53 -06:00
CitadelStationBot be30750d1b Expands our worst rule 2018-01-23 01:52:27 -06:00
orangesandCitadelStationBot bf3e314092 Merge pull request #34804 from tgstation/KorPhaeron-patch-1
Expands our worst rule
2018-01-23 01:52:27 -06:00
CitadelStationBot a3738e0f00 Fixes bot drop & bot assembly issues 2018-01-23 01:44:09 -06:00
orangesandCitadelStationBot 1caf34f0df Merge pull request #34733 from ShizCalev/box-fixes
Fixes bot drop & bot assembly issues
2018-01-23 01:44:09 -06:00
CitadelStationBot 28f5c5bee4 Fix replace_random_law runtime 2018-01-23 01:43:00 -06:00
orangesandCitadelStationBot 58855df5dd Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law
Fix replace_random_law runtime
2018-01-23 01:43:00 -06:00
CitadelStationBot decb5098d6 Fixes APC controller runtime 2018-01-23 01:42:43 -06:00
orangesandCitadelStationBot 4dac26d2da Merge pull request #34765 from ShizCalev/apc-controller-runtime
Fixes APC controller runtime
2018-01-23 01:42:43 -06:00
CitadelStationBot aa305f97c0 current sanity check in ark of the justicar 2018-01-23 01:42:36 -06:00
orangesandCitadelStationBot 07b94d7bd9 Merge pull request #34750 from ShizCalev/clockwork-current-
current sanity check in ark of the justicar
2018-01-23 01:42:36 -06:00
CitadelStationBot de96749d08 Refactors infrared beams to update faster 2018-01-23 01:32:28 -06:00
kevinz000andCitadelStationBot ffaf6e2ba0 Infrared Refactor (#34142)
bugfix: Infrared beams now update instantly.
2018-01-23 01:32:28 -06:00
CitadelStationBot e134f0a4ca [s]Fixes being able to lower w_class of transfer valves 2018-01-23 01:12:54 -06:00
orangesandCitadelStationBot 630d823d1a Merge pull request #34810 from tgstation/KorPhaeron-patch-2
[s]Fixes being able to lower w_class of transfer valves
2018-01-23 01:12:54 -06:00
LeoandCitadelStationBot bd5ec4eee3 Adds the Wjohn as /icons folder codeowner 2018-01-22 16:48:54 -06:00
CitadelStationBot 7bc71987b6 Fixes portal storm event 2018-01-22 16:25:20 -06:00
ShizCalevandCitadelStationBot dfdf01e79e Fixes portal storm event (#34725) 2018-01-22 16:25:19 -06:00
CitadelStationBot 6b72b4240b Stops simple_animals from attacking mobs in godmode 2018-01-22 15:46:28 -06:00
LeoandCitadelStationBot 8bdf83cc72 Merge pull request #34727 from ShizCalev/simpleanimal-godmode
Stops simple_animals from attacking mobs in godmode
2018-01-22 15:46:28 -06:00
CitadelStationBot 465f323a42 Removes pulling claw instant messageless stun 2018-01-22 15:45:15 -06:00
kevinz000andCitadelStationBot 54e9c47e99 Removes pulling claw instant messageless stun (#34742) 2018-01-22 15:45:15 -06:00
CitadelStationBot 5e794617a0 Consolidated t-ray scanner code 2018-01-22 15:45:07 -06:00
CruixandCitadelStationBot 23e5b7f396 Consolidated t-ray scanner code (#34759)
* Consolidated t-ray scanner code

* Fixed cables not showing up on t-ray scans
2018-01-22 15:45:07 -06:00
CitadelStationBot b98d0b2ce8 Adds transform helpers to atom vv 2018-01-22 15:42:53 -06:00
AnturKandCitadelStationBot 1a85c90fab Adds transform helpers to atom vv (#34756) 2018-01-22 15:42:53 -06:00
CitadelStationBot 5e1ff26276 Automatic changelog generation for PR #5023 [ci skip] 2018-01-22 14:31:30 -06:00
deathride58andGitHub 3f953220af Merge pull request #5023 from Citadel-Station-13/upstream-merge-34743
[MIRROR] Changeling clothes blood fix
2018-01-22 20:31:28 +00:00
CitadelStationBot 13c546362d Automatic changelog generation for PR #5021 [ci skip] 2018-01-22 14:31:07 -06:00
deathride58andGitHub 84385ee517 Merge pull request #5021 from Citadel-Station-13/upstream-merge-34734
[MIRROR] Removes cultist space bases
2018-01-22 20:31:05 +00:00