Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

tgs-dmapi-update

tweaks-and-fixes

up-to-date

Mono Color

• 9806de310d Remove NODROP from water tank misters (#32995) Tad HardestyandCitadelStationBot 2017-11-24 03:05:30 -08:00
• 3a556450ae Custom docker improvements CitadelStationBot 2017-11-24 12:59:17 -06:00
• 0b07f80b62 custom docker improvements (#32626) Emmett GainesandCitadelStationBot 2017-11-24 06:44:12 -05:00
• c43591982a Refactor on_reagent_change to pass through the change type orangesandCitadelStationBot 2017-11-25 00:45:44 +13:00
• 525ef1bc65 gives janitors a liiiiiiiiiiiiil leeway deathride58 2017-11-24 01:59:39 -05:00
• a85ef09c68 Bullies janitor mains - Makes walking on tiles slowly make them dirty deathride58 2017-11-24 01:56:18 -05:00
• 9f7b3a11c3 Automatic changelog generation for PR #4095 [ci skip] CitadelStationBot 2017-11-24 00:42:54 -06:00
• 470f4169df Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018 deathride58andGitHub 2017-11-24 06:42:51 +00:00
• d5d89a57b4 Update stock_parts.dm deathride58andGitHub 2017-11-23 23:50:25 -05:00
• 876b3ebff0 Automatic changelog generation for PR #4084 [ci skip] CitadelStationBot 2017-11-23 22:41:57 -06:00
• aade2d210a Merge pull request #4084 from deathride58/mapfixes11222017 LetterJayandGitHub 2017-11-23 22:41:54 -06:00
• e60399e402 Merge pull request #4090 from Citadel-Station-13/upstream-merge-32997 deathride58andGitHub 2017-11-24 02:30:47 +00:00
• 2147c60b7f Replaces "console screen" stock part with glass sheets ACCountandCitadelStationBot 2017-11-24 03:53:18 +03:00
• 9a46efd304 Merge pull request #4094 from Citadel-Station-13/kevinz000-patch-1 deathride58andGitHub 2017-11-24 00:47:12 +00:00
• 399c2ebfcc Update _compile_options.dm kevinz000andGitHub 2017-11-23 16:37:49 -08:00
• 751b61a9ab Merge pull request #4065 from Poojawa/layering-memes deathride58andGitHub 2017-11-24 00:20:29 +00:00
• de27afbc61 Merge pull request #4093 from Citadel-Station-13/upstream-merge-33045 deathride58andGitHub 2017-11-24 00:19:42 +00:00
• f83ce9cd11 Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937 deathride58andGitHub 2017-11-24 00:19:24 +00:00
• de9cfb2b7c Update brain_damage_lines.json deathride58andGitHub 2017-11-23 19:14:21 -05:00
• 6d6afcd588 Merge pull request #4091 from Citadel-Station-13/upstream-merge-33041 deathride58andGitHub 2017-11-24 00:11:16 +00:00
• eb722bf59f Merge branch 'master' into upstream-merge-33045 deathride58andGitHub 2017-11-24 00:10:36 +00:00
• efe10a1ee7 Merge pull request #4089 from Citadel-Station-13/upstream-merge-32979 deathride58andGitHub 2017-11-24 00:08:36 +00:00
• d912152d65 Merge pull request #4085 from Citadel-Station-13/upstream-merge-33010 deathride58andGitHub 2017-11-24 00:08:12 +00:00
• b2bb942817 Fixes component runtimes Jordan BrownandCitadelStationBot 2017-11-23 14:12:02 -05:00
• aaa83112e8 Lowers the stress the dna console puts on the string tree CitadelStationBot 2017-11-23 12:07:17 -06:00
• 8943bf0184 Merge pull request #33041 from MrStonedOne/patch-452 Jordan BrownandCitadelStationBot 2017-11-23 13:06:33 -05:00
• 67d495c053 Fixes strings runtime LeoandCitadelStationBot 2017-11-23 09:48:03 -02:00
• 89b9ec51de Adds some sanity checks to component creation CitadelStationBot 2017-11-23 05:47:32 -06:00
• 598f0dc580 Merge pull request #32979 from tgstation/Cyberboss-patch-4 LeoandCitadelStationBot 2017-11-23 09:47:03 -02:00
• 0ca050563f fixes merge conflicts deathride58 2017-11-22 23:43:03 -05:00
• 1b094a4374 Fixes deleted turfs ShizCalevandCitadelStationBot 2017-11-22 23:00:33 -05:00
• c81ebbfc24 fixes boxstation issues, readds removed boxstation areas deathride58 2017-11-22 22:18:40 -05:00
• c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914 deathride58andGitHub 2017-11-23 01:40:54 +00:00
• 3a79211614 Automatic changelog generation for PR #4080 [ci skip] CitadelStationBot 2017-11-22 19:15:06 -06:00
• abd432d289 Merge pull request #4080 from Citadel-Station-13/upstream-merge-32999 deathride58andGitHub 2017-11-23 01:15:04 +00:00
• 8c4f52c9b1 Update README.md deathride58andGitHub 2017-11-22 20:14:50 -05:00
• d5a8e2f13b Update telecomms_designs.dm deathride58andGitHub 2017-11-22 20:10:41 -05:00
• 435ac739fc Update machine_circuitboards.dm deathride58andGitHub 2017-11-22 20:09:18 -05:00
• 5fb8856480 Update subsystems.dm deathride58andGitHub 2017-11-22 20:07:57 -05:00
• cf01fa79db Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801 deathride58andGitHub 2017-11-23 01:04:20 +00:00
• ea577e2d9e Automatic changelog generation for PR #4075 [ci skip] CitadelStationBot 2017-11-22 19:03:41 -06:00
• ad3608caeb Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699 deathride58andGitHub 2017-11-23 01:03:38 +00:00
• eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 LetterJayandGitHub 2017-11-22 18:42:34 -06:00
• 72f14418f1 Update holder.dm deathride58andGitHub 2017-11-22 17:59:42 -05:00
• 738c1b7b2a Update implantuplink.dm deathride58andGitHub 2017-11-22 17:57:43 -05:00
• 1d4e3612ea Update PDA.dm deathride58andGitHub 2017-11-22 17:56:49 -05:00
• c69f933f15 Update uplink_items.dm deathride58andGitHub 2017-11-22 17:55:49 -05:00
• c97e8805f6 Update hostile.dm deathride58andGitHub 2017-11-22 17:53:36 -05:00
• 29d4b023f0 Update podpeople.dm deathride58andGitHub 2017-11-22 17:51:36 -05:00
• 6bfba3ea03 Update lizardpeople.dm deathride58andGitHub 2017-11-22 17:50:23 -05:00
• 93a2d653bf Update humans.dm deathride58andGitHub 2017-11-22 17:48:56 -05:00
• 3f07d95b56 Update corporate.dm deathride58andGitHub 2017-11-22 17:46:40 -05:00
• fc2a0f48fa Update DNA.dm deathride58andGitHub 2017-11-22 17:45:15 -05:00
• eeaa90a897 Merge pull request #4079 from Citadel-Station-13/upstream-merge-32945 deathride58andGitHub 2017-11-22 22:41:28 +00:00
• 87653021f6 Automatic changelog generation for PR #4077 [ci skip] CitadelStationBot 2017-11-22 16:40:57 -06:00
• 854a838c7d Merge pull request #4077 from Citadel-Station-13/upstream-merge-32943 deathride58andGitHub 2017-11-22 22:40:54 +00:00
• 8d39fb9dce merges https://github.com/tgstation/tgstation/pull/32678 deathride58 2017-11-22 17:40:25 -05:00
• b6630b41d1 merges #3877 proper deathride58 2017-11-22 17:37:22 -05:00
• 60b2c25668 donator item modularization + manual sync of sprites upstream deathride58 2017-11-22 17:16:37 -05:00
• c2c22d56c7 [READY]NTnet refactor, assimilates exonet orangesandCitadelStationBot 2017-11-23 10:52:44 +13:00
• b9e37a74c7 Specifies that MariaDB is required for sql in the project readme orangesandCitadelStationBot 2017-11-23 10:40:07 +13:00
• 23e3f7f877 Fixes bad text2file call CitadelStationBot 2017-11-22 15:39:16 -06:00
• 2615ddd226 Merge pull request #32945 from tgstation/Cyberboss-patch-1 orangesandCitadelStationBot 2017-11-23 10:38:12 +13:00
• 521f422f20 Adds ip and cid to banning panel ban search CitadelStationBot 2017-11-22 15:38:07 -06:00
• 31b9828285 Adds ip and cid to banning panel ban search (#32801) JordieandCitadelStationBot 2017-11-23 08:37:09 +11:00
• 66c7e6de6f Fixes aliums showing wrong sprite in softcrit CitadelStationBot 2017-11-22 15:37:57 -06:00
• 7c1fe79635 Merge pull request #32943 from ShizCalev/alium-softcrit-sprite orangesandCitadelStationBot 2017-11-23 10:37:58 +13:00
• 783960a986 Divides species in subtypes, makes viruses able to infect certain subtypes XDTMandCitadelStationBot 2017-11-22 22:36:09 +01:00
• 8458dc952c Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale GupGupandCitadelStationBot 2017-11-22 16:23:26 -05:00
• cec6c028f5 [READY]Refactors uplinks to a component! orangesandCitadelStationBot 2017-11-23 10:16:16 +13:00
• 2e9f3bc1c0 Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968 deathride58andGitHub 2017-11-22 20:50:45 +00:00
• 626cc30a84 Automatic changelog generation for PR #4059 [ci skip] CitadelStationBot 2017-11-22 14:50:01 -06:00
• bf6f920754 Merge pull request #4059 from Citadel-Station-13/upstream-merge-32944 deathride58andGitHub 2017-11-22 20:49:58 +00:00
• b90b18cc27 recompiles tgui deathride58 2017-11-22 15:38:43 -05:00
• 1ab94199d1 Merge pull request #4046 from Citadel-Station-13/kevinz000-patch-1 deathride58andGitHub 2017-11-22 20:00:44 +00:00
• c3cf47dd5c Automatic changelog generation for PR #4060 [ci skip] CitadelStationBot 2017-11-22 13:57:22 -06:00
• 5e43516925 Merge pull request #4060 from Citadel-Station-13/upstream-merge-32955 deathride58andGitHub 2017-11-22 19:57:19 +00:00
• 3b1067ba7a Update pants.dm deathride58andGitHub 2017-11-22 14:56:26 -05:00
• c5adadc5d1 Update engineering.dm deathride58andGitHub 2017-11-22 14:54:01 -05:00
• 5d2c5add1f Update color.dm deathride58andGitHub 2017-11-22 14:50:37 -05:00
• b24c9335b3 Update jobs.dm deathride58andGitHub 2017-11-22 14:48:35 -05:00
• 5e6e725666 Update color.dm deathride58andGitHub 2017-11-22 14:47:15 -05:00
• 2dbe3e3b82 Update chameleon.dm deathride58andGitHub 2017-11-22 14:46:06 -05:00
• d86bdf2150 Update trash.dm deathride58andGitHub 2017-11-22 14:44:09 -05:00
• 166087190c Automatic changelog generation for PR #4069 [ci skip] CitadelStationBot 2017-11-22 13:42:05 -06:00
• 7bc195c055 Merge pull request #4069 from Citadel-Station-13/upstream-merge-32970 deathride58andGitHub 2017-11-22 19:42:02 +00:00
• 978d495196 Automatic changelog generation for PR #4067 [ci skip] CitadelStationBot 2017-11-22 13:41:31 -06:00
• c696ba46b0 Merge pull request #4067 from Citadel-Station-13/upstream-merge-32957 deathride58andGitHub 2017-11-22 19:41:28 +00:00
• fb60ee1015 Automatic changelog generation for PR #4066 [ci skip] CitadelStationBot 2017-11-22 13:40:58 -06:00
• 11ecf4d922 Merge pull request #4066 from Citadel-Station-13/upstream-merge-32701 deathride58andGitHub 2017-11-22 19:40:55 +00:00
• 293025e6c4 Automatic changelog generation for PR #4072 [ci skip] CitadelStationBot 2017-11-22 13:40:07 -06:00
• 8765daacfb Merge pull request #4072 from Citadel-Station-13/upstream-merge-32976 deathride58andGitHub 2017-11-22 19:40:04 +00:00
• 3b063a3822 Merge pull request #4070 from Citadel-Station-13/upstream-merge-32973 deathride58andGitHub 2017-11-22 19:39:35 +00:00
• 889defd2ce Update _event.dm deathride58andGitHub 2017-11-22 14:29:13 -05:00
• 8efbcc9cb0 Update time_track.dm deathride58andGitHub 2017-11-22 14:28:25 -05:00
• 2934effd36 Update blackbox.dm deathride58andGitHub 2017-11-22 14:27:10 -05:00
• b925c0e265 Update server.dm deathride58andGitHub 2017-11-22 14:20:45 -05:00
• 965b408683 Simple wall turret buff CitadelStationBot 2017-11-22 12:44:59 -06:00
• 64c7fa0cfd Simple wall turret buff (#32937) AnturKandCitadelStationBot 2017-11-22 19:44:27 +01:00
• b139e6b075 Adds round ID to status world topic CitadelStationBot 2017-11-22 12:41:44 -06:00