Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-04 21:43:23 +0000
committerStijn Buys <ingar@osirion.org>2013-11-04 21:43:23 +0000
commit139815416e4d7822b1c9d3f00539d8ce9a4c1980 (patch)
treedb2e20344c87c567ed38a292a7f7d5f2f1a53883 /base
parentc479bcc06681e5b8da4b7ae9710d8141c8b496d9 (diff)
Added merchant faction color.
Diffstat (limited to 'base')
-rw-r--r--base/ini/factions.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index ab33bc4..f3c48a1 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -76,6 +76,8 @@ name=Mercenaries Guild
[faction]
label=merchants
name=Merchants Association
+color=24 132 8
+colorsecond=255 238 58
[faction]
label=pirates