Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base/ini
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-09-17 19:00:40 +0000
committerStijn Buys <ingar@osirion.org>2010-09-17 19:00:40 +0000
commit868cb6ad218494b59d6c9762497fad8e96a46b6d (patch)
tree6fd3ed230abf255d57248f778214c96fb37b913c /base/ini
parent761dace10ac858058b6083968887cca767651b2f (diff)
Dockable custodian, crate_bs carge
Diffstat (limited to 'base/ini')
-rw-r--r--base/ini/cargo.ini6
-rw-r--r--base/ini/ships.ini2
-rw-r--r--base/ini/zones/unknown.ini2
3 files changed, 9 insertions, 1 deletions
diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index 9154a29..2d99855 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -1,4 +1,10 @@
[cargo]
+label=crate_bs
+name=Big Box of BS
+info=This mysterious container is said to contain anything the owner's heart desires. Few people actually believe this, but the ones who do are usually prepared to pay generously.
+model=maps/cargo/crate_bs
+
+[cargo]
label=antracite
name=Antracite
info=Black coal, usually found underground.
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 1f1450f..abc2de0 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -152,6 +152,8 @@ acceleration=0.6
maxspeed=2.5
turnspeed=20
jumpdrive=yes
+dock=yes
+info=The Custodian class battleship is the Independent Colonies most valued long-range fighter carrier. Equiped with a jumpdrive and a sizeable launch bay, this battleship is a force to be reckoned with.
[ship]
label=sharkan
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index 04ca5c5..d6e5e4e 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -16,7 +16,7 @@ color=0.5 0 0
colorsecond=0.8 0.2 0
[entity]
-label=matrix
+label=tensor
name=Micron Tensor
model=maps/merchant/tensor
location=4 0 0