15 commits

Author	SHA1	Message	Date
John	6d24fb4390	Add merits unite which restocks 16.66% of the total merits required (meaning it needs a bit more than 6 unites to restock fully, even for BIg Cheese 23300 promotions.)	2015-06-17 10:08:57 -04:00
John	0f53845b05	DANIEL: Cogdo Tasks	2015-06-17 08:07:26 -04:00
John	065f9125fd	Fix cogdo tasks and add textures for it	2015-06-17 08:03:41 -04:00
John	b75336c8d6	Proper Cog Boss tasks (+ add AnyBoss task)	2015-06-17 08:01:06 -04:00
John	63b34432a2	Add CJ and CEO tasks, need to fix tasks tho.	2015-06-17 08:00:25 -04:00
John	35b646c4e6	Revert "Spring cleaning" ... This reverts commit 1e4bad8c6b.	2015-06-16 20:26:44 +03:00
John Cote	1e4bad8c6b	Spring cleaning	2015-06-15 20:56:12 -04:00
Master Jumblespeed	d882959bfa	switch to remote	2015-05-18 22:11:33 -04:00
DenialMC	04233eb9f3	Revert "Holocausted Welcome Valley" ... This reverts commit ad91b21823.	2015-04-07 17:19:50 +03:00
DenialMC	ad91b21823	Holocausted Welcome Valley	2015-04-07 16:30:49 +03:00
Daniel	c0f7d83b00	Prevent crashes	2015-03-23 15:02:20 +02:00
Daniel	e588890876	Fix track choice tasks (TODO: Lil Oldman)	2015-03-23 10:14:45 +02:00
Daniel	876868179c	Some phase_3 cleanup	2015-03-09 22:47:59 +02:00
Loudrob	1459efc86f	Added Zach's teleport button fixes.	2015-03-04 05:47:44 -05:00
Loudrob	02c7dc11e4	Initial commit	2015-03-03 17:10:12 -05:00