Merge pull request #12647 from abcdefg30/mercFlag

Fix the mercenary faction having no valid flag
2017-01-31 20:01:03 +01:00
parent ed39e512dd 8b9f6f8e4e
commit 77c96db768
2 changed files with 4 additions and 3 deletions
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -97,9 +97,10 @@ flags: buttons.png
 	Random: 67,114,23,21
 	spectator: 67,114,23,21
 	corrino: 90,114,22,21
-	smuggler: 111,114,23,21
-	fremen: 133,114,23,21
-	worm: 156,114,23,21
+	smuggler: 112,114,22,21
+	fremen: 134,114,22,21
+	worm: 156,114,22,21
+	mercenary: 178,114,22,21

 # Used for the menu
 dialog: dialog.png
--- a/mods/d2k/uibits/buttons.png
+++ b/mods/d2k/uibits/buttons.png