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

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

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

..

diseases

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

helper_datums

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

spells

Fixed forcewalls.

2013-05-28 18:32:59 -07: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

NanoUI Optimizations.

2014-03-03 22:50:24 -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

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05: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