Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

tgs-dmapi-update

tweaks-and-fixes

up-to-date

Mono Color

• 06b86e54b3 Adds round ID to status topic (#32976) Shadowlight213andCitadelStationBot 2017-11-22 10:41:24 -08:00
• 6ab499b57b Fixes bartender suit having an adjust state ShizCalevandCitadelStationBot 2017-11-22 13:40:12 -05:00
• ab5ad20eb8 Updates README.MD to correct a file name. CitadelStationBot 2017-11-22 12:39:20 -06:00
• d3e5a40462 licensing meme (#32973) FrozenGuy5andCitadelStationBot 2017-11-22 18:38:35 +00:00
• 16094ab909 ahelp command can now accept a ticket # CitadelStationBot 2017-11-22 12:38:07 -06:00
• 5468bcc56f ahelp command can now accept a ticket # (#32970) Jordan BrownandCitadelStationBot 2017-11-22 13:38:08 -05:00
• 04cc679964 Fixes space cat resting sprite CitadelStationBot 2017-11-22 10:47:30 -06:00
• f22841d2fe Fixes space cat resting sprite ShizCalevandCitadelStationBot 2017-11-21 01:07:50 -05:00
• 0008da671a Refactor chasm paths to be more sane CitadelStationBot 2017-11-22 03:30:49 -06:00
• 38c45fb479 Refactor chasm paths to be more sane (#32701) Tad HardestyandCitadelStationBot 2017-11-22 01:30:45 -08:00
• cf3ef3ac54 reverts layering changes since the sprites should be a tad better Poojawa 2017-11-22 02:41:11 -06:00
• 33c1f85ff6 adjusts how boobs look sprite wise Poojawa 2017-11-22 02:39:46 -06:00
• 0b2ae3905a layer memes Poojawa 2017-11-22 01:49:40 -06:00
• dc0128a6d3 Merge pull request #4058 from Citadel-Station-13/upstream-merge-32954 deathride58andGitHub 2017-11-22 06:00:58 +00:00
• 6fae70f9a2 Merge pull request #4061 from Citadel-Station-13/upstream-merge-32941 deathride58andGitHub 2017-11-22 05:59:48 +00:00
• fc5133bef5 Merge pull request #4062 from Citadel-Station-13/upstream-merge-32932 deathride58andGitHub 2017-11-22 05:57:35 +00:00
• a318958810 Merge pull request #4063 from Citadel-Station-13/upstream-merge-32933 deathride58andGitHub 2017-11-22 05:57:05 +00:00
• f830a2e9b5 Automatic changelog generation for PR #4064 [ci skip] CitadelStationBot 2017-11-21 23:56:10 -06:00
• 9e93007fb0 Merge pull request #4064 from Citadel-Station-13/upstream-merge-32951 deathride58andGitHub 2017-11-22 05:56:07 +00:00
• ef84419608 Conjuration spells fix CitadelStationBot 2017-11-21 22:30:05 -06:00
• cf10130b21 Conjuration spells fix (#32951) jammer312andCitadelStationBot 2017-11-22 07:30:15 +03:00
• d6584d57bd Stacked turf cleanup CitadelStationBot 2017-11-21 22:28:48 -06:00
• 8a83b50113 Stacked turf cleanup (#32933) ShizCalevandCitadelStationBot 2017-11-21 11:14:46 -05:00
• 1a915546c4 Cleans up template shuttles CitadelStationBot 2017-11-21 22:28:39 -06:00
• cf06a8142e Cleans up template shuttles (#32932) ShizCalevandCitadelStationBot 2017-11-21 11:16:58 -05:00
• f41e1eb15f Attempt 2 at getting licensing detection to work CitadelStationBot 2017-11-21 22:28:31 -06:00
• 4b9a373387 Merge pull request #32941 from tgstation/LicensingMemes LeoandCitadelStationBot 2017-11-21 17:44:40 -02:00
• 61ae95da33 Gives the R&D Server a description and makes its name improper Y0SH1M4S73RandCitadelStationBot 2017-11-21 19:43:29 -05:00
• 694958f587 Update Turbine computer to use TGUI Matt SmithandCitadelStationBot 2017-11-22 01:05:40 +00:00
• 55e09b1619 Fixes blobbernaut spawning CitadelStationBot 2017-11-21 22:27:50 -06:00
• ddddac262e Fixes blobbernaut spawning (#32954) KorPhaeronandCitadelStationBot 2017-11-21 19:06:25 -06:00
• dbf2467f5e Automatic changelog generation for PR #4055 [ci skip] CitadelStationBot 2017-11-21 15:23:49 -06:00
• 5a331eedad Merge pull request #4055 from Citadel-Station-13/upstream-merge-32931 deathride58andGitHub 2017-11-21 21:23:46 +00:00
• 7b52517d32 Automatic changelog generation for PR #3747 [ci skip] CitadelStationBot 2017-11-21 15:16:34 -06:00
• 0f9a85e4d7 Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101 deathride58andGitHub 2017-11-21 21:16:31 +00:00
• aedf16a76e merges #4011 deathride58 2017-11-21 15:07:31 -05:00
• 51a7c4a543 Merge pull request #4057 from deathride58/manualmirrors2 deathride58andGitHub 2017-11-21 20:00:18 +00:00
• 22e7283564 Automatic changelog generation for PR #4051 [ci skip] CitadelStationBot 2017-11-21 13:59:41 -06:00
• 4b284f2e0d Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773 deathride58andGitHub 2017-11-21 19:59:38 +00:00
• 0feca054da cleans up whitespace in traitor_bro.dm deathride58andGitHub 2017-11-21 14:58:43 -05:00
• 973be1b494 Update traitor_bro.dm deathride58andGitHub 2017-11-21 14:56:41 -05:00
• 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 deathride58andGitHub 2017-11-21 19:53:58 +00:00
• c2b27ebfa4 merges #3837 deathride58 2017-11-21 14:45:44 -05:00
• 5d5d4451a9 fixes merge conflicts deathride58 2017-11-21 14:35:43 -05:00
• 03d67c753e Merge pull request #4056 from deathride58/MAPCONFLICTSARETHEWORST deathride58andGitHub 2017-11-21 19:22:15 +00:00
• 9f80325c52 Update power.dm deathride58andGitHub 2017-11-21 14:20:03 -05:00
• e5cdbe29cc Update printer.dm deathride58andGitHub 2017-11-21 14:18:42 -05:00
• 8e095c780f Automatic changelog generation for PR #4052 [ci skip] CitadelStationBot 2017-11-21 13:15:44 -06:00
• 232be3da9f Merge pull request #4052 from Citadel-Station-13/upstream-merge-32928 deathride58andGitHub 2017-11-21 19:15:41 +00:00
• ddbb5c34d4 manual mirrors deathride58 2017-11-21 14:06:28 -05:00
• 05800235b5 fixes mapping errors introduced in #4049 deathride58 2017-11-21 13:54:20 -05:00
• e3fad3720d Automatic changelog generation for PR #4050 [ci skip] CitadelStationBot 2017-11-21 12:19:52 -06:00
• 4c5d8529fb Merge pull request #4050 from Citadel-Station-13/upstream-merge-32942 deathride58andGitHub 2017-11-21 18:19:49 +00:00
• 2c65f5c6b5 Fixes dynamic lighting / nearstation area issues. ShizCalevandCitadelStationBot 2017-11-21 09:41:37 -05:00
• f1c54c0b77 implementation, changed 5 pixels Michiyamenotehifunana 2017-11-21 21:27:51 +08:00
• f0416d9c37 Fixes humans missing legs moving slower in zero-g enviroments CitadelStationBot 2017-11-21 04:01:56 -06:00
• f668f36156 Merge pull request #32928 from ShizCalev/space-leg-slowdown LeoandCitadelStationBot 2017-11-21 08:01:29 -02:00
• 8a64287249 Integrated circuit fixes and code improvements ACCountandCitadelStationBot 2017-11-21 12:04:09 +03:00
• 39920ff5ba Fixes computers deleting on build CitadelStationBot 2017-11-21 02:43:34 -06:00
• 35af5e49aa Fixes computers deleting on build (#32942) ShizCalevandCitadelStationBot 2017-11-21 03:42:50 -05:00
• 065a816183 QUICK HOTFIX deathride58 2017-11-21 01:54:25 -05:00
• 810b8a5d12 Automatic changelog generation for PR #4049 [ci skip] CitadelStationBot 2017-11-21 00:42:25 -06:00
• c1b344f08f Merge pull request #4049 from Citadel-Station-13/upstream-merge-32860 deathride58andGitHub 2017-11-21 06:42:22 +00:00
• 700f3f354c Automatic changelog generation for PR #3639 [ci skip] CitadelStationBot 2017-11-20 23:53:03 -06:00
• 2e210d08e1 Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING deathride58andGitHub 2017-11-21 05:53:00 +00:00
• fcac2a9fa7 compile deathride58 2017-11-21 00:40:59 -05:00
• e72399de7c pain deathride58 2017-11-21 00:29:15 -05:00
• 019b57316d i want to die deathride58 2017-11-20 23:53:14 -05:00
• fc5badc8e3 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860 deathride58 2017-11-20 23:50:52 -05:00
• 8b5585afcf Merge pull request #4045 from Citadel-Station-13/upstream-merge-32919 deathride58andGitHub 2017-11-21 04:43:04 +00:00
• d71aa73832 Automatic changelog generation for PR #4028 [ci skip] CitadelStationBot 2017-11-20 22:39:44 -06:00
• 2abd06e25e Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862 deathride58andGitHub 2017-11-21 04:39:41 +00:00
• 0d11dfc6ef COMPILE, FOUL CREATURE deathride58 2017-11-20 23:39:23 -05:00
• 4e727ee576 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860 deathride58 2017-11-20 23:34:46 -05:00
• f13a340eb4 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32919 deathride58 2017-11-20 23:27:31 -05:00
• 7e42e7cce0 Automatic changelog generation for PR #4033 [ci skip] CitadelStationBot 2017-11-20 22:16:29 -06:00
• 11cf2365f7 Merge pull request #4033 from Citadel-Station-13/upstream-merge-32856 deathride58andGitHub 2017-11-21 04:16:27 +00:00
• d2b251d23c Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844 deathride58andGitHub 2017-11-21 04:15:11 +00:00
• 8060461cf7 Automatic changelog generation for PR #4032 [ci skip] CitadelStationBot 2017-11-20 22:15:00 -06:00
• 441806c4e8 Merge pull request #4032 from Citadel-Station-13/upstream-merge-32846 deathride58andGitHub 2017-11-21 04:14:58 +00:00
• d52e405912 hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS deathride58 2017-11-20 23:12:58 -05:00
• a72625b486 adds missing icon file deathride58 2017-11-20 22:56:28 -05:00
• 8429bf5448 fixes merge conflicts deathride58 2017-11-20 22:53:39 -05:00
• ac2324fde8 fixes merge conflicts deathride58 2017-11-20 22:50:19 -05:00
• 48adeffc57 Fixes merge conflict deathride58 2017-11-20 22:47:08 -05:00
• 5e1e4ddf3f Automatic changelog generation for PR #4038 [ci skip] CitadelStationBot 2017-11-20 21:35:51 -06:00
• c0a6ada6d2 Merge pull request #4038 from Citadel-Station-13/upstream-merge-32894 deathride58andGitHub 2017-11-21 03:35:48 +00:00
• 0ed8bf3237 Update security_levels.dm deathride58andGitHub 2017-11-20 22:33:12 -05:00
• 3b0a71006c Update experimentor.dm deathride58andGitHub 2017-11-20 22:32:20 -05:00
• 15165d970d Update inventory.dm deathride58andGitHub 2017-11-20 22:29:55 -05:00
• 3aefa4a907 Update cameranet.dm deathride58andGitHub 2017-11-20 22:29:15 -05:00
• 1dddcb5d83 Update beesease.dm deathride58andGitHub 2017-11-20 22:28:29 -05:00
• d09be2a59a Update byjax.dm deathride58andGitHub 2017-11-20 22:27:58 -05:00
• 43faadce15 Automatic changelog generation for PR #4030 [ci skip] CitadelStationBot 2017-11-20 21:27:19 -06:00
• 6b8d256c21 Merge pull request #4030 from Citadel-Station-13/upstream-merge-32885 deathride58andGitHub 2017-11-21 03:27:16 +00:00
• b284385b20 Merge pull request #4042 from Citadel-Station-13/upstream-merge-32908 deathride58andGitHub 2017-11-21 03:26:26 +00:00
• 8249c89cc0 Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905 deathride58andGitHub 2017-11-21 03:25:55 +00:00
• 42987402a0 Automatic changelog generation for PR #4043 [ci skip] CitadelStationBot 2017-11-20 21:25:33 -06:00
• c67cc99bf8 Merge pull request #4043 from Citadel-Station-13/upstream-merge-32915 deathride58andGitHub 2017-11-21 03:25:30 +00:00
• 8bcc9fcb41 Merge pull request #4047 from Citadel-Station-13/upstream-merge-32859 deathride58andGitHub 2017-11-21 03:24:57 +00:00