Zuhayr 772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +09:30

..

antagonist.dm

…

departmental.dm

…

escape_pods.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

shuttle_console.dm

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

shuttle_emergency.dm

Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +09:30

shuttle_ferry.dm

…

shuttle_specops.dm

…

shuttle_supply.dm

Shuttle now can only be late when arriving

2014-07-05 14:49:30 -04:00

shuttle.dm

Fixes shuttle ETA given before arrive_time is set

2014-08-24 22:43:19 -04:00

shuttles_multi.dm

…