Commit Graph

204 Commits

Author SHA1 Message Date
mwerezak
e57419c725 Status displays now won't blank when undocking, too 2014-07-01 22:18:04 -04:00
mwerezak
2a4600c80c Makes the escape shuttle NanoUI window bigger 2014-07-01 22:13:59 -04:00
mwerezak
1c7c48165b Reduces docking timeout to 20 seconds 2014-07-01 21:55:13 -04:00
mwerezak
191b4763b6 Fixes status displays blanking out when escape shuttle is about to launch 2014-07-01 21:54:50 -04:00
mwerezak
5a2e9ea298 Resets emergency shuttle authorization on arrival 2014-06-30 15:14:44 -04:00
mwerezak
9991b46ea6 long_jump() now uses an arrive_time var instead of sleeping the whole time.
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.
2014-06-30 15:14:20 -04:00
mwerezak
abc54987b4 Fixes escape shuttle requiring authorization after countdown has finished 2014-06-28 23:34:31 -04:00
mwerezak
4713c31546 Fixes shuttles getting stuck when cancelling launch 2014-06-28 19:40:39 -04:00
mwerezak
1cc840dccc Adds the ability to force launch escape pods
Also reduces their countdown from 15 to 10 seconds.
2014-06-28 19:40:18 -04:00
mwerezak
363df869e2 Improves the fix for shuttles being stuck if...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
mwerezak
deb1e1007c Fixes ERT shuttle not announcing a cancelled...
...launch if the launch is cancelled after the countdown is completed.
2014-06-26 17:21:45 -04:00
mwerezak
93c13a06d5 Fixes base shuttle console requiring engine access 2014-06-26 14:48:29 -04:00
mwerezak
363ef79301 Fixes shuttles getting stuck if the docking...
...controller they are trying to dock with has been destroyed or is not
responding.
2014-06-26 13:58:56 -04:00
mwerezak
ea1060ac33 Fixes shuttle consoles not checking access
Generalizes machine access.
2014-06-25 13:20:12 -04:00
mwerezak
d5c5d4b21f Adds escape pod docking controller type
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.

Also fixes emergency shuttle arrival announcement having the wrong ETD.
2014-06-25 12:32:12 -04:00
mwerezak
fccc16f8b8 Fix for long_jumps never leaving transition area
The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
2014-06-25 00:21:27 -04:00
mwerezak
05ced4b89d Fixes missing announcements, bad returned() check
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.
2014-06-25 00:18:56 -04:00
mwerezak
d892099ea3 Adds direction arg for area/move_contents_to()
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
2014-06-23 23:51:47 -04:00
mwerezak
ebacf05acf Fixes escape shuttle not transitioning 2014-06-23 23:50:49 -04:00
mwerezak
e17b8bffab Replaces the emergency shuttle control console
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.
2014-06-23 22:01:21 -04:00
mwerezak
9e0562b16c Adds shuttle controller
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
2014-06-23 22:00:57 -04:00
mwerezak
81f0f868b4 Minor shuttle fixes and cleanup
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
2014-06-23 01:55:43 -04:00
mwerezak
71351bd285 Some fixes 2014-06-22 20:40:08 -04:00
mwerezak
caece105dc Adds escape pods to the controller 2014-06-22 18:19:07 -04:00
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
mwerezak
1c91b2984d Supply controller now holds a ref to it's shuttle
Instead of having to look it up every time.
2014-06-22 14:18:52 -04:00
Zuhayr
69d25ea048 Merge pull request #5301 from mwerezak/cargo-shuttle2
Docking Controllers Stage 3: Cargo Shuttle
2014-06-19 21:08:29 +09:30
mwerezak
c28fd0ecb5 Adds supply shuttle docking controllers 2014-06-18 21:25:17 -04:00
mwerezak
5006ebde14 Makes the supply shuttle process in a tighter loop 2014-06-18 21:24:57 -04:00
mwerezak
e46c3c8834 Renames supply controller global var
Renamed from 'supply_shuttle' to 'supply_controller'
2014-06-18 19:37:46 -04:00
mwerezak
462593f0b5 Adds supply shuttle datum 2014-06-18 19:37:30 -04:00
mwerezak
2daab86c89 Fixes special shuttle consoles being...
...deconstructible
2014-06-18 09:37:30 -04:00
mwerezak
6d07d99885 Fixes old ferry shuttles (e.g. supply) not being able to use move() directly.
This shouldn't be necessary once the supply and emergency shuttles are
updated to the new system, however it will keep them working in the meantime.
2014-06-15 11:57:57 -04:00
mwerezak
4d12d263e9 Adds docking control to ERT shuttle
Also adjusts the location of the centcom shuttle docking controller.
2014-06-14 18:35:02 -04:00
mwerezak
40d9c4e26e Adds centcom and admin shuttle docking controllers 2014-06-14 15:52:26 -04:00
mwerezak
6b9d887a2d Adds engineering shuttle docking controllers
Also fixed bad req_access_txt. Was accidentally using req_access_txt
instead of req_one_access_txt. Fixed virology maint not having any
access codes set.
2014-06-14 15:51:46 -04:00
mwerezak
d837e5d246 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.
2014-06-14 15:51:26 -04:00
mwerezak
e30ffebe49 Adds mining shuttle docking controllers 2014-06-14 15:16:23 -04:00
mwerezak
dc7d8fafe0 Adjusts how undocking signals are used
Now both server and client will to undock concurrently. It looks much
more natural.
2014-06-14 15:16:05 -04:00
mwerezak
232e50e415 Shuttle console refactoring
Also adjusted the way undocking signals were used.
2014-06-14 15:15:48 -04:00
mwerezak
acec01fb14 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.
2014-06-14 15:15:30 -04:00
mwerezak
ed4fb8d3c6 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.
2014-06-10 00:05:08 -04:00
mwerezak
b4bb8ab31d Reworks shuttles to be more extensible
Kudos to Zuhayr for laying the groundwork for this.
2014-06-09 23:41:29 -04:00
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
mwerezak
730623e6e4 Adds support for different shuttle states
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
2014-06-09 23:38:53 -04:00
mwerezak
63ea6eba0d Adds docking controllers to shuttles
Shuttles dock at round start.
2014-06-09 23:37:37 -04:00
Zuhayr
99ffd06285 Moved the supply shuttle arrival/departure over to the shuttle datum. Needs testing, probably going to break. 2014-06-04 00:58:03 +09:30
Zuhayr
7a56a174dc Converted Syndicate shuttle over to multi-shuttle setup. 2014-06-04 00:08:10 +09:30
Zuhayr
54b08ff55a Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 2014-06-03 23:21:10 +09:30
Zuhayr
ca48504bf5 Update shuttle.dm
Corrected a mistake.
2014-06-03 18:08:35 +09:30