Mercurial > nagslang
changeset 617:2070ce83637b
Merge
author | David Sharpe <decoydavid@gmail.com> |
---|---|
date | Sun, 08 Sep 2013 00:48:35 +0200 |
parents | 11a3ac7365cd (diff) 9ea26b835271 (current diff) |
children | cc94512d14f2 |
files | data/levels/cargo_bay data/levels/crew |
diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/data/levels/cargo_bay Sun Sep 08 00:32:32 2013 +0200 +++ b/data/levels/cargo_bay Sun Sep 08 00:48:35 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:32:32 2013 +0200 +++ b/data/levels/crew Sun Sep 08 00:48:35 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:32:32 2013 +0200 +++ b/data/levels/hangar Sun Sep 08 00:48:35 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: