Commit Graph

14 Commits

Author SHA1 Message Date
Fox-McCloud
28eda8802a RIP Plamsa, we barely knew you...*salutes* 2015-07-01 02:40:35 -04:00
Fox-McCloud
4d04bb7750 Guts Moronic Phoron 2015-06-30 01:06:09 -04:00
mwerezak
f42244730b Removes duplicate defines, updates comments
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-07-13 07:30:39 -04:00
mwerezak
8459ed1b52 Fixes #5459
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-07-13 07:12:01 -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
mwerezak
f22c9db34d Streamlined docking code
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:29:02 -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
fbd4c870eb Docking overrides now have a clear purpose
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:19:53 -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
e9171a9ae3 Adds docking support to shuttles, NanoUI
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
2014-06-14 04:10:39 -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
mwerezak
ca65e48cdf Implemented docking commands
Squashed 4 commits.
2014-06-14 02:58:22 -04:00
mwerezak
5fae1db085 Initial commit
Conflicts:
	code/game/machinery/embedded_controller/airlock_program.dm
2014-06-14 02:58:00 -04:00