189 commits

Author	SHA1	Message	Date
John	a4708291ac	33% instead of 16%	2015-06-17 10:10:38 -04:00
John	468c192c14	Add tickets unite and make cog icons a bit smaller in the merits unite	2015-06-17 10:09:53 -04:00
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	8751f73779	DANIEL: More cleanup	2015-06-17 10:04:20 -04:00
John	78a7662ff4	Fix wedding cake pie	2015-06-17 10:01:55 -04:00
John	6b5226e9e3	Organic display	2015-06-17 09:58:54 -04:00
John	f42631b401	No XP cap	2015-06-17 09:58:43 -04:00
John	be659d24f7	DANIEL: Talkative tyler fix	2015-06-17 09:58:04 -04:00
John	704923f53a	DANIEL: Merits on inventory page	2015-06-17 09:50:29 -04:00
John	90a8e5a2f2	Don't hide laff meter based on full hp	2015-06-17 09:49:57 -04:00
John	8262d5afa4	Destroy head meter on toon destroy	2015-06-17 09:49:43 -04:00
John	e9842a8b65	Laff meter above head in bosses	2015-06-17 09:49:30 -04:00
John	def7ca4372	Max true friends + cleanup	2015-06-17 09:49:18 -04:00
John	7a9da93d39	DANIEL: Crash fixes	2015-06-17 09:47:43 -04:00
John	67f7c45f68	DANIEL: Chat color shit	2015-06-17 09:37:55 -04:00
John	e082fecf0b	DANIEL: Fix whispering	2015-06-17 09:35:54 -04:00
John	898d57dc1f	Fix ~ whitelist exploit, add True Friends and Speedchat Plus warnings.	2015-06-17 09:29:56 -04:00
John	702260b1b7	DANIEL: Cast member button shit	2015-06-17 09:23:45 -04:00
John	4e60722277	This was just debug	2015-06-17 09:21:58 -04:00
John	b72a755617	Unique toon identifier in avatar panel	2015-06-17 09:21:21 -04:00
John	7bad238cbe	DANIEL: New npc friends page	2015-06-17 09:20:54 -04:00
John	0c56b7c78d	DANIEL: True friends	2015-06-17 09:15:30 -04:00
John	338d83a907	DANIEL: Friends cleanup	2015-06-17 09:10:17 -04:00
John	6377cec192	Fix laff meter disappearing after using Painter Joey	2015-06-17 09:08:18 -04:00
John	93e0c04dce	DANIEL: db values cleanup	2015-06-17 09:08:02 -04:00
John	1749768a8d	DANIEL: TalkAssistant cleanup	2015-06-17 09:06:48 -04:00
John	b48fb01fb0	DANIEL: Work on whitelist	2015-06-17 09:01:28 -04:00
John	33f99305df	DANIEL: Work on chat	2015-06-17 08:57:10 -04:00
John	d9454000b4	Work on chat garbler	2015-06-17 08:46:14 -04:00
John	a6e7fb9d83	Darn, this was necessary after all.	2015-06-17 08:29:22 -04:00
John	aeed161e9a	Misc stuff	2015-06-17 08:28:54 -04:00
John	e3a76a4bbf	Redirect to correct area if player goes sad in a cog battle	2015-06-17 08:28:33 -04:00
John	f1ffdc9a1e	DANIEL: Proper toonKilledCogs method	2015-06-17 08:24:00 -04:00
John	6bfb28c36f	Add tank item to cattlelog	2015-06-17 08:15:28 -04:00
John	d92c28de27	Remove single cog summon, add Field Office cog summon, add V2 invasion cog summon, add Cog name to V2 invasion bulletins.	2015-06-17 08:14:19 -04:00
John	8c47aa0fd0	Added PBN nametag font	2015-06-17 08:08:34 -04:00
John	755c9afc6a	Fix house in cattlelog	2015-06-17 08:08:15 -04:00
John	0f53845b05	DANIEL: Cogdo Tasks	2015-06-17 08:07:26 -04:00
John	81728b339a	DANIEL: Better glove NPC	2015-06-16 19:41:34 -04:00
Loudrob	e22248e742	Merge commit 'ea14534efb0dc67c86459c86d327b160111e3f60'	2015-06-16 19:14:25 -04:00
Loudrob	e702145334	DANIEL: Remove Welcome Valley '9a4af9c686edd4c45ea1ced13e72376493fe8a11'	2015-06-16 19:13:24 -04:00
John	64b1f372a8	Splash Effect fix	2015-06-16 20:30:38 +03: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
Loudrob	8a01138fc6	Less dan.	2015-06-11 08:33:28 -04:00
Zach	990dcd0d5f	lel	2015-06-02 22:55:38 -05:00
Zach	9033861dfb	pillow gravity	2015-06-01 16:14:34 -05:00
Zach	3056946f04	laff restock npc's suits fixed	2015-05-27 02:08:39 -05:00
Zach	2545b2ba37	forgot these. also remove magic cat sos	2015-05-26 17:58:02 -05:00
Zach	f0ac25e0f9	rental suits	2015-05-26 17:57:35 -05:00