9 Commits

Author	SHA1	Message	Date
mwerezak	3ede5aa470	Adds default values for some docking tags ... Simplifies the mapping of docking controllers by cutting down on the number of tags needed to be entered. Conflicts: code/game/machinery/embedded_controller/simple_docking_controller.dm	2014-07-18 08:03:15 -04:00
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	e8b9375887	Allows escape pods to be armed from inside the pod ... Conflicts: code/game/machinery/embedded_controller/simple_docking_controller.dm	2014-07-13 06:27:01 -04:00
mwerezak	d68f682bc3	Improves simple docking controller UI	2014-06-26 07:35:32 -04:00
mwerezak	cdabebba3e	Adjusts how undocking signals are used ... Now both server and client will to undock concurrently. It looks much more natural. Conflicts: code/game/machinery/embedded_controller/docking_program.dm code/game/machinery/embedded_controller/simple_docking_controller.dm	2014-06-14 21:23:59 -04:00
mwerezak	cd540fe56d	Shuttle console refactoring ... Also adjusted the way undocking signals were used. Conflicts: code/game/machinery/doors/airlock_control.dm code/game/machinery/embedded_controller/docking_program.dm code/modules/shuttles/shuttle.dm	2014-06-14 21:22:30 -04:00
mwerezak	cc287d00db	Shuttles now dock on arrival and departure ... Squashes 3 commits: Shuttles now dock on arrival and departure Adds docking controller to outpost, tweaks Finishes off shuttle_console Could use some cleanup, though. Commented out the debug stuff. Conflicts: code/controllers/master_controller.dm code/game/machinery/embedded_controller/docking_program.dm code/game/machinery/embedded_controller/simple_docking_controller.dm code/modules/shuttles/shuttle.dm maps/tgstation2.dmm	2014-06-14 04:17:37 -04:00
mwerezak	1f90fe05c8	Adds docking controllers to shuttles ... Shuttles dock at round start. Conflicts: code/modules/shuttles/shuttle.dm maps/tgstation2.dmm	2014-06-14 03:58:51 -04:00
mwerezak	64edd31d67	Generalizes embedded program ... Conflicts: code/game/machinery/embedded_controller/embedded_controller_base.dm	2014-06-14 03:51:17 -04:00