9 Commits

Author	SHA1	Message	Date
CitadelStationBot	c8107c52cc	[MIRROR] Adjusts fire priorities of flightpacks, research, networks, and fields. (#5809) ... * Adjusts fire priorities of flightpacks, research, networks, and fields. (#36129) * Fire priorities * research lower not higher * Don't need to keep timing if it's automatically compensating for missed ticks. * Spelling * spelling * Adjusts fire priorities of flightpacks, research, networks, and fields.	2018-03-05 13:01:49 -06:00
Jordan Brown	c36f144d9e	Merge pull request #35792 from DaedalusGame/bitconnect ... Fixes multiserver mining formula	2018-02-19 22:09:55 -06:00
deathride58	1acdd3ce5c	controllers sync	2018-01-03 23:23:11 -05:00
LetterJay	d3f6cf4dd8	Merge branch 'master' into upstream-merge-33537	2017-12-30 13:14:48 -06:00
Buggy123	2c40a61968	Increases research point income by 33% (#33857)	2017-12-29 02:55:10 -06:00
LetterJay	7af461539f	Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"	2017-12-16 13:08:50 -06:00
oranges	75753a4dfd	Defines all subsystem priority values	2017-12-15 17:00:50 -06:00
kevinz000	253c819bc1	TG Sync 12/15/17 ... s s	2017-12-15 06:27:57 -08:00
CitadelStationBot	cc0b768c72	[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) ... * [READY] RND TECHWEBS + DEPARTMENTAL LATHES * resetting all the maps because we can worry about them later. * Regexing * I'm fucked * Fixes * . * maps * bleh * ree * fixes	2017-12-11 16:36:38 -08:00