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

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

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm

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

..

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 #4780

2014-05-01 23:58:47 -04:00

visibility_networks

Hopefully fixes the double push bug.

2014-05-18 10:22:29 +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

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

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

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

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

disease.dm

Update disease.dm

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

mind.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage

2014-05-13 20:45:05 -04:00

mixed.dm

…

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