From e6ea7d7ce193be370dd2587eecc77f43e2f0b949 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 13 Nov 2010 22:20:00 +0000
Subject: added factions and templates, zone description cleanup

---
 base/ini/factions.ini | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'base/ini/factions.ini')

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 4d5df22..4968832 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -41,8 +41,26 @@ name=Joint Miners Asssociation
 color=106 95 87
 colorsecond=152 166 169
 
+[faction]
+label=research
+name=Central Research
+colorsecond=152 166 169
+color=106 95 87
+
+[faction]
+label=independent
+name=Independent
+color=0.7 0.7 0.9
+colorsecond=0.7 0.8 0.95
+
 [faction]
 label=pirates
 name=Pirates
 color=158 0 255
 colorsecond=140 140 180
+
+[faction]
+label=tsukhan
+color=127 26 127
+colorsecond=0 0 0
+
-- 
cgit v1.2.3