Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

tgs-dmapi-update

tweaks-and-fixes

up-to-date

Mono Color

• bf8e27e4f3 Fixes vent angles and inworld item icons ShizCalevandCitadelStationBot 2018-01-01 21:30:02 -05:00
• 1739e57999 Unsquishes job ban panel CitadelStationBot 2018-01-02 20:10:30 -06:00
• 417e3d801e Unsquishes job ban panel Dax DupontandCitadelStationBot 2018-01-02 01:22:33 +01:00
• d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 LetterJayandGitHub 2018-01-02 19:15:46 -06:00
• c43a7b33e1 Automatic changelog generation for PR #4637 [ci skip] CitadelStationBot 2018-01-02 19:15:25 -06:00
• fc4e56201c Merge pull request #4637 from Citadel-Station-13/upstream-merge-33986 LetterJayandGitHub 2018-01-02 19:15:22 -06:00
• 3a2deb1d49 Merge branch 'master' into upstream-merge-33601 LetterJayandGitHub 2018-01-02 18:26:18 -06:00
• 928e9e02ff Automatic changelog generation for PR #4601 [ci skip] CitadelStationBot 2018-01-02 18:13:45 -06:00
• 706556df69 Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919 LetterJayandGitHub 2018-01-02 18:13:42 -06:00
• 4dcc65a6bc Merge branch 'master' into upstream-merge-33917 LetterJayandGitHub 2018-01-02 17:14:53 -06:00
• 871da8f331 Automatic changelog generation for PR #4635 [ci skip] CitadelStationBot 2018-01-02 17:13:33 -06:00
• 590775ddbe Merge pull request #4635 from Citadel-Station-13/upstream-merge-34003 LetterJayandGitHub 2018-01-02 17:13:31 -06:00
• c22e0dc862 Update chameleon.dm LetterJayandGitHub 2018-01-02 15:48:32 -06:00
• 36cbe323cd Update vision.dm LetterJayandGitHub 2018-01-02 15:48:09 -06:00
• 2720b29908 Update sensory.dm LetterJayandGitHub 2018-01-02 15:47:56 -06:00
• 10bb4f71ec Automatic changelog generation for PR #4636 [ci skip] CitadelStationBot 2018-01-02 15:47:04 -06:00
• 6b1f18d60c Merge pull request #4636 from Citadel-Station-13/upstream-merge-34021 LetterJayandGitHub 2018-01-02 15:47:01 -06:00
• 4adbd0fbf4 Update construct_spells.dm LetterJayandGitHub 2018-01-02 15:46:51 -06:00
• a525c16018 Automatic changelog generation for PR #4634 [ci skip] CitadelStationBot 2018-01-02 15:46:37 -06:00
• c914f14339 Merge pull request #4634 from Citadel-Station-13/upstream-merge-33985 LetterJayandGitHub 2018-01-02 15:46:35 -06:00
• 147bc88ff9 Automatic changelog generation for PR #4632 [ci skip] CitadelStationBot 2018-01-02 15:46:20 -06:00
• 467578788f Merge pull request #4632 from Citadel-Station-13/upstream-merge-33983 LetterJayandGitHub 2018-01-02 15:46:18 -06:00
• ae8b59937b Merge pull request #4629 from Citadel-Station-13/upstream-merge-33987 LetterJayandGitHub 2018-01-02 15:45:58 -06:00
• a761e123ac Merge pull request #4624 from Citadel-Station-13/upstream-merge-33964 LetterJayandGitHub 2018-01-02 15:44:41 -06:00
• b80c0c08ba Merge pull request #4621 from Citadel-Station-13/upstream-merge-33948 LetterJayandGitHub 2018-01-02 15:44:26 -06:00
• 5030b1b7d4 Merge pull request #4593 from Citadel-Station-13/upstream-merge-33829 LetterJayandGitHub 2018-01-02 15:40:52 -06:00
• f581b2d94d Makes the decal component handle updating inventory icons Emmett GainesandCitadelStationBot 2018-01-02 16:17:39 -05:00
• 84e0f7b7f3 Makes some virology symptoms more worth using XDTMandCitadelStationBot 2018-01-02 22:14:29 +01:00
• dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 LetterJay 2018-01-02 14:58:09 -06:00
• 943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 LetterJayandGitHub 2018-01-02 14:56:12 -06:00
• bdf78648f6 Fixes ocky icky in the bank vault CitadelStationBot 2018-01-02 13:31:28 -06:00
• 6c606654c3 Removes icky ocky from the vault (#34021) Dax DupontandCitadelStationBot 2018-01-02 20:31:04 +01:00
• bae882bf46 Fixes Abyssal Gaze blinding forever XDTMandCitadelStationBot 2018-01-02 15:22:09 +01:00
• d342303ef9 Solar control fixes CitadelStationBot 2018-01-02 08:21:16 -06:00
• 0ebd16f509 Solar control fixes (#33985) Dax DupontandCitadelStationBot 2018-01-02 15:20:04 +01:00
• bf35f19aca Automatic changelog generation for PR #4633 [ci skip] CitadelStationBot 2018-01-02 08:02:05 -06:00
• b3eb85cdd2 Merge pull request #4633 from Citadel-Station-13/upstream-merge-34035 LetterJayandGitHub 2018-01-02 08:02:02 -06:00
• d035f16aca Update basilisk.dm LetterJayandGitHub 2018-01-02 05:24:47 -06:00
• d13d76ad71 Merge branch 'upstream-merge-33829' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 LetterJay 2018-01-02 05:17:29 -06:00
• f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 LetterJay 2018-01-02 05:16:13 -06:00
• 3fafbe8bc5 Merge branch 'master' into upstream-merge-33829 LetterJayandGitHub 2018-01-02 04:55:07 -06:00
• b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 LetterJayandGitHub 2018-01-02 04:52:57 -06:00
• c5a70ff34c Automatic changelog generation for PR #4430 [ci skip] CitadelStationBot 2018-01-02 04:52:40 -06:00
• 685bac498f Merge pull request #4430 from Citadel-Station-13/upstream-merge-33574 LetterJayandGitHub 2018-01-02 04:52:38 -06:00
• f786a90bad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 LetterJay 2018-01-02 04:37:36 -06:00
• e395cded9d cl LetterJay 2018-01-02 04:34:21 -06:00
• c9482653f1 Merge pull request #4395 from Citadel-Station-13/upstream-merge-33537 LetterJayandGitHub 2018-01-02 04:21:05 -06:00
• 95e51de1c0 Puts back the changeturf part of PlaceOnTop() CitadelStationBot 2018-01-02 00:12:32 -06:00
• 18f5e1095a Merge pull request #34035 from ninjanomnom/actually-changeturf orangesandCitadelStationBot 2018-01-02 19:11:50 +13:00
• 85da6fbcef Adds goonbee and cult, plus improves several emojis. CitadelStationBot 2018-01-01 23:17:33 -06:00
• 3144b97ae4 Adds goonbee and cult plus improves several emojis. (#33983) FrozenGuy5andCitadelStationBot 2018-01-02 05:16:37 +00:00
• 946bba6b98 Automatic changelog generation for PR #4628 [ci skip] CitadelStationBot 2018-01-01 21:34:29 -06:00
• f114380ad2 Merge pull request #4628 from deathride58/fIXESVOREFORREALTHISTIME deathride58andGitHub 2018-01-02 03:34:26 +00:00
• e464f94187 Removes some periods from contributing.md CitadelStationBot 2018-01-01 20:46:43 -06:00
• bed61a6676 removes some dots (#33987) FrozenGuy5andCitadelStationBot 2018-01-02 02:46:21 +00:00
• 04f19ea53d ACTUALLY FIXES VORE deathride58 2018-01-01 20:18:43 -05:00
• 9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 LetterJay 2018-01-01 14:14:06 -06:00
• 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 LetterJay 2018-01-01 14:09:07 -06:00
• 3ee2569379 Update borer_event.dm LetterJayandGitHub 2018-01-01 14:07:17 -06:00
• c2fb9ed729 Merge pull request #4573 from Citadel-Station-13/upstream-merge-33660 LetterJayandGitHub 2018-01-01 11:19:01 -06:00
• ea3652c30e fuk LetterJay 2018-01-01 11:07:40 -06:00
• c2b23984ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33660 LetterJay 2018-01-01 10:59:13 -06:00
• 73537f2951 Automatic changelog generation for PR #4555 [ci skip] CitadelStationBot 2018-01-01 07:40:00 -06:00
• 4549ac7db2 Merge pull request #4555 from Citadel-Station-13/upstream-merge-32311 LetterJayandGitHub 2018-01-01 07:39:58 -06:00
• 5486f71010 woo LetterJay 2018-01-01 07:30:50 -06:00
• 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 LetterJay 2018-01-01 07:00:34 -06:00
• 6c147c9ef3 Merge branch 'master' into upstream-merge-33660 LetterJayandGitHub 2018-01-01 04:59:20 -06:00
• 6bafa75ee8 Merge pull request #4626 from Citadel-Station-13/upstream-merge-33965 LetterJayandGitHub 2018-01-01 04:58:01 -06:00
• 7d4a51f659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463 LetterJay 2018-01-01 04:36:29 -06:00
• cd3f399924 Merge pull request #4619 from Citadel-Station-13/upstream-merge-33954 LetterJayandGitHub 2018-01-01 04:27:20 -06:00
• d986ca1ee3 Merge pull request #4594 from Citadel-Station-13/upstream-merge-33911 LetterJayandGitHub 2018-01-01 04:26:56 -06:00
• 0fbe251dfe Automatic changelog generation for PR #4599 [ci skip] CitadelStationBot 2018-01-01 04:26:36 -06:00
• dd0a5c9d24 Merge pull request #4599 from cebutris/guardianstuff LetterJayandGitHub 2018-01-01 04:26:34 -06:00
• 7078a7ea49 Merge pull request #4598 from cebutris/cebusoap2 LetterJayandGitHub 2018-01-01 04:26:03 -06:00
• a881de18b9 Automatic changelog generation for PR #4596 [ci skip] CitadelStationBot 2018-01-01 04:25:40 -06:00
• 1463a442a5 Merge pull request #4596 from Citadel-Station-13/upstream-merge-33915 LetterJayandGitHub 2018-01-01 04:25:37 -06:00
• 515092bd1c Merge branch 'master' into upstream-merge-33919 LetterJayandGitHub 2018-01-01 04:11:29 -06:00
• ce43797f03 Merge pull request #4602 from Citadel-Station-13/upstream-merge-33918 LetterJayandGitHub 2018-01-01 04:11:00 -06:00
• 07adb3fdd6 Update teleporter.dm LetterJayandGitHub 2018-01-01 04:06:33 -06:00
• 4899131230 Update teleporter.dm LetterJayandGitHub 2018-01-01 04:06:14 -06:00
• c79b75687d Autotag .github => GitHub CitadelStationBot 2018-01-01 04:01:33 -06:00
• 2c350fcb6c Autotag .github => GitHub (#33965) Jordan BrownandCitadelStationBot 2017-12-31 15:25:56 -05:00
• e11293b60d Adds a note on config changes to CONTRIBUTING CitadelStationBot 2018-01-01 04:01:00 -06:00
• cf978b0f52 Adds a note on config changes to CONTRIBUTING (#33964) Jordan BrownandCitadelStationBot 2018-01-01 01:23:00 -05:00
• 3a8f27a2bf Merge pull request #4623 from Citadel-Station-13/upstream-merge-33960 LetterJayandGitHub 2017-12-31 15:23:14 -06:00
• 8369a3886d Merge pull request #4622 from Citadel-Station-13/upstream-merge-33957 LetterJayandGitHub 2017-12-31 15:22:55 -06:00
• 2db4000f08 Merge pull request #4618 from Citadel-Station-13/upstream-merge-33951 LetterJayandGitHub 2017-12-31 15:22:25 -06:00
• d1febba415 Merge pull request #4616 from Citadel-Station-13/upstream-merge-33950 LetterJayandGitHub 2017-12-31 15:22:04 -06:00
• 482e0c6fe5 Corrects flamethrower capitalization CitadelStationBot 2017-12-31 10:02:59 -06:00
• 54032f9c6d Merge pull request #33960 from ShizCalev/flamer Jordan BrownandCitadelStationBot 2017-12-31 11:02:40 -05:00
• 922e360ed4 cleans up some behaviour for PlaceOnTop/Bottom CitadelStationBot 2017-12-31 10:01:46 -06:00
• 4e0efc64d5 Merge pull request #33957 from ninjanomnom/helper-cleanup Jordan BrownandCitadelStationBot 2017-12-31 11:00:57 -05:00
• 6beed47197 stops frying abstract or nodrop items CitadelStationBot 2017-12-31 10:01:38 -06:00
• 159fe41ab8 Merge pull request #33948 from ShizCalev/abstract-frying Jordan BrownandCitadelStationBot 2017-12-31 11:01:16 -05:00
• 05eb81b5c3 fixes component's dupe CitadelStationBot 2017-12-31 09:59:16 -06:00
• d0e5a38c29 Merge pull request #33954 from jammer312/components_fix Jordan BrownandCitadelStationBot 2017-12-31 10:58:22 -05:00
• 88f3e9f99f Fixes reset_perspective runtimes CitadelStationBot 2017-12-31 09:58:02 -06:00
• 19c35c63d6 Merge pull request #33951 from AnturK/perspective_fix Jordan BrownandCitadelStationBot 2017-12-31 10:57:03 -05:00
• 806124e69b Merge pull request #4617 from Citadel-Station-13/revert-4611-upstream-merge-33940 LetterJayandGitHub 2017-12-31 06:58:39 -06:00
• 7a6cf002d3 Revert "[MIRROR] Fix PDA message photos not being viewable" LetterJayandGitHub 2017-12-31 06:41:03 -06:00