Chinsky 027b0d8ec6 Merge branch 'master' into dev-freeze ...

Conflicts:
	html/changelog.html

2013-11-30 05:16:49 +04:00

..

diseases

…

helper_datums

…

spells

…

ai_laws.dm

…

browser.dm

Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

2013-08-31 20:12:19 +01:00

computerfiles.dm

…

datacore.dm

…

datumvars.dm

Added abilities for nymphs/evolution to a final form.

2013-08-19 17:22:23 -07:00

disease.dm

Update disease.dm

2013-09-01 23:42:35 -07:00

mind.dm

Bugfix for new traitor panel.

2013-11-28 19:05:48 -06:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

…

spell.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

sun.dm

…

supplypacks.dm

Fixed the bug with supply not sending supermatter if only one crate (it was deleting it instead of deleting the process...odd)

2013-11-19 00:49:55 -06:00