# HG changeset patch
# User David Sharpe <decoydavid@gmail.com>
# Date 1378569636 -7200
# Node ID cf4e2580f076de4b0317aa0701fd3e8d546431c9
# Parent  224604687a8f950476052d3f54091a142c393acb# Parent  1051e99cde11c1425ad5b8dc6287fceba3076352
Merge

diff -r 1051e99cde11 -r cf4e2580f076 data/levels/cargo_bay
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/levels/cargo_bay	Sat Sep 07 18:00:36 2013 +0200
@@ -0,0 +1,34 @@
+base_tile: tiles/floor.png
+enemies: []
+game_objects:
+- args:
+  - [10, 1200]
+  - hangar
+  - [2350, 1450]
+  - 0
+  classname: Door
+- args:
+  - [1700, 2510]
+  - 'HANGAR 7: Void lock failure detected - please call maintenance'
+  classname: Note
+- args:
+  - [1600, 1200]
+  - crew
+  - [90, 1610]
+  - 180
+  classname: Door
+- args:
+  - [1700, 2510]
+  - 'HANGAR 7: Void lock failure detected - please call maintenance'
+  classname: Note
+- args:
+  - [2100, 1300]
+  classname: Box
+lines: []
+polygons:
+  1:
+  - [1600, 2400]
+  - [1600, 10]
+  - [10, 10]
+  - [10, 2400]
+size: [1610, 2410]
diff -r 1051e99cde11 -r cf4e2580f076 data/levels/hangar
--- a/data/levels/hangar	Sat Sep 07 17:54:08 2013 +0200
+++ b/data/levels/hangar	Sat Sep 07 18:00:36 2013 +0200
@@ -71,8 +71,8 @@
   classname: Note
 - args:
   - [2400, 1450]
-  - crew
-  - [500, 1400]
+  - cargo_bay
+  - [60, 1200]
   - 0
   - keycard_red
   classname: KeyedDoor