Jeremy LibermanandZomgPonies f43ef06431 Virology - NanoUI, gameplay tweaks, bugfixes ...

Conflicts:
	.gitignore
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/machinery.dm
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/virus2/isolator.dm
	nano/js/nano_base_helpers.js

2014-04-19 15:42:49 -04:00

..

css

Comm console is now NanoUI. Fixes github #489, hopefully.

2014-02-15 15:33:45 -05:00

images

PDA NanoUI

2013-12-22 16:03:21 -05:00

js

Virology - NanoUI, gameplay tweaks, bugfixes

2014-04-19 15:42:49 -04:00

maptools

Space Ninja Spawn and Stealth Glove Fix

2013-12-23 19:39:50 -05:00

templates

Virology - NanoUI, gameplay tweaks, bugfixes

2014-04-19 15:42:49 -04:00

debug.html

Template fixes

2014-01-05 01:57:11 -05:00

NTLogoRevised.fla

BS12 -> Ponies merge

2013-09-09 10:51:16 -04:00

uiBackground.fla

BS12 -> Ponies merge

2013-09-09 10:51:16 -04:00