Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMichael Rodenhurst <thorn@osirion.org>2010-12-03 16:10:03 +0000
committerMichael Rodenhurst <thorn@osirion.org>2010-12-03 16:10:03 +0000
commit3ef2eddc298f672deca9a99c15212dabc0654f0e (patch)
tree0b6cea19a62430dd9125f140e6cf04b2cb9779be /base
parent3230e1a0d81bff3bd19f5115bb4a9026d0efacf3 (diff)
rename model steel->carbosteel. link in cargo.ini
Diffstat (limited to 'base')
-rw-r--r--base/ini/cargo.ini1
-rw-r--r--base/models/cargo/carbosteel/carbosteel.ase (renamed from base/models/cargo/steel/steel.ase)4
-rw-r--r--base/models/cargo/carbosteel/carbosteel.png (renamed from base/models/cargo/steel/steel.png)bin290999 -> 290999 bytes
3 files changed, 3 insertions, 2 deletions
diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index 8eab927..d5deca6 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -25,6 +25,7 @@ info=A base component in optronic processing, anisotropic crystals are used to r
[cargo]
label=carbosteel
name=Carbosteel
+model=models/cargo/carbosteel/carbosteel
volume=1
info=The result of a metallurgic process to reinforce durasteel with carbon nano-fibres, carbosteel is a lightweight yet durable alloy capable of surviving exposure to extreme conditions.
info=It does not oxidize like regular durasteel and is widely used for anything from self-sealing stem bolts to ship hulls.
diff --git a/base/models/cargo/steel/steel.ase b/base/models/cargo/carbosteel/carbosteel.ase
index d1835a6..0e8f7e9 100644
--- a/base/models/cargo/steel/steel.ase
+++ b/base/models/cargo/carbosteel/carbosteel.ase
@@ -12,7 +12,7 @@
*MATERIAL_LIST {
*MATERIAL_COUNT 2
*MATERIAL 0 {
- *MATERIAL_NAME "models/cargo/steel/steel"
+ *MATERIAL_NAME "models/cargo/carbosteel/carbosteel"
*MATERIAL_CLASS "Standard"
*MATERIAL_AMBIENT 0.0000 0.0000 0.0000
*MATERIAL_DIFFUSE 0.8000 0.8000 0.8000
@@ -48,7 +48,7 @@
}
}
*MATERIAL 1 {
- *MATERIAL_NAME "models/cargo/steel/steel"
+ *MATERIAL_NAME "models/cargo/carbosteel/carbosteel"
*MATERIAL_CLASS "Standard"
*MATERIAL_AMBIENT 0.0000 0.0000 0.0000
*MATERIAL_DIFFUSE 0.8000 0.8000 0.8000
diff --git a/base/models/cargo/steel/steel.png b/base/models/cargo/carbosteel/carbosteel.png
index 2bc163e..2bc163e 100644
--- a/base/models/cargo/steel/steel.png
+++ b/base/models/cargo/carbosteel/carbosteel.png
Binary files differ