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

Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

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

2014-05-03 16:56:19 +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

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

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

VV drop down menu to resend NanoUI resource files.

2014-03-21 23:03:06 -05:00

disease.dm

Update disease.dm

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

mind.dm

Spelling correction: tratior and Tratior to traitor and Traitor

2014-04-22 01:12:17 -07: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

Code effeciency project: Sun datum

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

supplypacks.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00