Commit Graph
12385 Commits
Author SHA1 Message Date
deathride58andGitHub 83135ca4e0 Merge pull request #4997 from Citadel-Station-13/upstream-merge-34567
[MIRROR] Fixes Revs & Clockcultists being valid for mindswap
2018-01-21 22:39:53 +00:00
deathride58andGitHub 130b0f8d0d Merge pull request #4995 from Citadel-Station-13/upstream-merge-34695
[MIRROR] Fixes brother objectives not showing in TP
2018-01-21 22:37:52 +00:00
deathride58andGitHub 038591d11f Merge pull request #4994 from Citadel-Station-13/upstream-merge-34629
[MIRROR] Fixes ghost show_hud runtime
2018-01-21 22:37:34 +00:00
CitadelStationBot 3a34f68f9d Automatic changelog generation for PR #4993 [ci skip] 2018-01-21 16:37:10 -06:00
deathride58andGitHub 69b636f832 Merge pull request #4993 from Citadel-Station-13/upstream-merge-34692
[MIRROR] changes min players for revs to 30 from 20
2018-01-21 22:37:08 +00:00
deathride58andGitHub 0ce61fb375 Merge pull request #4987 from Citadel-Station-13/upstream-merge-34674
[MIRROR] Fixes get_area_name runtime
2018-01-21 22:36:50 +00:00
deathride58andGitHub 3e26ab5ceb Merge pull request #4990 from Citadel-Station-13/upstream-merge-34678
[MIRROR] Adds new eldritch longsword sprite
2018-01-21 22:36:24 +00:00
LetterJayandGitHub 923b72e138 Update ghost.dm 2018-01-21 14:19:48 -06:00
CitadelStationBot 02c005c0e2 Fixes Revs & Clockcultists being valid for mindswap 2018-01-21 12:29:12 -06:00
ShizCalevandCitadelStationBot 68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
CitadelStationBot f692ffaa0c Automatic changelog generation for PR #4992 [ci skip] 2018-01-21 12:01:45 -06:00
LetterJayandGitHub a074e10815 Merge pull request #4992 from Citadel-Station-13/upstream-merge-34679
[MIRROR] Fixes emergency lights literally never working
2018-01-21 12:01:43 -06:00
LetterJayandGitHub ba8122eebe Merge pull request #4991 from Citadel-Station-13/upstream-merge-34646
[MIRROR] Readability over micro-optimizations
2018-01-21 11:57:07 -06:00
LetterJayandGitHub c18ce156e2 Merge pull request #4989 from Citadel-Station-13/upstream-merge-34625
[MIRROR] Brass skewer runtime fix
2018-01-21 11:56:50 -06:00
CitadelStationBot 977b57573d Automatic changelog generation for PR #4988 [ci skip] 2018-01-21 11:56:42 -06:00
LetterJayandGitHub d60e61ecbc Merge pull request #4988 from Citadel-Station-13/upstream-merge-34691
[MIRROR] Fix Bananium Ore Overlay
2018-01-21 11:56:40 -06:00
LetterJayandGitHub c158d2f6dd Update game.dm 2018-01-21 11:56:09 -06:00
CitadelStationBot 327d4401cd Automatic changelog generation for PR #4986 [ci skip] 2018-01-21 11:55:54 -06:00
LetterJayandGitHub d24a9d02d3 Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497
[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)
2018-01-21 11:55:52 -06:00
CitadelStationBot 5029e1294f Automatic changelog generation for PR #4985 [ci skip] 2018-01-21 11:55:25 -06:00
LetterJayandGitHub a415630f0e Merge pull request #4985 from Citadel-Station-13/upstream-merge-34515
[MIRROR] Gas Reagents dump out based on container temperature
2018-01-21 11:55:23 -06:00
CitadelStationBot 26c34990fc Automatic changelog generation for PR #4984 [ci skip] 2018-01-21 11:54:18 -06:00
LetterJayandGitHub a29c1bee0b Merge pull request #4984 from Citadel-Station-13/upstream-merge-34485
[MIRROR] Couple of chemistry fixes
2018-01-21 11:54:16 -06:00
LetterJayandGitHub 15678c0ba7 Merge pull request #4983 from Citadel-Station-13/upstream-merge-34668
[MIRROR] Reinvigorates the disco inferno
2018-01-21 11:53:08 -06:00
LetterJayandGitHub b59c02f443 Merge pull request #4982 from Citadel-Station-13/upstream-merge-34630
[MIRROR] Cleans up some for's in ark_of_the_clockwork_justicar.dm
2018-01-21 11:52:41 -06:00
LetterJayandGitHub a138cc3e6a Merge pull request #4980 from Citadel-Station-13/upstream-merge-34687
[MIRROR] Adds nightlies and cdn info to readme
2018-01-21 11:51:22 -06:00
LetterJayandGitHub 9d8a375adc Update README.md 2018-01-21 11:50:40 -06:00
LetterJayandGitHub 81b425eb24 Merge pull request #4979 from Citadel-Station-13/upstream-merge-34683
[MIRROR] Matched wirecutter colors
2018-01-21 11:50:07 -06:00
CitadelStationBot b93bd3ca4c Automatic changelog generation for PR #4978 [ci skip] 2018-01-21 11:49:53 -06:00
LetterJayandGitHub e8e15dbc39 Merge pull request #4978 from Citadel-Station-13/upstream-merge-34682
[MIRROR] Gives greyscale wirecutters much more contrast.
2018-01-21 11:49:51 -06:00
LetterJayandGitHub d37a2bc93a Merge pull request #4977 from Citadel-Station-13/upstream-merge-34632
[MIRROR] Fixes tgui reload script
2018-01-21 11:49:36 -06:00
LetterJayandGitHub 9840a18b5a Merge pull request #4975 from Citadel-Station-13/upstream-merge-34654
[MIRROR] Actually fixes wag emote runtime
2018-01-21 11:49:13 -06:00
LetterJayandGitHub 7a43017325 Merge pull request #4974 from Citadel-Station-13/upstream-merge-34656
[MIRROR] Fixes missing MakeSlippery() args
2018-01-21 11:48:56 -06:00
CitadelStationBot 5e7710ee64 Automatic changelog generation for PR #4954 [ci skip] 2018-01-21 11:48:09 -06:00
LetterJayandGitHub 886459dcc3 Merge pull request #4954 from Citadel-Station-13/upstream-merge-34591
[MIRROR] Fixes slimes attacking people with the slime faction
2018-01-21 11:48:07 -06:00
LetterJayandGitHub 9bae4fdce0 Merge pull request #4949 from Citadel-Station-13/upstream-merge-34534
[MIRROR] Makes fire priority values defines
2018-01-21 11:47:41 -06:00
LetterJayandGitHub c5ec80819f Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571
[MIRROR] Low memory mode
2018-01-21 11:47:27 -06:00
CitadelStationBot c4f0e121dd Automatic changelog generation for PR #4929 [ci skip] 2018-01-21 11:47:10 -06:00
LetterJayandGitHub 23742c18c5 Merge pull request #4929 from Citadel-Station-13/upstream-merge-34133
[MIRROR] Temperature Refactor and Fixes
2018-01-21 11:47:08 -06:00
LetterJayandGitHub 8fe7ac2b6f Merge pull request #4927 from Citadel-Station-13/upstream-merge-34581
[MIRROR] Corrects some stacked turf
2018-01-21 11:46:51 -06:00
CitadelStationBot cf84e3a3d4 Fixes brother objectives not showing in TP 2018-01-21 09:16:06 -06:00
Jordan BrownandCitadelStationBot a7c9593aa6 Merge pull request #34695 from AnturK/brotherobjectivefix
Fixes brother objectives not showing in TP
2018-01-21 09:16:05 -06:00
Jordan BrownandCitadelStationBot c36b095146 Fixes ghost show_hud runtime 2018-01-21 09:14:50 -06:00
CitadelStationBot cd58592c86 changes min players for revs to 30 from 20 2018-01-21 09:13:37 -06:00
Jordan BrownandCitadelStationBot 0558e83ff8 Merge pull request #34692 from Tlaltecuhtli/revs
changes min players for revs to 30 from 20
2018-01-21 09:13:37 -06:00
CitadelStationBot d5e014ad41 Fixes emergency lights literally never working 2018-01-21 09:10:21 -06:00
Jordan BrownandCitadelStationBot 805a07de7e Merge pull request #34679 from Xhuis/patch-3
Fixes emergency lights literally never working
2018-01-21 09:10:20 -06:00
CitadelStationBot 34f27dc1ec Readability over micro-optimizations 2018-01-21 04:22:09 -06:00
Jordan BrownandCitadelStationBot 204759aee8 Readability over micro-optimizations (#34646) 2018-01-21 04:22:09 -06:00
CitadelStationBot 42deb64137 Adds new eldritch longsword sprite 2018-01-21 04:17:51 -06:00