--- deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 00:49:36	1.6
+++ deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:13:55	1.7
@@ -1,128 +1,154 @@
-Object pentagram_111
+object pentagram_111
 name pentagram
 face pentagram.x11
-magicmap black
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
+magicmap black
 visibility 50
 end
-More
-Object pentagram_112
+more
+object pentagram_112
 name pentagram
-face pentagram.x12
-magicmap black
+face pentagram.x11
+x 1
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-x 1
+magicmap black
 visibility 50
 end
-More
-Object pentagram_113
+more
+object pentagram_113
 name pentagram
-face pentagram.x13
-magicmap black
+face pentagram.x11
+x 2
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-x 2
+magicmap black
 visibility 50
 end
-More
-Object pentagram_121
+more
+object pentagram_121
 name pentagram
-face pentagram.x21
+<<<<<<< pentagram.arc
+face pentagram.x11
 magicmap black
+=======
+face pentagram.x11
+y 1
+>>>>>>> 1.5
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-y 1
+magicmap black
 visibility 50
 end
-More
-Object pentagram_122
+more
+object pentagram_122
 name pentagram
-face pentagram.x22
+<<<<<<< pentagram.arc
+face pentagram.x11
 magicmap black
+=======
+face pentagram.x11
+x 1
+y 1
+>>>>>>> 1.5
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-y 1
-x 1
+magicmap black
 visibility 50
 end
-More
-Object pentagram_123
+more
+object pentagram_123
 name pentagram
-face pentagram.x23
+<<<<<<< pentagram.arc
+face pentagram.x11
 magicmap black
+=======
+face pentagram.x11
+x 2
+y 1
+>>>>>>> 1.5
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-y 1
-x 2
+magicmap black
 visibility 50
 end
-More
-Object pentagram_131
+more
+object pentagram_131
 name pentagram
-face pentagram.x31
+<<<<<<< pentagram.arc
+face pentagram.x11
 magicmap black
+=======
+face pentagram.x11
+y 2
+>>>>>>> 1.5
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-y 2
+magicmap black
 visibility 50
 end
-More
-Object pentagram_132
+more
+object pentagram_132
 name pentagram
-face pentagram.x32
+face pentagram.x11
 x 1
-magicmap black
+y 2
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-y 2
+magicmap black
 visibility 50
 end
-More
-Object pentagram_133
+more
+object pentagram_133
 name pentagram
-face pentagram.x33
+<<<<<<< pentagram.arc
+face pentagram.x11
 magicmap black
+=======
+face pentagram.x11
+x 2
+y 2
+>>>>>>> 1.5
 speed 0
 type 41
+no_pick 1
 activate_on_push 1
 activate_on_release 1
-no_pick 1
 editable 50
-x 2
-y 2
+magicmap black
 visibility 50
 end
+