mwerezak
40c6508ccb
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.
Conflicts:
code/modules/shuttles/shuttle.dm
2014-07-13 06:05:29 -04:00
mwerezak
9079bb353e
Improves the fix for shuttles being stuck if...
...
... the docking controller is destroyed.
2014-06-26 21:19:13 -04:00
mwerezak
38bf6b59c4
Fixes shuttles getting stuck if the docking...
...
...controller they are trying to dock with has been destroyed or is not
responding.
2014-06-26 16:53:11 -04:00
mwerezak
eb86081165
Adds direction arg for area/move_contents_to()
...
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
Conflicts:
code/modules/shuttles/shuttle.dm
code/setup.dm
2014-06-24 07:26:03 -04:00
mwerezak
d6e768fbfd
Fixes escape shuttle not transitioning
...
Conflicts:
code/modules/shuttles/shuttle.dm
2014-06-24 07:12:11 -04:00
mwerezak
e6944b989c
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.
Conflicts:
code/controllers/master_controller.dm
code/controllers/verbs.dm
code/game/supplyshuttle.dm
code/modules/shuttles/shuttle.dm
2014-06-24 07:06:48 -04:00
mwerezak
7e057e7eb9
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 11:10:28 -04:00
mwerezak
d8c02c7b6e
Some fixes
...
Conflicts:
code/game/supplyshuttle.dm
2014-06-23 11:09:14 -04:00
mwerezak
55532e51a0
Supply controller now holds a ref to it's shuttle
...
Instead of having to look it up every time.
Conflicts:
code/game/supplyshuttle.dm
2014-06-23 10:33:05 -04:00
ZomgPonies
2fd3ad5802
NSS Cyberiad to NGS Cyberiad
2014-06-21 17:02:35 -04:00
mwerezak
428bf6d350
Adds supply shuttle docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-19 10:13:48 -04:00
mwerezak
bc2fa7940a
Adds supply shuttle datum
2014-06-19 09:40:28 -04:00
ZomgPonies
4fb9cf4aa9
Final shuttle controller for ERT/DS shuttle.
2014-06-18 01:12:28 -04:00
ZomgPonies
a21ccf0139
Add the other shuttle controllers back in
2014-06-15 01:54:38 -04:00
ZomgPonies
9f9b2b5ae2
Commenting out the other docking controllers until I get science setup correctly.
2014-06-14 21:38:27 -04:00
mwerezak
e0d3e7e4d7
Adds docking control to ERT shuttle
...
Also adjusts the location of the centcom shuttle docking controller.
Conflicts:
code/modules/shuttles/shuttle.dm
maps/tgstation2.dmm
2014-06-14 21:33:05 -04:00
mwerezak
aa39abacec
Adds centcom and admin shuttle docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-14 21:29:47 -04:00
mwerezak
3dbb1fe6c9
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.
Conflicts:
maps/tgstation2.dmm
2014-06-14 21:29:25 -04:00
mwerezak
15641bc88a
Adds mining shuttle docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-14 21:25:18 -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
a54ef207a1
Reworks shuttles to be more extensible
...
Kudos to Zuhayr for laying the groundwork for this.
Conflicts:
code/controllers/master_controller.dm
code/modules/shuttles/shuttle.dm
2014-06-14 04:13:34 -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
629c14a66c
Adds support for different shuttle states
...
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
Conflicts:
code/modules/shuttles/shuttle.dm
2014-06-14 04:04:36 -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
Zuhayr
ed380b1dad
Moved the supply shuttle arrival/departure over to the shuttle datum. Needs testing, probably going to break.
2014-06-14 02:34:44 -04:00
Zuhayr
361503fa8b
Converted Syndicate shuttle over to multi-shuttle setup.
...
Conflicts:
baystation12.dme
code/game/gamemodes/nuclear/pinpointer.dm
2014-06-14 02:25:15 -04:00
Zuhayr
4385b1320c
Moved the Vox skipjack console over to a multi-destination shuttle datum setup.
...
Conflicts:
baystation12.dme
code/game/gamemodes/vox/heist/heist.dm
code/game/machinery/computer/vox_shuttle.dm
2014-06-14 02:22:11 -04:00
Zuhayr
e6a8680347
Update shuttle.dm
...
Corrected a mistake.
2014-06-14 02:11:05 -04:00
Zuhayr
7c442ac9a3
Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.
...
Conflicts:
code/controllers/master_controller.dm
code/modules/admin/admin.dm
2014-06-14 02:10:10 -04:00
Zuhayr
e4b95aa05e
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
...
Conflicts:
baystation12.dme
code/modules/mining/mine_items.dm
code/modules/research/research_shuttle.dm
2014-06-14 02:01:14 -04:00
