Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

..

diseases

Changes most viable, used entries of plasma with phoron.

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

helper_datums

Fixes teleporting while buckled

2014-07-02 22:35:11 +02:00

spells

Beepsky and ED209 are now closer friends than ever, now actually sharing code instead of each having gone and bought their own.

2014-09-04 12:38:51 +02:00

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

Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.

2014-06-22 03:31:06 -07:00

computerfiles.dm

…

datacore.dm

The Syndicate uplink now only access the locked records, meaning it will be unaware of later in-round changes concerning a given character.

2014-09-02 07:12:13 +02:00

datumvars.dm

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

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

disease.dm

…

mind.dm

Master to dev merge.

2014-08-11 17:23:40 +09:30

mixed.dm

Powernets

2014-09-07 01:10:22 -04:00

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

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30