Commit Graph

79 Commits

Author SHA1 Message Date
Atlantiscze
0fda5bf9b8 Nukeops shuttle docking
- Nukeops (or newly mercenaries) can now dock with the station. Two locations are available, maintenance between virology and xenobiology and arrivals.
- You always have to hack in or be let in. The door won't open on it's own. This is intentional as the shuttle is considered unrecognised by station's docking system. AI or anyone else can open the doors for you if needed.
- Also fixes bug which broke the shuttle console, since someone who was renaming nukeops to mercenaries forgot to change one line in antagonist.dm
2014-11-29 03:51:45 +01:00
ccomp5950
bec21da0cd AI's no longer able to use specop's shuttle console.
Keeps naughty AI's from launching it early.
2014-11-12 23:37:25 -05:00
PsiOmega
66483cf6dd Completes the transfer to the refreshed announcement system. 2014-10-07 13:19:20 +02:00
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
mwerezak
d81670edfb Fixes supply shuttle state when returning
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
2014-10-01 00:48:16 -04:00
Zuhayr
772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +09:30
Zuhayr
cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +09:30
mwerezak
f1a1162c3f Fixes shuttle ETA given before arrive_time is set 2014-08-24 22:43:19 -04:00
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce
Announcement Refactoring
2014-08-21 21:53:03 +04:00
PsiOmega
68bf885e6b Announcement system refactoring.
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast

Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.

Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
mwerezak
d8b6aecc32 Fixes escape shuttle announcing a negative ETA
Fixes the escape shuttle announcing a negative ETA when it leaves late.
2014-08-16 21:02:05 -04:00
mwerezak
2bd96ab29e Fixes multi docking port undocking conditions
The undocking conditions for multidocking ports (used by the escape
shuttle) were overly strict, failing if any door was open/unlocked.
Changed to allow undocking if at least one of the inner or outer doors
can close and lock.
2014-08-16 20:50:34 -04:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
mwerezak
55279f2fc0 Allows pod to be launched if shuttle leaves early 2014-07-30 15:45:21 -04:00
mwerezak
17574b8b20 Allows escape shuttle to scan IDs from within UI
Fixes #5592
2014-07-30 15:13:53 -04:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
Mloc
4981d620d0 Merge pull request #5507 from mwerezak/supply-shuttle-fix
Supply shuttle fixes
2014-07-05 23:16:42 +01:00
mwerezak
6d0a3b864d Shuttle now can only be late when arriving 2014-07-05 14:49:30 -04:00
mwerezak
cd6594f223 Fixes shuttle being late AFTER it arrives 2014-07-05 14:44:07 -04:00
Mloc
4c2767203c Merge pull request #5503 from mwerezak/heist-fix
Fixes Heist ending immediately
2014-07-05 11:32:37 +01:00
mwerezak
6e5824ac33 Fixes the supply shutting being stuck in warmup if forbidden atoms are aboard
Might be related to #5459, not sure though.
2014-07-04 19:52:50 -04:00
mwerezak
1aeb094a79 Fixes Heist ending immediately 2014-07-04 19:06:55 -04:00
Walter0o
3e95ad9786 adds shuttle_control access check to proper place 2014-07-04 21:38:39 +02:00
mwerezak
5a91dc8176 Fixes bad emergency shuttle can_force() check 2014-07-01 22:40:15 -04:00
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