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 |
|
Mark Aherne
|
128c310933
|
Work in progress on a major revision of the NanoUI templating system.
Conflicts:
nano/js/nano_base_helpers.js
nano/templates/advanced_airlock_console.tmpl
nano/templates/door_access_console.tmpl
nano/templates/escape_pod_console.tmpl
nano/templates/identification_computer.tmpl
nano/templates/omni_filter.tmpl
nano/templates/omni_mixer.tmpl
nano/templates/pda.tmpl
nano/templates/simple_docking_console_pod.tmpl
nano/templates/transfer_valve.tmpl
|
2014-07-15 07:10:30 -04:00 |
|
Jeremy Liberman
|
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 |
|