Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

diseases

Changes most viable, used entries of plasma with phoron.

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

helper_datums

Fixes #4756

2014-06-17 17:25:57 +01:00

spells

Adds docking support to shuttles, NanoUI

2014-06-09 23:41:08 -04: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

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

Fixes tails not rendering in record photos

2014-06-18 00:26:02 -04:00

datumvars.dm

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

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

disease.dm

Update disease.dm

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

mind.dm

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

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

mixed.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

modules.dm

…

organs.dm

…

recipe.dm

-You can now store donuts in the donut box. The next donut you pull out will be the last one you put in.

2012-07-20 00:12:50 +00:00

spell.dm

Cleaned the fuck out of smoke.

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

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