From 50edabe2569566a3552c41fee0d92ee978d94e2b Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 14 Jul 2016 20:32:31 +0200
Subject: Merged mega's changes to the camel.

---
 base/ini/ships.ini          |  2 +-
 base/maps/tsukhan/camel.map | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 9d320bd..8eada18 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -912,7 +912,7 @@ template=ship_large
 model=maps/tsukhan/camel
 jumpdrive=yes
 price=575000
-cargo=75
+cargo=150
 
 thrust  = 7.54
 impulse = 40
diff --git a/base/maps/tsukhan/camel.map b/base/maps/tsukhan/camel.map
index 085b4cc..5021193 100644
--- a/base/maps/tsukhan/camel.map
+++ b/base/maps/tsukhan/camel.map
@@ -4272,3 +4272,39 @@ tsukhan/tsukhan_grey50
 "origin" "-304.000000 208.000000 98.000000"
 "model" "maps/tsukhan/sections/radar"
 }
+// entity 33
+{
+"classname" "location_turret"
+"origin" "-288.000000 296.000000 20.000000"
+"angle" "89.999992"
+}
+// entity 34
+{
+"classname" "location_turret"
+"origin" "-288.000000 -296.000000 20.000000"
+"angle" "-90.000000"
+}
+// entity 35
+{
+"classname" "location_turret"
+"origin" "192.000000 -296.000000 20.000000"
+"angle" "-90.000000"
+}
+// entity 36
+{
+"classname" "location_turret"
+"origin" "192.000000 296.000000 20.000000"
+"angle" "89.999992"
+}
+// entity 37
+{
+"classname" "location_turret"
+"origin" "-150.000000 0.000000 148.000000"
+"angles" "-90.000000 0.000000 0.000005"
+}
+// entity 38
+{
+"classname" "location_turret"
+"origin" "0.000000 0.000000 -84.000000"
+"angles" "90.000000 0.000000 -0.000000"
+}
-- 
cgit v1.2.3