Edited some ships.

Split the researchstation model into a separate ase model.

4 files changed, 194 insertions, 35 deletions

diff --git a/base/maps/mercenary/archer.map b/base/maps/mercenary/archer.map
index 3e8bc67..d157315 100644
--- a/base/maps/mercenary/archer.map
+++ b/base/maps/mercenary/archer.map
@@ -320,13 +320,13 @@
 // entity 7
 {
 "classname" "misc_model"
-"origin" "-64.000000 -48.000000 8.000000"
+"origin" "-68.000000 -48.000000 8.000000"
 "model" "maps/mercenary/sections/archer_wing_starboard"
 }
 // entity 8
 {
 "classname" "misc_model"
-"origin" "-64.000000 48.000000 8.000000"
+"origin" "-68.000000 48.000000 8.000000"
 "model" "maps/mercenary/sections/archer_wing_port"
 }
 // entity 9
diff --git a/base/maps/mercenary/pod.map b/base/maps/mercenary/pod.map
index b5bcd6e..dd65024 100644
--- a/base/maps/mercenary/pod.map
+++ b/base/maps/mercenary/pod.map
@@ -8,18 +8,18 @@
 ( 192 -48 16 ) ( 192 -24 40 ) ( 288 -24 16 ) glass/dark 0 0 0 1 1 0 0 0
 ( 192 -16 40 ) ( 192 -24 40 ) ( 192 -16 16 ) common/caulk 0 0 0 1 1 0 0 0
 ( 288 -16 16 ) ( 192 -24 40 ) ( 192 -16 40 ) glass/dark 0 0 0 1 1 0 0 0
-( 192 -48 16 ) ( 288 -24 16 ) ( 288 -24 8 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( 288 0 8 ) ( 288 -24 8 ) ( 288 -24 16 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 192 -48 16 ) ( 288 -24 16 ) ( 288 -24 8 ) common/entity_second 0 0 0 1 1 0 0 0
+( 288 0 8 ) ( 288 -24 8 ) ( 288 -24 16 ) common/entity_second 0 0 0 1 1 0 0 0
 ( 192 -48 8 ) ( 320 0 8 ) ( 192 0 8 ) common/caulk 0 0 0 1 1 0 0 0
 ( 288 24 16 ) ( 192 24 40 ) ( 192 48 16 ) glass/dark 0 0 0 1 1 0 0 0
-( 288 24 8 ) ( 288 24 16 ) ( 192 48 16 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 288 24 8 ) ( 288 24 16 ) ( 192 48 16 ) common/entity_second 0 0 0 1 1 0 0 0
 }
 // brush 1
 {
-( 136 48 16 ) ( 128 48 16 ) ( 136 48 8 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 136 48 16 ) ( 128 48 16 ) ( 136 48 8 ) common/entity_second 0 0 0 1 1 0 0 0
 ( 176 40 16 ) ( 176 40 8 ) ( 176 -56 16 ) common/caulk 0 0 0 1 1 0 0 0
 ( 128 -48 8 ) ( 136 -48 8 ) ( 128 48 8 ) common/caulk 0 0 0 1 1 0 0 0
-( 128 -48 8 ) ( 128 -48 16 ) ( 136 -48 8 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 128 -48 8 ) ( 128 -48 16 ) ( 136 -48 8 ) common/entity_second 0 0 0 1 1 0 0 0
 ( 128 -48 8 ) ( 128 48 8 ) ( 128 -48 16 ) common/caulk 0 0 0 1 1 0 0 0
 ( 136 24 40 ) ( 136 -24 40 ) ( 128 24 40 ) glass/dark 0 0 0 1 1 0 0 0
 ( 128 48 16 ) ( 136 48 16 ) ( 136 24 40 ) glass/dark 0 0 0 1 1 0 0 0
@@ -27,25 +27,25 @@
 }
 // brush 2
 {
-( 192 48 16 ) ( 184 48 16 ) ( 192 48 8 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 192 48 16 ) ( 184 48 16 ) ( 192 48 8 ) common/entity_second 0 0 0 1 1 0 0 0
 ( 192 48 16 ) ( 192 48 8 ) ( 192 -48 16 ) common/caulk 0 0 0 1 1 0 0 0
 ( 184 -48 8 ) ( 192 -48 8 ) ( 184 48 8 ) common/caulk 0 0 0 1 1 0 0 0
-( 184 -48 8 ) ( 184 -48 16 ) ( 192 -48 8 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 184 -48 8 ) ( 184 -48 16 ) ( 192 -48 8 ) common/entity_second 0 0 0 1 1 0 0 0
 ( 176 -48 8 ) ( 176 48 8 ) ( 176 -48 16 ) common/caulk 0 0 0 1 1 0 0 0
-( 192 24 40 ) ( 192 -24 40 ) ( 184 24 40 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( 184 48 16 ) ( 192 48 16 ) ( 192 24 40 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( 192 -48 16 ) ( 184 -48 16 ) ( 184 -24 40 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 192 24 40 ) ( 192 -24 40 ) ( 184 24 40 ) common/entity_second 0 0 0 1 1 0 0 0
+( 184 48 16 ) ( 192 48 16 ) ( 192 24 40 ) common/entity_second 0 0 0 1 1 0 0 0
+( 192 -48 16 ) ( 184 -48 16 ) ( 184 -24 40 ) common/entity_second 0 0 0 1 1 0 0 0
 }
 // brush 3
 {
-( -176 40 8 ) ( -184 40 8 ) ( -176 40 0 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( -176 40 8 ) ( -184 40 8 ) ( -176 40 0 ) common/entity_second 0 0 0 1 1 0 0 0
 ( -176 -40 0 ) ( -176 24 32 ) ( -176 40 0 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -176 40 0 ) ( -208 -40 0 ) ( -176 -40 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -176 -40 8 ) ( -208 -40 0 ) ( -208 -40 8 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( -176 -40 8 ) ( -208 -40 0 ) ( -208 -40 8 ) common/entity_second 0 0 0 1 1 0 0 0
 ( -208 -40 0 ) ( -208 24 32 ) ( -208 -40 8 ) common/caulk 0 0 0 1 1 0 0 0
-( -176 -24 32 ) ( -208 24 32 ) ( -176 24 32 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( -208 40 8 ) ( -176 24 32 ) ( -208 24 32 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( -176 -40 8 ) ( -208 -24 32 ) ( -176 -24 32 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( -176 -24 32 ) ( -208 24 32 ) ( -176 24 32 ) common/entity_second 0 0 0 1 1 0 0 0
+( -208 40 8 ) ( -176 24 32 ) ( -208 24 32 ) common/entity_second 0 0 0 1 1 0 0 0
+( -176 -40 8 ) ( -208 -24 32 ) ( -176 -24 32 ) common/entity_second 0 0 0 1 1 0 0 0
 }
 // brush 4
 {
@@ -216,7 +216,7 @@
 // brush 20
 {
 ( -320 -40 -8 ) ( -320 -48 -16 ) ( -288 -40 -8 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 -40 -8 ) ( -320 -40 8 ) ( -320 -48 -16 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 -40 -8 ) ( -320 -40 8 ) ( -320 -48 -16 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 -48 16 ) ( -320 -40 8 ) ( -288 -48 16 ) common/caulk 0 0 0 1 1 0 0 0
 ( -320 -36 8 ) ( -320 -36 -8 ) ( -288 -36 8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 -44 48 ) ( -288 -48 -80 ) ( -320 -44 -80 ) colors/grey25 0 0 0 1 1 0 0 0
@@ -228,7 +228,7 @@
 ( -320 -40 32 ) ( -320 -32 24 ) ( -288 -40 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -320 -28 20 ) ( -320 -36 4 ) ( -288 -28 20 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 -40 8 ) ( -320 -48 16 ) ( -288 -48 16 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 -32 24 ) ( -320 -40 32 ) ( -320 -40 8 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 -32 24 ) ( -320 -40 32 ) ( -320 -40 8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 -44 24 ) ( -320 -44 12 ) ( -320 -36 28 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 -48 16 ) ( -240 -40 32 ) ( -240 -32 24 ) common/caulk 0 0 0 1 1 0 0 0
 ( -240 -40 32 ) ( -288 -48 16 ) ( -288 -40 32 ) colors/grey25 0 0 0 1 1 0 0 0
@@ -238,7 +238,7 @@
 ( -320 -24 40 ) ( -320 -16 32 ) ( -288 -24 40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -320 -12 28 ) ( -320 -28 20 ) ( -288 -12 28 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 -32 24 ) ( -320 -40 32 ) ( -288 -32 24 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 -16 32 ) ( -320 -24 40 ) ( -320 -40 32 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 -16 32 ) ( -320 -24 40 ) ( -320 -40 32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 -32 36 ) ( -320 -36 28 ) ( -320 -20 36 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 -40 32 ) ( -288 -40 32 ) ( -288 -24 40 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 -32 24 ) ( -240 -24 40 ) ( -240 -16 32 ) common/caulk 0 0 0 1 1 0 0 0
@@ -246,7 +246,7 @@
 // brush 23
 {
 ( -288 -16 28 ) ( -320 16 28 ) ( -320 -16 28 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
-( -320 24 40 ) ( -320 -16 32 ) ( -320 16 32 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 24 40 ) ( -320 -16 32 ) ( -320 16 32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 -24 40 ) ( -320 -16 32 ) ( -320 -24 40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -288 16 32 ) ( -320 24 40 ) ( -320 16 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -320 64 36 ) ( -288 64 40 ) ( -320 -64 36 ) colors/grey25 0 0 0 1 1 0 0 0
@@ -260,7 +260,7 @@
 ( -240 40 32 ) ( -240 16 32 ) ( -240 24 40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -240 12 28 ) ( -288 28 20 ) ( -288 12 28 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -240 32 24 ) ( -288 40 32 ) ( -288 32 24 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 40 32 ) ( -320 24 40 ) ( -320 16 32 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 40 32 ) ( -320 24 40 ) ( -320 16 32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 20 36 ) ( -320 36 28 ) ( -288 32 36 ) colors/grey25 0 0 0 1 1 0 0 0
 }
 // brush 25
@@ -268,7 +268,7 @@
 ( -288 40 32 ) ( -320 32 24 ) ( -320 40 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -288 28 20 ) ( -320 36 4 ) ( -320 28 20 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 48 16 ) ( -320 48 16 ) ( -320 40 8 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 40 8 ) ( -320 40 32 ) ( -320 32 24 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 40 8 ) ( -320 40 32 ) ( -320 32 24 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 36 28 ) ( -320 44 12 ) ( -288 44 24 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 48 16 ) ( -240 32 24 ) ( -240 40 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -240 48 16 ) ( -288 40 32 ) ( -288 48 16 ) colors/grey25 0 0 0 1 1 0 0 0
@@ -280,7 +280,7 @@
 ( -240 48 16 ) ( -288 48 16 ) ( -288 48 -16 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 48 16 ) ( -288 40 8 ) ( -288 48 16 ) common/caulk 0 0 0 1 1 0 0 0
 ( -240 36 8 ) ( -288 36 -8 ) ( -288 36 8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
-( -320 48 -16 ) ( -320 40 8 ) ( -320 40 -8 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 48 -16 ) ( -320 40 8 ) ( -320 40 -8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 44 -80 ) ( -288 48 -80 ) ( -320 44 48 ) colors/grey25 0 0 0 1 1 0 0 0
 }
 // brush 27
@@ -288,7 +288,7 @@
 ( -320 40 -32 ) ( -320 32 -24 ) ( -288 40 -32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -320 28 -20 ) ( -320 36 -4 ) ( -288 28 -20 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 40 -8 ) ( -320 48 -16 ) ( -288 48 -16 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 32 -24 ) ( -320 40 -32 ) ( -320 40 -8 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 32 -24 ) ( -320 40 -32 ) ( -320 40 -8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 44 -24 ) ( -320 44 -12 ) ( -320 36 -28 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 40 -32 ) ( -240 32 -24 ) ( -240 40 -8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -240 48 -16 ) ( -288 48 -16 ) ( -288 40 -32 ) colors/grey25 0 0 0 1 1 0 0 0
@@ -300,13 +300,13 @@
 ( -240 32 -24 ) ( -240 24 -40 ) ( -240 16 -32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -240 28 -20 ) ( -288 12 -28 ) ( -288 28 -20 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -240 32 -24 ) ( -288 32 -24 ) ( -288 40 -32 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 16 -32 ) ( -320 24 -40 ) ( -320 40 -32 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 16 -32 ) ( -320 24 -40 ) ( -320 40 -32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 32 -36 ) ( -320 36 -28 ) ( -320 20 -36 ) colors/grey25 0 0 0 1 1 0 0 0
 }
 // brush 29
 {
 ( -320 -16 -28 ) ( -320 16 -28 ) ( -288 -16 -28 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
-( -320 16 -32 ) ( -320 -16 -32 ) ( -320 24 -40 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 16 -32 ) ( -320 -16 -32 ) ( -320 24 -40 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 -24 -40 ) ( -320 -16 -32 ) ( -288 -24 -40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -320 16 -32 ) ( -320 24 -40 ) ( -288 16 -32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -320 -64 -36 ) ( -288 64 -40 ) ( -320 64 -36 ) colors/grey25 0 0 0 1 1 0 0 0
@@ -318,7 +318,7 @@
 ( -288 -24 -40 ) ( -320 -16 -32 ) ( -320 -24 -40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -288 -4 -32 ) ( -320 -20 -24 ) ( -320 -4 -32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 -32 -24 ) ( -320 -40 -32 ) ( -320 -32 -24 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 -40 -32 ) ( -320 -24 -40 ) ( -320 -16 -32 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 -40 -32 ) ( -320 -24 -40 ) ( -320 -16 -32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 -20 -36 ) ( -320 -36 -28 ) ( -288 -32 -36 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 -40 -32 ) ( -288 -24 -40 ) ( -288 -40 -32 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 -40 -32 ) ( -240 -16 -32 ) ( -240 -24 -40 ) common/caulk 0 0 0 1 1 0 0 0
@@ -328,7 +328,7 @@
 ( -288 -40 -32 ) ( -320 -32 -24 ) ( -320 -40 -32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -288 -28 -20 ) ( -320 -36 -4 ) ( -320 -28 -20 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -288 -48 -16 ) ( -320 -48 -16 ) ( -320 -40 -8 ) common/caulk 0 0 0 1 1 0 0 0
-( -320 -40 -8 ) ( -320 -40 -32 ) ( -320 -32 -24 ) colors/grey25 0 0 0 1 1 0 0 0
+( -320 -40 -8 ) ( -320 -40 -32 ) ( -320 -32 -24 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 ( -320 -36 -28 ) ( -320 -44 -12 ) ( -288 -44 -24 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -240 -40 -32 ) ( -240 -40 -8 ) ( -240 -32 -24 ) common/caulk 0 0 0 1 1 0 0 0
 ( -240 -48 -16 ) ( -288 -40 -32 ) ( -288 -48 -16 ) colors/grey25 0 0 0 1 1 0 0 0
@@ -1048,13 +1048,13 @@
 }
 // brush 109
 {
-( 128 48 16 ) ( 32 48 16 ) ( 32 48 8 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 128 48 16 ) ( 32 48 16 ) ( 32 48 8 ) common/entity_second 0 0 0 1 1 0 0 0
 ( 128 48 16 ) ( 128 48 8 ) ( 128 -48 16 ) common/caulk 0 0 0 1 1 0 0 0
 ( 128 48 8 ) ( 32 48 8 ) ( 32 -48 8 ) common/caulk 0 0 0 1 1 0 0 0
-( 128 -48 16 ) ( 32 -48 8 ) ( 32 -48 16 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( 128 24 40 ) ( 32 -24 40 ) ( 32 24 40 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( 128 48 16 ) ( 32 24 40 ) ( 32 48 16 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
-( 128 -48 16 ) ( 32 -48 16 ) ( 32 -24 40 ) common/entity_second_shiny 0 0 0 1 1 0 0 0
+( 128 -48 16 ) ( 32 -48 8 ) ( 32 -48 16 ) common/entity_second 0 0 0 1 1 0 0 0
+( 128 24 40 ) ( 32 -24 40 ) ( 32 24 40 ) common/entity_second 0 0 0 1 1 0 0 0
+( 128 48 16 ) ( 32 24 40 ) ( 32 48 16 ) common/entity_second 0 0 0 1 1 0 0 0
+( 128 -48 16 ) ( 32 -48 16 ) ( 32 -24 40 ) common/entity_second 0 0 0 1 1 0 0 0
 ( 0 -60 8 ) ( 0 36 8 ) ( 0 -60 16 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 110
diff --git a/base/maps/mercenary/sections/archer_engine_small.map b/base/maps/mercenary/sections/archer_engine_small.map
index dad5d3b..02fcf99 100644
--- a/base/maps/mercenary/sections/archer_engine_small.map
+++ b/base/maps/mercenary/sections/archer_engine_small.map
@@ -173,6 +173,165 @@
 ( 192 0 0 ) ( 64 1 1 ) ( 64 0 0 ) common/caulk 0 0 0 1 1 0 0 0
 ( 64 -6 0 ) ( 64 -4.25 -4.25 ) ( 192 -6 0 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 }
+// brush 18
+{
+patchDef2
+{
+colors/grey50_shiny
+( 9 3 0 0 0 )
+(
+( ( -6 0 2 0 0 ) ( -3.3333334923 0 2 0 -0.125 ) ( -1 0 2 0 -0.25 ) )
+( ( -6 -2 2 0.125 0 ) ( -3.3333334923 -2 2 0.125 -0.125 ) ( -1 -2 2 0.125 -0.25 ) )
+( ( -6 -2 0 0.25 0 ) ( -3.3333334923 -2 0 0.25 -0.125 ) ( -1 -2 0 0.25 -0.25 ) )
+( ( -6 -2 -2 0.375 0 ) ( -3.3333334923 -2 -2 0.375 -0.125 ) ( -1 -2 -2 0.375 -0.25 ) )
+( ( -6 0 -2 0.5 0 ) ( -3.3333334923 0 -2 0.5 -0.125 ) ( -1 0 -2 0.5 -0.25 ) )
+( ( -6 2 -2 0.625 0 ) ( -3.3333334923 2 -2 0.625 -0.125 ) ( -1 2 -2 0.625 -0.25 ) )
+( ( -6 2 0 0.75 0 ) ( -3.3333334923 2 0 0.75 -0.125 ) ( -1 2 0 0.75 -0.25 ) )
+( ( -6 2 2 0.875 0 ) ( -3.3333334923 2 2 0.875 -0.125 ) ( -1 2 2 0.875 -0.25 ) )
+( ( -6 0 2 1 0 ) ( -3.3333334923 0 2 1 -0.125 ) ( -1 0 2 1 -0.25 ) )
+)
+}
+}
+// brush 19
+{
+patchDef2
+{
+colors/grey50_shiny
+( 9 3 0 0 0 )
+(
+( ( -4 0 3 0 0 ) ( -4 0 4 0 -0.125 ) ( -4 0 5 0 -0.25 ) )
+( ( -4 -3 3 0.125 0 ) ( -4 -4 4 0.125 -0.125 ) ( -4 -5 5 0.125 -0.25 ) )
+( ( -4 -3 0 0.25 0 ) ( -4 -4 0 0.25 -0.125 ) ( -4 -5 0 0.25 -0.25 ) )
+( ( -4 -3 -3 0.375 0 ) ( -4 -4 -4 0.375 -0.125 ) ( -4 -5 -5 0.375 -0.25 ) )
+( ( -4 0 -3 0.5 0 ) ( -4 0 -4 0.5 -0.125 ) ( -4 0 -5 0.5 -0.25 ) )
+( ( -4 3 -3 0.625 0 ) ( -4 4 -4 0.625 -0.125 ) ( -4 5 -5 0.625 -0.25 ) )
+( ( -4 3 0 0.75 0 ) ( -4 4 0 0.75 -0.125 ) ( -4 5 0 0.75 -0.25 ) )
+( ( -4 3 3 0.875 0 ) ( -4 4 4 0.875 -0.125 ) ( -4 5 5 0.875 -0.25 ) )
+( ( -4 0 3 1 0 ) ( -4 0 4 1 -0.125 ) ( -4 0 5 1 -0.25 ) )
+)
+}
+}
+// brush 20
+{
+patchDef2
+{
+common/engine
+( 3 5 0 0 0 )
+(
+( ( -1 0 6 0 -0.09375 ) ( -1 -6 6 -0.09375 -0.09375 ) ( -1 -6 0 -0.09375 -0 ) ( -1 -6 -6 -0.09375 0.09375 ) ( -1 0 -6 0 0.09375 ) )
+( ( -1 0 6 0 -0.09375 ) ( -1 0 6 0 -0.09375 ) ( -1 0 0 0 -0 ) ( -1 0 -6 0 0.09375 ) ( -1 0 -6 0 0.09375 ) )
+( ( -1 0 6 0 -0.09375 ) ( -1 6 6 0.09375 -0.09375 ) ( -1 6 0 0.09375 -0 ) ( -1 6 -6 0.09375 0.09375 ) ( -1 0 -6 0 0.09375 ) )
+)
+}
+}
+// brush 21
+{
+patchDef2
+{
+colors/grey25_shiny
+( 9 3 0 0 0 )
+(
+( ( -16 0.0000007153 7 0 0 ) ( -7.4666671753 0.0000007153 7.5 0 -0.125 ) ( -0.0000001192 0.0000007153 8 0 -0.25 ) )
+( ( -16 -7.0000009537 7 0.125 0 ) ( -7.4666671753 -7.5000009537 7.5 0.125 -0.125 ) ( -0.0000001192 -8.0000009537 8 0.125 -0.25 ) )
+( ( -16 -7.0000009537 0.0000002384 0.25 0 ) ( -7.4666671753 -7.5000009537 0.0000002384 0.25 -0.125 ) ( -0.0000001192 -8.0000009537 0.0000002384 0.25 -0.25 ) )
+( ( -16 -7.0000009537 -7.0000009537 0.375 0 ) ( -7.4666671753 -7.5000009537 -7.5000009537 0.375 -0.125 ) ( -0.0000001192 -8.0000009537 -8.0000009537 0.375 -0.25 ) )
+( ( -16 0.0000007153 -7.0000009537 0.5 0 ) ( -7.4666671753 0.0000007153 -7.5000009537 0.5 -0.125 ) ( -0.0000001192 0.0000007153 -8.0000009537 0.5 -0.25 ) )
+( ( -16 7 -7.0000009537 0.625 0 ) ( -7.4666671753 7.5 -7.5000009537 0.625 -0.125 ) ( -0.0000001192 8 -8.0000009537 0.625 -0.25 ) )
+( ( -16 7 0.0000002384 0.75 0 ) ( -7.4666671753 7.5 0.0000002384 0.75 -0.125 ) ( -0.0000001192 8 0.0000002384 0.75 -0.25 ) )
+( ( -16 7 7 0.875 0 ) ( -7.4666671753 7.5 7.5 0.875 -0.125 ) ( -0.0000001192 8 8 0.875 -0.25 ) )
+( ( -16 0.0000007153 7 1 0 ) ( -7.4666671753 0.0000007153 7.5 1 -0.125 ) ( -0.0000001192 0.0000007153 8 1 -0.25 ) )
+)
+}
+}
+// brush 22
+{
+patchDef2
+{
+colors/grey50_shiny
+( 9 3 0 0 0 )
+(
+( ( -0.9999999404 0 3 0 -0.25 ) ( -2.4000000954 0 3 0 -0.125 ) ( -4 0 3 0 0 ) )
+( ( -0.9999999404 -3 3 0.125 -0.25 ) ( -2.4000000954 -3 3 0.125 -0.125 ) ( -4 -3 3 0.125 0 ) )
+( ( -0.9999999404 -3 0 0.25 -0.25 ) ( -2.4000000954 -3 0 0.25 -0.125 ) ( -4 -3 0 0.25 0 ) )
+( ( -0.9999999404 -3 -3 0.375 -0.25 ) ( -2.4000000954 -3 -3 0.375 -0.125 ) ( -4 -3 -3 0.375 0 ) )
+( ( -0.9999999404 0 -3 0.5 -0.25 ) ( -2.4000000954 0 -3 0.5 -0.125 ) ( -4 0 -3 0.5 0 ) )
+( ( -0.9999999404 3 -3 0.625 -0.25 ) ( -2.4000000954 3 -3 0.625 -0.125 ) ( -4 3 -3 0.625 0 ) )
+( ( -0.9999999404 3 0 0.75 -0.25 ) ( -2.4000000954 3 0 0.75 -0.125 ) ( -4 3 0 0.75 0 ) )
+( ( -0.9999999404 3 3 0.875 -0.25 ) ( -2.4000000954 3 3 0.875 -0.125 ) ( -4 3 3 0.875 0 ) )
+( ( -0.9999999404 0 3 1 -0.25 ) ( -2.4000000954 0 3 1 -0.125 ) ( -4 0 3 1 0 ) )
+)
+}
+}
+// brush 23
+{
+patchDef2
+{
+colors/grey25_shiny
+( 9 3 0 0 0 )
+(
+( ( -16 0 6 0 0 ) ( -16 0 6.5 0 -0.125 ) ( -16 0 7 0 -0.25 ) )
+( ( -16 -6 6 0.125 0 ) ( -16 -6.5 6.5 0.125 -0.125 ) ( -16 -7 7 0.125 -0.25 ) )
+( ( -16 -6 0 0.25 0 ) ( -16 -6.5 0 0.25 -0.125 ) ( -16 -7 0 0.25 -0.25 ) )
+( ( -16 -6 -6 0.375 0 ) ( -16 -6.5 -6.5 0.375 -0.125 ) ( -16 -7 -7 0.375 -0.25 ) )
+( ( -16 0 -6 0.5 0 ) ( -16 0 -6.5 0.5 -0.125 ) ( -16 0 -7 0.5 -0.25 ) )
+( ( -16 6 -6 0.625 0 ) ( -16 6.5 -6.5 0.625 -0.125 ) ( -16 7 -7 0.625 -0.25 ) )
+( ( -16 6 0 0.75 0 ) ( -16 6.5 0 0.75 -0.125 ) ( -16 7 0 0.75 -0.25 ) )
+( ( -16 6 6 0.875 0 ) ( -16 6.5 6.5 0.875 -0.125 ) ( -16 7 7 0.875 -0.25 ) )
+( ( -16 0 6 1 0 ) ( -16 0 6.5 1 -0.125 ) ( -16 0 7 1 -0.25 ) )
+)
+}
+}
+// brush 24
+{
+patchDef2
+{
+colors/grey50_shiny
+( 9 3 0 0 0 )
+(
+( ( -4 0 5 0 0 ) ( -2.4000000954 0 5 0 -0.125 ) ( -0.9999999404 0 5 0 -0.25 ) )
+( ( -4 -5 5 0.125 0 ) ( -2.4000000954 -5 5 0.125 -0.125 ) ( -0.9999999404 -5 5 0.125 -0.25 ) )
+( ( -4 -5 0 0.25 0 ) ( -2.4000000954 -5 0 0.25 -0.125 ) ( -0.9999999404 -5 0 0.25 -0.25 ) )
+( ( -4 -5 -5 0.375 0 ) ( -2.4000000954 -5 -5 0.375 -0.125 ) ( -0.9999999404 -5 -5 0.375 -0.25 ) )
+( ( -4 0 -5 0.5 0 ) ( -2.4000000954 0 -5 0.5 -0.125 ) ( -0.9999999404 0 -5 0.5 -0.25 ) )
+( ( -4 5 -5 0.625 0 ) ( -2.4000000954 5 -5 0.625 -0.125 ) ( -0.9999999404 5 -5 0.625 -0.25 ) )
+( ( -4 5 0 0.75 0 ) ( -2.4000000954 5 0 0.75 -0.125 ) ( -0.9999999404 5 0 0.75 -0.25 ) )
+( ( -4 5 5 0.875 0 ) ( -2.4000000954 5 5 0.875 -0.125 ) ( -0.9999999404 5 5 0.875 -0.25 ) )
+( ( -4 0 5 1 0 ) ( -2.4000000954 0 5 1 -0.125 ) ( -0.9999999404 0 5 1 -0.25 ) )
+)
+}
+}
+// brush 25
+{
+patchDef2
+{
+colors/grey50_shiny
+( 3 5 0 0 0 )
+(
+( ( -6 0 2 -0.09375 -0 ) ( -6 -2 2 -0.09375 0.03125 ) ( -6 -2 0 -0.09375 0.03125 ) ( -6 -2 -2 -0.09375 0.03125 ) ( -6 0 -2 -0.09375 -0 ) )
+( ( -6 0 2 -0.09375 -0 ) ( -6 0 2 -0.09375 -0 ) ( -6 0 0 -0.09375 -0 ) ( -6 0 -2 -0.09375 -0 ) ( -6 0 -2 -0.09375 -0 ) )
+( ( -6 0 2 -0.09375 -0 ) ( -6 2 2 -0.09375 -0.03125 ) ( -6 2 0 -0.09375 -0.03125 ) ( -6 2 -2 -0.09375 -0.03125 ) ( -6 0 -2 -0.09375 -0 ) )
+)
+}
+}
+// brush 26
+{
+patchDef2
+{
+colors/grey25_shiny
+( 9 3 0 0 0 )
+(
+( ( -1 0 6 0 -0.25 ) ( -8 0 6 0 -0.125 ) ( -16 0 6 0 0 ) )
+( ( -1 -6 6 0.125 -0.25 ) ( -8 -6 6 0.125 -0.125 ) ( -16 -6 6 0.125 0 ) )
+( ( -1 -6 0 0.25 -0.25 ) ( -8 -6 0 0.25 -0.125 ) ( -16 -6 0 0.25 0 ) )
+( ( -1 -6 -6 0.375 -0.25 ) ( -8 -6 -6 0.375 -0.125 ) ( -16 -6 -6 0.375 0 ) )
+( ( -1 0 -6 0.5 -0.25 ) ( -8 0 -6 0.5 -0.125 ) ( -16 0 -6 0.5 0 ) )
+( ( -1 6 -6 0.625 -0.25 ) ( -8 6 -6 0.625 -0.125 ) ( -16 6 -6 0.625 0 ) )
+( ( -1 6 0 0.75 -0.25 ) ( -8 6 0 0.75 -0.125 ) ( -16 6 0 0.75 0 ) )
+( ( -1 6 6 0.875 -0.25 ) ( -8 6 6 0.875 -0.125 ) ( -16 6 6 0.875 0 ) )
+( ( -1 0 6 1 -0.25 ) ( -8 0 6 1 -0.125 ) ( -16 0 6 1 0 ) )
+)
+}
+}
 }
 // entity 1
 {
diff --git a/base/maps/mercenary/talon.map b/base/maps/mercenary/talon.map
index 4911683..07ef869 100644
--- a/base/maps/mercenary/talon.map
+++ b/base/maps/mercenary/talon.map
@@ -1699,8 +1699,8 @@ common/entity
 {
 "classname" "light"
 "origin" "-120.000000 0.000000 0.000000"
-"spawnflags" "4"
 "flare" "4"
+"spawnflags" "4"
 }
 // entity 11
 {