Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2009-08-23 01:15:04 +0000
committerEvan Goers <mega@osirion.org>2009-08-23 01:15:04 +0000
commit2c8e3a3ab6e839ce05e25747c20c9cd92b9729c6 (patch)
treecb062259455bdae9de26a6b0757db1376d13070a
parent5df65c68bfcb50c4acbfe0a975fa52704d6109ff (diff)
Corrected an issue on the sharkan.
Added Scalar for sale at helianthos.
-rw-r--r--base/ini/zones/antwerp/helianthos.ini4
-rw-r--r--base/ini/zones/brogha/cantor.ini1
-rw-r--r--base/maps/colonial/sharkan.map15
3 files changed, 16 insertions, 4 deletions
diff --git a/base/ini/zones/antwerp/helianthos.ini b/base/ini/zones/antwerp/helianthos.ini
index 3434b12..68f4e68 100644
--- a/base/ini/zones/antwerp/helianthos.ini
+++ b/base/ini/zones/antwerp/helianthos.ini
@@ -6,4 +6,8 @@
; ship dealer
[dealer]
+ship=vector
+ship=matrix
+ship=tensor
+ship=scalar
ship=sharkan
diff --git a/base/ini/zones/brogha/cantor.ini b/base/ini/zones/brogha/cantor.ini
index e810530..590542d 100644
--- a/base/ini/zones/brogha/cantor.ini
+++ b/base/ini/zones/brogha/cantor.ini
@@ -9,5 +9,4 @@
ship=vector
ship=matrix
ship=pod
-`:wq
diff --git a/base/maps/colonial/sharkan.map b/base/maps/colonial/sharkan.map
index 3b086c9..878bda1 100644
--- a/base/maps/colonial/sharkan.map
+++ b/base/maps/colonial/sharkan.map
@@ -981,9 +981,7 @@
( 164 -26 24 ) ( 172 -26 24 ) ( 164 -26 -28 ) common/entity_shiny 0 0 0 0 0 0 0 0
( 178 -24 2 ) ( 170 -26 -2 ) ( 170 -26 2 ) common/entity_shiny 0 0 0 0 0 0 0 0
( 178 -22 -2 ) ( 178 -26 -2 ) ( 178 -22 50 ) common/entity_shiny 0 0 0 0 0 0 0 0
-( 154 24 2 ) ( 162 26 -2 ) ( 162 26 2 ) common/entity_shiny 0 0 0 0 0 0 0 0
-( 170 26 2 ) ( 170 26 -2 ) ( 178 24 2 ) common/entity_shiny 0 0 0 0 0 0 0 0
-( 168 26 24 ) ( 160 26 24 ) ( 168 26 -28 ) common/entity_shiny 0 0 0 0 0 0 0 0
+( 160 -22 -64 ) ( 164 -22 -64 ) ( 160 -22 64 ) common/caulk 0 0 0 1 1 0 0 0
}
// brush 101
{
@@ -1144,6 +1142,17 @@
( -64 18 24 ) ( -64 20 22 ) ( 64 18 24 ) colors/grey75_shiny 0 0 0 1 1 0 0 0
( 64 12 30 ) ( -64 12 28 ) ( -64 12 30 ) common/caulk 0 0 0 1 1 0 0 0
}
+// brush 118
+{
+( 162 -22 2 ) ( 162 -26 2 ) ( 154 -22 2 ) common/entity_shiny 0 0 0 0 0 0 0 0
+( 154 -24 -2 ) ( 162 -26 -2 ) ( 154 -22 -2 ) common/entity_shiny 0 0 0 0 0 0 0 0
+( 154 -22 50 ) ( 154 -26 -2 ) ( 154 -22 -2 ) common/caulk 0 0 0 0 0 0 0 0
+( 178 -22 -2 ) ( 178 -26 -2 ) ( 178 -22 50 ) common/entity_shiny 0 0 0 0 0 0 0 0
+( 154 24 2 ) ( 162 26 -2 ) ( 162 26 2 ) common/entity_shiny 0 0 0 0 0 0 0 0
+( 170 26 2 ) ( 170 26 -2 ) ( 178 24 2 ) common/entity_shiny 0 0 0 0 0 0 0 0
+( 168 26 24 ) ( 160 26 24 ) ( 168 26 -28 ) common/entity_shiny 0 0 0 0 0 0 0 0
+( 178 22 -64 ) ( 176 22 -64 ) ( 178 22 64 ) common/caulk 0 0 0 1 1 0 0 0
+}
}
// entity 1
{