Mercurial > nagslang

changeset 618:cc94512d14f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author David Sharpe <decoydavid@gmail.com>
date Sun, 08 Sep 2013 00:49:13 +0200
parents 2070ce83637b (diff) 0b46e8524ec5 (current diff)
children c58487b4b473
files data/levels/crew data/levels/hangar
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/cargo_bay	Sun Sep 08 00:45:47 2013 +0200
+++ b/data/levels/cargo_bay	Sun Sep 08 00:49:13 2013 +0200
@@ -110,7 +110,7 @@
 - args:
   - [1800, 1265]
   - crew
-  - [108, 1623]
+  - [2935, 1205]
   - 0
   classname: Door
 - args:
--- a/data/levels/crew	Sun Sep 08 00:45:47 2013 +0200
+++ b/data/levels/crew	Sun Sep 08 00:49:13 2013 +0200
@@ -246,8 +246,8 @@
   name: room_one_two_exit
 - args:
   - [68, 1623]
-  - cargo_bay
-  - [1760, 1265]
+  - hangar
+  - [2680, 1675]
   - 0
   classname: Door
   name: to_cargo_bay
@@ -376,8 +376,8 @@
   name: mess_door_puzzle
 - args:
   - [2950, 1193]
-  - hangar
-  - [2680, 1675]
+  - cargo_bay
+  - [1760, 1265]
   - -45
   - hangar_door_puzzle
   classname: PuzzleDoor
--- a/data/levels/hangar	Sun Sep 08 00:45:47 2013 +0200
+++ b/data/levels/hangar	Sun Sep 08 00:49:13 2013 +0200
@@ -75,7 +75,7 @@
 - args:
   - [2680, 1701]
   - crew
-  - [2935, 1205]
+  - [110, 1650]
   - 90
   - keycard_red
   classname: KeyedDoor
@@ -104,11 +104,11 @@
   classname: ToggleSwitch
   name: maint_toggle_2
 - args:
-  - [160, 1661]
+  - [160, 1500]
   classname: FloorSwitch
   name: maint_switch_1
 - args:
-  - [1840, 1261]
+  - [1340, 1261]
   classname: FloorSwitch
   name: maint_switch_2
 - args: