Zuhayr 1e135f91af Merge resolution with master.

2014-06-02 12:05:12 +09:30

..

diseases

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

helper_datums

Spelling correction: tratior and Tratior to traitor and Traitor

2014-04-22 01:12:17 -07:00

spells

Fixes #4973

2014-06-01 20:46:58 +09:30

ai_laws.dm

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-10 01:40:11 +09:30

browser.dm

…

computerfiles.dm

…

datacore.dm

Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!

2014-04-27 01:00:16 -06:00

datumvars.dm

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

disease.dm

…

mind.dm

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

…

spell.dm

…

sun.dm

Code effeciency project: Sun datum

2014-02-13 05:36:46 -06:00

supplypacks.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00