Commit Graph

3 Commits

Author SHA1 Message Date
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system.
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
mwerezak
b67c56ff5a Improves multi-airlock docking UI 2014-06-26 07:35:44 -04:00
mwerezak
3033668671 Adds multi-airlock docking controller
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-26 07:31:07 -04:00