16 Commits

Author	SHA1	Message	Date
LetterJay	7af461539f	Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"	2017-12-16 13:08:50 -06:00
kevinz000	253c819bc1	TG Sync 12/15/17 ... s s	2017-12-15 06:27:57 -08:00
Jordan Brown	7f997a6a6d	Adds feedback for explosions (#33511) ... * Adds feedback for explosions * Remove stray quote * Fixes + flash and flame	2017-12-14 14:00:51 -06:00
oranges	aa79fdd492	Merge pull request #32424 from lzimann/zlevelcapmultiplier ... Mining zlevel has a bomb cap of three times the configured cap	2017-11-05 15:13:11 -06:00
CitadelStationBot	d511bc1fde	[MIRROR] Fixes bombs on Reebe being an instant win (#3518) ... * Fixes bombs on Reebe being an instant win (#31503) * Probably reduces Reebe bombcap * wat * TTV warning * Less awkward wording * Fixes bombs on Reebe being an instant win	2017-10-21 03:47:07 -05:00
kevinz000	b20e5916ea	Removes a bunch of sleeps/spawns and makes a few booleans defines	2017-10-14 18:53:48 -05:00
Jordan Brown	7b30be0058	Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war ... In which the stoner one gets stoned and tries to address tick contention... again	2017-10-10 13:28:38 -05:00
Jordan Brown	e5ef3d2405	Configuration datum refactor	2017-09-28 21:37:53 -05:00
CitadelStationBot	36029ea7cb	Fixes explosion_block being inconsistent (#2236)	2017-08-03 06:00:35 -07:00
CitadelStationBot	3d53f888b1	Improves several Sound Loops' Performance	2017-07-31 14:35:16 -05:00
CitadelStationBot	55462ed7d1	Replaces ex_act and emp_act numbers with defines	2017-07-13 17:46:41 -05:00
Poojawa	b1b4826c0c	July 5th TG sync (#1883) ... July 5th TG sync	2017-07-05 22:14:19 -05:00
LetterJay	11ff6a7628	upstream-merge-27971	2017-06-11 08:21:14 -05:00
CitadelStationBot	6f54c40f03	Fixes doppler arrays	2017-06-02 16:14:48 -05:00
LetterJay	ae22a1876a	41 files changed, original only had 4. SPACES.	2017-05-30 14:36:11 -05:00
CitadelStationBot	11344c4682	Refactors explosions	2017-05-24 16:45:00 -05:00