Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2011-07-31 18:52:15 +0000
committerEvan Goers <mega@osirion.org>2011-07-31 18:52:15 +0000
commit4cffe409d7356d58e3329a75c15099c2af6d7ecb (patch)
tree780a93534c18f5781318354dc440d42af0d4b1a9 /base
parent0981a22e5ad0ea2725299badd700eecde6c5f268 (diff)
updated crystals
changed jumpgate flare to a light
Diffstat (limited to 'base')
-rw-r--r--base/ini/cargo.ini1
-rw-r--r--base/maps/colonial/jumpgate.map16
-rw-r--r--base/textures/commodities/crystals.pngbin1439 -> 2727 bytes
3 files changed, 9 insertions, 8 deletions
diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index 9f18ee5..f1eefa4 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -19,6 +19,7 @@ info=A popular container used to store cargo during transport.
[cargo]
label=crystals
name=Crystals
+model=models/cargo/crystals/crystals
volume=1
info=A base component in optronic processing, anisotropic crystals are used to refract and focus the photon quantums and act as transistors in optronic circuits.
diff --git a/base/maps/colonial/jumpgate.map b/base/maps/colonial/jumpgate.map
index 085a6d5..5c419c9 100644
--- a/base/maps/colonial/jumpgate.map
+++ b/base/maps/colonial/jumpgate.map
@@ -14657,15 +14657,15 @@
}
// entity 33
{
-"classname" "fx_flare"
-"origin" "-2368 0 0"
-"flare" "2"
-"radius" "1024"
-"_color" "0 0.733333 1"
-}
-// entity 34
-{
"classname" "location_dock"
"origin" "2304 0 0"
"radius" "64"
}
+// entity 34
+{
+"classname" "light"
+"origin" "-2368.000000 0.000000 0.000000"
+"light" "1024"
+"flare" "2"
+"_color" "0 0.733333 1"
+}
diff --git a/base/textures/commodities/crystals.png b/base/textures/commodities/crystals.png
index 2425c85..5b2c21b 100644
--- a/base/textures/commodities/crystals.png
+++ b/base/textures/commodities/crystals.png
Binary files differ