3 files changed, 310 insertions, 87 deletions

diff --git a/base/maps/independent/avenger.map b/base/maps/independent/avenger.map
index 0506971..e5d4843 100644
--- a/base/maps/independent/avenger.map
+++ b/base/maps/independent/avenger.map
@@ -8,18 +8,18 @@
 ( 64 32 -8 ) ( -16 32 8 ) ( 64 32 8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -16 72 0 ) ( 10 72 -2 ) ( 10 72 0 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 48 8 ) ( -16 32 -8 ) ( -16 48 -8 ) colors/grey50 0 0 0 1 1 0 0 0
-( 20 32 -8 ) ( 10 72 0 ) ( 10 72 -2 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 32 -8 ) ( 10 72 -2 ) ( -16 72 -2 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 32 -4 ) ( 10 72 0 ) ( 20 32 -4 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 58 -64 ) ( -6 54 -64 ) ( -6 58 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 1
 {
 ( 64 -32 8 ) ( -16 -32 8 ) ( 64 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -16 -72 -2 ) ( 10 -72 0 ) ( 10 -72 -2 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 -48 -8 ) ( -16 -32 -8 ) ( -16 -48 8 ) colors/grey50 0 0 0 1 1 0 0 0
-( 20 -32 -4 ) ( 10 -72 -2 ) ( 10 -72 0 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 -32 -8 ) ( 10 -72 -2 ) ( 20 -32 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 -32 -4 ) ( 10 -72 0 ) ( -16 -72 0 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 -68 -64 ) ( -6 -70 -64 ) ( -6 -68 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 2
 {
@@ -79,7 +79,7 @@
 ( 20 32 4 ) ( 10 72 0 ) ( -16 32 4 ) common/caulk 0 0 0 1 1 0 0 0
 ( 12 68 -64 ) ( 8 68 -64 ) ( 12 68 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -16 72 64 ) ( -12 68 -64 ) ( -16 72 -64 ) common/caulk 0 0 0 1 1 0 0 0
-( 7 68 64 ) ( 10 72 -64 ) ( 7 68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 58 -64 ) ( -6 54 -64 ) ( -6 58 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 8
 {
@@ -133,7 +133,7 @@
 ( -16 -32 4 ) ( 10 -72 0 ) ( 20 -32 4 ) common/caulk 0 0 0 1 1 0 0 0
 ( 12 -68 64 ) ( 8 -68 -64 ) ( 12 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -16 -72 -64 ) ( -12 -68 -64 ) ( -16 -72 64 ) common/caulk 0 0 0 1 1 0 0 0
-( 7 -68 -64 ) ( 10 -72 -64 ) ( 7 -68 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 -68 -64 ) ( -6 -70 -64 ) ( -6 -68 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 14
 {
@@ -182,6 +182,78 @@
 ( 64 32 -8 ) ( -16 32 8 ) ( -16 32 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 24 32 -64 ) ( 64 24 -64 ) ( 24 32 64 ) colors/grey50 0 0 0 1 1 0 0 0
 }
+// brush 19
+{
+( 64 -32 8 ) ( -16 -32 8 ) ( 64 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 -72 -2 ) ( 10 -72 0 ) ( 10 -72 -2 ) colors/grey50 0 0 0 1 1 0 0 0
+( 20 -32 -4 ) ( 10 -72 -2 ) ( 10 -72 0 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 -32 -8 ) ( 10 -72 -2 ) ( 20 -32 -8 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 -32 -4 ) ( 10 -72 0 ) ( -16 -72 0 ) common/caulk 0 0 0 1 1 0 0 0
+( 2 -68 64 ) ( 2 -70 -64 ) ( 2 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 20
+{
+( -16 -72 2 ) ( 10 -72 2 ) ( 10 -72 0 ) colors/grey50 0 0 0 1 1 0 0 0
+( 20 -32 8 ) ( 10 -72 2 ) ( -16 -32 8 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 -32 4 ) ( 10 -72 0 ) ( 20 -32 4 ) common/caulk 0 0 0 1 1 0 0 0
+( 12 -68 64 ) ( 8 -68 -64 ) ( 12 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( 7 -68 -64 ) ( 10 -72 -64 ) ( 7 -68 64 ) common/caulk 0 0 0 1 1 0 0 0
+( 2 -68 64 ) ( 2 -70 -64 ) ( 2 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 21
+{
+( 64 -32 8 ) ( -16 -32 8 ) ( 64 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 -32 -8 ) ( 10 -72 -2 ) ( 20 -32 -8 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 -32 -4 ) ( 10 -72 0 ) ( -16 -72 0 ) common/caulk 0 0 0 1 1 0 0 0
+( 2 -68 -64 ) ( 2 -70 -64 ) ( 2 -68 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 -68 64 ) ( -6 -70 -64 ) ( -6 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -64 -68 -2 ) ( -64 -68 0 ) ( 64 -68 -2 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 22
+{
+( -16 -72 2 ) ( 10 -72 2 ) ( 10 -72 0 ) colors/green_bright 0 0 0 1 1 0 0 0
+( 20 -32 8 ) ( 10 -72 2 ) ( -16 -32 8 ) colors/green_bright 0 0 0 1 1 0 0 0
+( 12 -68 64 ) ( 8 -68 -64 ) ( 12 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( 2 -68 -64 ) ( 2 -70 -64 ) ( 2 -68 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 -68 64 ) ( -6 -70 -64 ) ( -6 -68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 -32 -8 ) ( 10 -72 -2 ) ( 20 -32 -8 ) colors/green_bright 0 0 0 1 1 0 0 0
+}
+// brush 23
+{
+( 64 32 -8 ) ( -16 32 8 ) ( 64 32 8 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 32 -8 ) ( 10 72 -2 ) ( -16 72 -2 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 32 -4 ) ( 10 72 0 ) ( 20 32 -4 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 58 64 ) ( -6 54 -64 ) ( -6 58 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( 2 58 -64 ) ( 2 50 -64 ) ( 2 58 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -4 68 -64 ) ( 2 68 -64 ) ( -4 68 64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 24
+{
+( 64 32 -8 ) ( -16 32 8 ) ( 64 32 8 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 72 0 ) ( 10 72 -2 ) ( 10 72 0 ) colors/grey50 0 0 0 1 1 0 0 0
+( 20 32 -8 ) ( 10 72 0 ) ( 10 72 -2 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 32 -8 ) ( 10 72 -2 ) ( -16 72 -2 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 32 -4 ) ( 10 72 0 ) ( 20 32 -4 ) common/caulk 0 0 0 1 1 0 0 0
+( 2 58 64 ) ( 2 50 -64 ) ( 2 58 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 25
+{
+( 10 72 0 ) ( 10 72 2 ) ( -16 72 2 ) colors/grey50 0 0 0 1 1 0 0 0
+( -16 32 8 ) ( 10 72 2 ) ( 20 32 8 ) colors/grey50 0 0 0 1 1 0 0 0
+( 20 32 4 ) ( 10 72 0 ) ( -16 32 4 ) common/caulk 0 0 0 1 1 0 0 0
+( 12 68 -64 ) ( 8 68 -64 ) ( 12 68 64 ) common/caulk 0 0 0 1 1 0 0 0
+( 7 68 64 ) ( 10 72 -64 ) ( 7 68 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( 2 58 64 ) ( 2 50 -64 ) ( 2 58 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 26
+{
+( 2 44 4 ) ( 2 44 -6 ) ( 2 32 4 ) common/caulk 0 0 0 1 1 0 0 0
+( -6 32 -6 ) ( -6 44 -6 ) ( -6 32 4 ) common/caulk 0 0 0 1 1 0 0 0
+( -64 68 -4 ) ( -64 68 0 ) ( 64 68 -4 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 72 0 ) ( 10 72 -2 ) ( 10 72 0 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -16 32 -8 ) ( 10 72 -2 ) ( -16 72 -2 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -16 32 8 ) ( 10 72 2 ) ( 20 32 8 ) colors/red_bright 0 0 0 1 1 0 0 0
+}
 }
 // entity 1
 {
@@ -196,22 +268,16 @@
 // entity 2
 {
 "classname" "light"
-"origin" "-4 76 0"
+"origin" "-2.000000 70.000000 0.000000"
 "light" "10"
 "_color" "1 0 0"
-"spawnflags" "1"
-"offset" "0"
-"time" "0.2"
 }
 // entity 3
 {
 "classname" "light"
-"origin" "-4 -76 0"
+"origin" "-2.000000 -70.000000 0.000000"
 "light" "10"
 "_color" "0 1 0"
-"spawnflags" "1"
-"offset" "0.5"
-"time" "0.2"
 }
 // entity 4
 {
@@ -239,3 +305,23 @@
 "origin" "-40.000000 0.000000 0.000000"
 "model" "maps/independent/sections/avenger_cockpit"
 }
+// entity 8
+{
+"classname" "light"
+"origin" "-2.000000 -70.000000 0.000000"
+"light" "15"
+"_color" "0 1 0"
+"spawnflags" "1"
+"offset" "0.5"
+"time" "0.2"
+}
+// entity 9
+{
+"classname" "light"
+"origin" "-2.000000 70.000000 0.000000"
+"light" "15"
+"_color" "1 0 0"
+"spawnflags" "1"
+"offset" "0"
+"time" "0.2"
+}
diff --git a/base/maps/independent/jupiter.map b/base/maps/independent/jupiter.map
index 9e61c7c..e1276da 100644
--- a/base/maps/independent/jupiter.map
+++ b/base/maps/independent/jupiter.map
@@ -109,12 +109,12 @@
 }
 // brush 11
 {
-( -24 -140 -20 ) ( -24 -140 20 ) ( 8 -140 -20 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 8 -92 -64 ) ( 0 -140 -64 ) ( 8 -92 64 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -64 -140 4 ) ( -64 -92 8 ) ( 64 -140 4 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -64 -92 -8 ) ( -64 -140 -4 ) ( 64 -92 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 -44 12 ) ( 16 -44 -24 ) ( 16 -44 12 ) common/caulk 0 0 0 1 1 0 0 0
 ( 4 -44 64 ) ( -12 -140 -64 ) ( 4 -44 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( 0 -136 -64 ) ( -4 -136 -64 ) ( 0 -136 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 12
 {
@@ -185,12 +185,12 @@
 }
 // brush 19
 {
-( -160 -140 -20 ) ( -128 -140 20 ) ( -128 -140 -20 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -216 -140 4 ) ( -88 -92 8 ) ( -88 -140 4 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -216 -92 -8 ) ( -88 -140 -4 ) ( -88 -92 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -116 -92 64 ) ( -128 -92 -64 ) ( -116 -92 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -160 -92 64 ) ( -152 -140 -64 ) ( -160 -92 -64 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -140 -140 64 ) ( -156 -44 -64 ) ( -140 -140 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -138 -136 -64 ) ( -144 -136 -64 ) ( -138 -136 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 20
 {
@@ -270,12 +270,12 @@
 }
 // brush 29
 {
-( 8 140 -20 ) ( -24 140 20 ) ( -24 140 -20 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 8 92 64 ) ( 0 140 -64 ) ( 8 92 -64 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 64 140 4 ) ( -64 92 8 ) ( -64 140 4 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 64 92 -8 ) ( -64 140 -4 ) ( -64 92 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 16 44 12 ) ( 16 44 -24 ) ( -16 44 12 ) common/caulk 0 0 0 1 1 0 0 0
 ( 4 44 -64 ) ( -12 140 -64 ) ( 4 44 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -10 136 -64 ) ( -6 136 -64 ) ( -10 136 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 30
 {
@@ -434,12 +434,12 @@
 }
 // brush 45
 {
-( -128 140 -20 ) ( -128 140 20 ) ( -160 140 -20 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -88 140 4 ) ( -88 92 8 ) ( -216 140 4 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -88 92 -8 ) ( -88 140 -4 ) ( -216 92 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -116 92 -64 ) ( -128 92 -64 ) ( -116 92 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -160 92 -64 ) ( -152 140 -64 ) ( -160 92 64 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -140 140 -64 ) ( -156 44 -64 ) ( -140 140 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -150 136 -64 ) ( -146 136 -64 ) ( -150 136 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 46
 {
@@ -635,19 +635,6 @@
 }
 // brush 66
 {
-( -32 24 8 ) ( -192 24 32 ) ( -192 24 8 ) colors/grey50 0 0 0 1 1 0 0 0
-( -192 24 8 ) ( -192 8 44 ) ( -192 8 -4 ) common/caulk 0 0 0 1 1 0 0 0
-( -32 24 32 ) ( -192 12 44 ) ( -192 24 32 ) colors/grey50 0 0 0 1 1 0 0 0
-( -32 12 44 ) ( -192 8 44 ) ( -192 12 44 ) colors/grey50 0 0 0 1 1 0 0 0
-( -32 8 -4 ) ( -192 12 -4 ) ( -192 8 -4 ) colors/grey50 0 0 0 1 1 0 0 0
-( -32 12 -4 ) ( -192 24 8 ) ( -192 12 -4 ) colors/grey50 0 0 0 1 1 0 0 0
-( -148 64 24 ) ( -148 64 12 ) ( -148 -64 24 ) common/caulk 0 0 0 1 1 0 0 0
-( -32 -12 44 ) ( -192 -24 32 ) ( -192 -12 44 ) colors/grey50 0 0 0 1 1 0 0 0
-( -32 -24 8 ) ( -192 -24 8 ) ( -192 -24 32 ) colors/grey50 0 0 0 1 1 0 0 0
-( -32 -12 -4 ) ( -192 -12 -4 ) ( -192 -24 8 ) colors/grey50 0 0 0 1 1 0 0 0
-}
-// brush 67
-{
 ( 28 136 8 ) ( 28 40 8 ) ( 0 136 8 ) common/entity 0 0 0 1 1 0 0 0
 ( 0 40 0 ) ( 0 136 0 ) ( 0 40 8 ) common/caulk 0 0 0 1 1 0 0 0
 ( 64 44 0 ) ( -64 44 8 ) ( -64 44 0 ) common/caulk 0 0 0 1 1 0 0 0
@@ -657,7 +644,7 @@
 ( 68 -32 64 ) ( 72 -28 -64 ) ( 68 -32 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( 68 32 8 ) ( 68 32 4 ) ( 68 -32 8 ) common/caulk 0 0 0 1 1 0 0 0
 }
-// brush 68
+// brush 67
 {
 ( 96 32 -4 ) ( 96 -32 -4 ) ( 0 32 -4 ) common/caulk 0 0 0 1 1 0 0 0
 ( 96 32 -4 ) ( 96 32 -8 ) ( 96 -32 -4 ) common/caulk 0 0 0 1 1 0 0 0
@@ -668,7 +655,7 @@
 ( 4 -140 64 ) ( 96 -32 64 ) ( 4 -140 -64 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 64 -44 0 ) ( -64 -44 -8 ) ( -64 -44 0 ) common/caulk 0 0 0 1 1 0 0 0
 }
-// brush 69
+// brush 68
 {
 ( 96 32 8 ) ( 96 -32 8 ) ( 68 32 8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 96 32 8 ) ( 68 32 8 ) ( 96 32 4 ) common/caulk 0 0 0 1 1 0 0 0
@@ -677,7 +664,7 @@
 ( 68 -32 4 ) ( 68 -32 8 ) ( 96 -32 4 ) common/caulk 0 0 0 1 1 0 0 0
 ( 68 -32 4 ) ( 68 32 4 ) ( 68 -32 8 ) common/caulk 0 0 0 1 1 0 0 0
 }
-// brush 70
+// brush 69
 {
 ( 96 32 -4 ) ( 144 -32 -4 ) ( 144 32 -4 ) common/caulk 0 0 0 1 1 0 0 0
 ( 144 -32 -4 ) ( 144 32 0 ) ( 144 32 -4 ) common/caulk 0 0 0 1 1 0 0 0
@@ -686,7 +673,7 @@
 ( 144 -24 -60 ) ( 96 -32 68 ) ( 144 -24 68 ) common/entity 0 0 0 1 1 0 0 0
 ( 96 32 -60 ) ( 144 24 68 ) ( 96 32 68 ) common/entity 0 0 0 1 1 0 0 0
 }
-// brush 71
+// brush 70
 {
 ( 144 32 8 ) ( 144 -32 8 ) ( 96 32 8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 144 32 8 ) ( 144 32 4 ) ( 144 -32 8 ) common/caulk 0 0 0 1 1 0 0 0
@@ -695,7 +682,7 @@
 ( 144 -24 -64 ) ( 96 -32 -64 ) ( 144 -24 64 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 96 32 -64 ) ( 144 24 -64 ) ( 96 32 64 ) colors/grey50 0 0 0 1 1 0 0 0
 }
-// brush 72
+// brush 71
 {
 ( 96 32 -8 ) ( 144 -32 -8 ) ( 144 32 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 144 -32 -8 ) ( 144 32 -4 ) ( 144 32 -8 ) common/caulk 0 0 0 1 1 0 0 0
@@ -704,7 +691,7 @@
 ( 144 -24 -64 ) ( 96 -32 64 ) ( 144 -24 64 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 96 32 -64 ) ( 144 24 64 ) ( 96 32 64 ) colors/grey50 0 0 0 1 1 0 0 0
 }
-// brush 73
+// brush 72
 {
 ( -32 -92 -8 ) ( -16 -92 -8 ) ( -32 -92 -12 ) common/entity 0 0 0 1 1 0 0 0
 ( -32 -80 -24 ) ( -16 -92 -8 ) ( -16 -80 -20 ) common/entity 0 0 0 1 1 0 0 0
@@ -718,7 +705,7 @@
 ( -6 -50 64 ) ( -32 -44 -64 ) ( -6 -50 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -12 -140 64 ) ( 4 -44 -64 ) ( -12 -140 -64 ) common/caulk 0 0 0 1 1 0 0 0
 }
-// brush 74
+// brush 73
 {
 ( -32 -80 -24 ) ( -16 -92 -8 ) ( -16 -80 -20 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -32 -80 -24 ) ( -16 -80 -20 ) ( -16 -56 -20 ) colors/grey50 0 0 0 1 1 0 0 0
@@ -731,7 +718,7 @@
 ( -12 -140 -64 ) ( 4 -44 -64 ) ( -12 -140 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( 4 -140 64 ) ( 20 -44 -64 ) ( 4 -140 -64 ) colors/grey50 0 0 0 1 1 0 0 0
 }
-// brush 75
+// brush 74
 {
 ( -32 92 -12 ) ( -16 92 -8 ) ( -32 92 -8 ) common/entity 0 0 0 1 1 0 0 0
 ( -16 80 -20 ) ( -16 92 -8 ) ( -32 80 -24 ) common/entity 0 0 0 1 1 0 0 0
@@ -745,7 +732,7 @@
 ( -6 50 -64 ) ( -32 44 -64 ) ( -6 50 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -12 140 -64 ) ( 4 44 -64 ) ( -12 140 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
-// brush 76
+// brush 75
 {
 ( -16 80 -20 ) ( -16 92 -8 ) ( -32 80 -24 ) colors/grey50 0 0 0 1 1 0 0 0
 ( -16 56 -20 ) ( -16 80 -20 ) ( -32 80 -24 ) colors/grey50 0 0 0 1 1 0 0 0
@@ -758,16 +745,7 @@
 ( -12 140 64 ) ( 4 44 -64 ) ( -12 140 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( 4 140 -64 ) ( 20 44 -64 ) ( 4 140 64 ) colors/grey50 0 0 0 1 1 0 0 0
 }
-// brush 77
-{
-( -60 24 8 ) ( -220 24 32 ) ( -220 24 8 ) colors/grey50 0 0 0 1 1 0 0 0
-( -60 -24 -4 ) ( -220 -24 -4 ) ( -220 -24 44 ) common/caulk 0 0 0 1 1 0 0 0
-( -160 92 64 ) ( -160 88 -64 ) ( -160 92 -64 ) colors/grey50 0 0 0 1 1 0 0 0
-( -188 12 -8 ) ( -60 12 -8 ) ( -188 40 -8 ) colors/grey50 0 0 0 1 1 0 0 0
-( -120 24 -64 ) ( -120 16 -64 ) ( -120 24 64 ) common/caulk 0 0 0 1 1 0 0 0
-( -64 12 8 ) ( -64 20 8 ) ( 64 12 8 ) common/caulk 0 0 0 1 1 0 0 0
-}
-// brush 78
+// brush 76
 {
 ( -192 -24 8 ) ( -192 -24 32 ) ( -32 -24 8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -192 -24 32 ) ( -192 -12 44 ) ( -32 -24 32 ) colors/grey50 0 0 0 1 1 0 0 0
@@ -777,7 +755,7 @@
 ( -120 -92 -64 ) ( -120 -88 -64 ) ( -120 -92 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -160 -40 -8 ) ( -32 -12 -8 ) ( -160 -12 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 }
-// brush 79
+// brush 77
 {
 ( -32 24 8 ) ( -192 24 32 ) ( -192 24 8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -32 24 32 ) ( -192 12 44 ) ( -192 24 32 ) colors/grey50 0 0 0 1 1 0 0 0
@@ -787,7 +765,7 @@
 ( -120 92 64 ) ( -120 88 -64 ) ( -120 92 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -160 12 -8 ) ( -32 12 -8 ) ( -160 40 -8 ) colors/grey50 0 0 0 1 1 0 0 0
 }
-// brush 80
+// brush 78
 {
 ( 16 40 32 ) ( 16 24 -12 ) ( 16 40 -12 ) common/caulk 0 0 0 1 1 0 0 0
 ( 48 40 0 ) ( 48 24 16 ) ( 16 24 32 ) colors/grey50 0 0 0 1 1 0 0 0
@@ -796,7 +774,7 @@
 ( 44 28 -64 ) ( 40 28 -64 ) ( 44 28 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( 48 40 -12 ) ( 48 40 0 ) ( 16 40 -12 ) colors/grey50 0 0 0 1 1 0 0 0
 }
-// brush 81
+// brush 79
 {
 ( 16 -40 -12 ) ( 16 -24 -12 ) ( 16 -40 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( 16 -24 32 ) ( 48 -24 16 ) ( 48 -40 0 ) colors/grey50 0 0 0 1 1 0 0 0
@@ -805,6 +783,81 @@
 ( 44 -28 64 ) ( 40 -28 -64 ) ( 44 -28 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( 16 -40 -12 ) ( 48 -40 0 ) ( 48 -40 -12 ) colors/grey50 0 0 0 1 1 0 0 0
 }
+// brush 80
+{
+( -24 -140 -20 ) ( -24 -140 20 ) ( 8 -140 -20 ) colors/green_bright 0 0 0 1 1 0 0 0
+( 8 -92 -64 ) ( 0 -140 -64 ) ( 8 -92 64 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -64 -140 4 ) ( -64 -92 8 ) ( 64 -140 4 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -64 -92 -8 ) ( -64 -140 -4 ) ( 64 -92 -8 ) colors/green_bright 0 0 0 1 1 0 0 0
+( 4 -44 64 ) ( -12 -140 -64 ) ( 4 -44 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( 0 -136 64 ) ( -4 -136 -64 ) ( 0 -136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 81
+{
+( -160 -140 -20 ) ( -128 -140 20 ) ( -128 -140 -20 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -216 -140 4 ) ( -88 -92 8 ) ( -88 -140 4 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -216 -92 -8 ) ( -88 -140 -4 ) ( -88 -92 -8 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -160 -92 64 ) ( -152 -140 -64 ) ( -160 -92 -64 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -140 -140 64 ) ( -156 -44 -64 ) ( -140 -140 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -138 -136 64 ) ( -144 -136 -64 ) ( -138 -136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 82
+{
+( -128 140 -20 ) ( -128 140 20 ) ( -160 140 -20 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -88 140 4 ) ( -88 92 8 ) ( -216 140 4 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -88 92 -8 ) ( -88 140 -4 ) ( -216 92 -8 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -160 92 -64 ) ( -152 140 -64 ) ( -160 92 64 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -140 140 -64 ) ( -156 44 -64 ) ( -140 140 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -150 136 64 ) ( -146 136 -64 ) ( -150 136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 83
+{
+( 8 140 -20 ) ( -24 140 20 ) ( -24 140 -20 ) colors/red_bright 0 0 0 1 1 0 0 0
+( 8 92 64 ) ( 0 140 -64 ) ( 8 92 -64 ) colors/red_bright 0 0 0 1 1 0 0 0
+( 64 140 4 ) ( -64 92 8 ) ( -64 140 4 ) colors/red_bright 0 0 0 1 1 0 0 0
+( 64 92 -8 ) ( -64 140 -4 ) ( -64 92 -8 ) colors/red_bright 0 0 0 1 1 0 0 0
+( 4 44 -64 ) ( -12 140 -64 ) ( 4 44 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -10 136 64 ) ( -6 136 -64 ) ( -10 136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 84
+{
+patchDef2
+{
+colors/grey50
+( 9 3 0 0 0 )
+(
+( ( -192 0 44.0000152588 0 0 ) ( -176 0 44.0000152588 0 -0.375 ) ( -160 0 44.0000152588 0 -0.75 ) )
+( ( -192 -24 44.0000152588 0.375 0 ) ( -176 -24 44.0000152588 0.375 -0.375 ) ( -160 -24 44.0000152588 0.375 -0.75 ) )
+( ( -192 -24 20 0.71875 0 ) ( -176 -24 20 0.71875 -0.375 ) ( -160 -24 20 0.71875 -0.75 ) )
+( ( -192 -24 -4 1.0625 0 ) ( -176 -24 -4 1.0625 -0.375 ) ( -160 -24 -4 1.0625 -0.75 ) )
+( ( -192 0 -4 1.4375 0 ) ( -176 0 -4 1.4375 -0.375 ) ( -160 0 -4 1.4375 -0.75 ) )
+( ( -192 24 -4 1.8125 0 ) ( -176 24 -4 1.8125 -0.375 ) ( -160 24 -4 1.8125 -0.75 ) )
+( ( -192 24 20 2.15625 0 ) ( -176 24 20 2.15625 -0.375 ) ( -160 24 20 2.15625 -0.75 ) )
+( ( -192 24 44.0000152588 2.5 0 ) ( -176 24 44.0000152588 2.5 -0.375 ) ( -160 24 44.0000152588 2.5 -0.75 ) )
+( ( -192 0 44.0000152588 2.875 0 ) ( -176 0 44.0000152588 2.875 -0.375 ) ( -160 0 44.0000152588 2.875 -0.75 ) )
+)
+}
+}
+// brush 85
+{
+( -60 24 8 ) ( -220 24 32 ) ( -220 24 8 ) colors/grey50 0 0 0 1 1 0 0 0
+( -60 -24 -4 ) ( -220 -24 -4 ) ( -220 -24 44 ) common/caulk 0 0 0 1 1 0 0 0
+( -188 12 -8 ) ( -60 12 -8 ) ( -188 40 -8 ) colors/grey50 0 0 0 1 1 0 0 0
+( -120 24 -64 ) ( -120 16 -64 ) ( -120 24 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -64 12 32 ) ( -64 20 32 ) ( 64 12 32 ) common/caulk 0 0 0 1 1 0 0 0
+( -148 -64 32 ) ( -160 64 -8 ) ( -148 64 32 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 86
+{
+( -120 24 44 ) ( -120 -24 44 ) ( -160 24 44 ) colors/grey50 0 0 0 1 1 0 0 0
+( -160 -24 32 ) ( -160 24 32 ) ( -160 -24 40 ) colors/grey50 0 0 0 1 1 0 0 0
+( -64 -24 32 ) ( -64 -20 36 ) ( 64 -24 32 ) colors/grey50 0 0 0 1 1 0 0 0
+( -64 16 40 ) ( -64 20 36 ) ( 64 16 40 ) colors/grey50 0 0 0 1 1 0 0 0
+( -148 16 -64 ) ( -148 8 -64 ) ( -148 16 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -60 24 8 ) ( -220 24 32 ) ( -220 24 8 ) colors/grey50 0 0 0 1 1 0 0 0
+( -60 -24 -4 ) ( -220 -24 -4 ) ( -220 -24 44 ) common/caulk 0 0 0 1 1 0 0 0
+( -148 64 32 ) ( -160 64 -8 ) ( -148 -64 32 ) common/caulk 0 0 0 1 1 0 0 0
+}
 }
 // entity 1
 {
@@ -815,46 +868,35 @@
 "spawnflags" "1"
 "offset" "0.5"
 "time" "0.1"
+"flare" "4"
 }
 // entity 2
 {
 "classname" "light"
-"origin" "-140 140 0"
-"light" "10"
+"origin" "-146.000000 138.000000 0.000000"
+"light" "20"
 "_color" "1 0 0"
-"spawnflags" "1"
-"offset" "0"
-"time" "0.2"
 }
 // entity 3
 {
 "classname" "light"
-"origin" "-140 -140 0"
-"light" "10"
+"origin" "-146.000000 -138.000000 0.000000"
+"light" "20"
 "_color" "0 1 0"
-"spawnflags" "1"
-"offset" "0.5"
-"time" "0.2"
 }
 // entity 4
 {
 "classname" "light"
-"origin" "-12 140 0"
-"light" "10"
+"origin" "-6.000000 138.000000 0.000000"
+"light" "20"
 "_color" "1 0 0"
-"spawnflags" "1"
-"offset" "0"
-"time" "0.2"
 }
 // entity 5
 {
 "classname" "light"
-"origin" "-12 -140 0"
-"light" "10"
+"origin" "-6.000000 -138.000000 0.000000"
+"light" "20"
 "_color" "0 1 0"
-"spawnflags" "1"
-"offset" "0.5"
-"time" "0.2"
 }
 // entity 6
 {
@@ -894,3 +936,47 @@
 "origin" "40.000000 0.000000 0.000000"
 "model" "maps/independent/sections/avenger_cockpit"
 }
+// entity 12
+{
+"classname" "light"
+"origin" "-146.000000 138.000000 0.000000"
+"light" "25"
+"_color" "1 0 0"
+"spawnflags" "1"
+"offset" "0"
+"time" "0.2"
+"flare" "4"
+}
+// entity 13
+{
+"classname" "light"
+"origin" "-6.000000 138.000000 0.000000"
+"light" "25"
+"_color" "1 0 0"
+"spawnflags" "1"
+"offset" "0"
+"time" "0.2"
+"flare" "4"
+}
+// entity 14
+{
+"classname" "light"
+"origin" "-146.000000 -138.000000 0.000000"
+"light" "25"
+"_color" "0 1 0"
+"spawnflags" "1"
+"offset" "0.5"
+"time" "0.2"
+"flare" "4"
+}
+// entity 15
+{
+"classname" "light"
+"origin" "-6.000000 -138.000000 0.000000"
+"light" "25"
+"_color" "0 1 0"
+"spawnflags" "1"
+"offset" "0.5"
+"time" "0.2"
+"flare" "4"
+}
diff --git a/base/maps/independent/shootingstar.map b/base/maps/independent/shootingstar.map
index 4a26891..de0ec55 100644
--- a/base/maps/independent/shootingstar.map
+++ b/base/maps/independent/shootingstar.map
@@ -383,12 +383,12 @@
 }
 // brush 42
 {
-( -24 -140 -20 ) ( -24 -140 20 ) ( 8 -140 -20 ) common/entity 0 0 0 1 1 0 0 0
+( -24 -140 -20 ) ( -24 -140 20 ) ( 8 -140 -20 ) colors/green_bright 0 0 0 1 1 0 0 0
 ( -32 -140 -20 ) ( -32 -92 -20 ) ( -32 -140 20 ) colors/grey50 0 0 0 1 1 0 0 0
-( -64 -140 4 ) ( -64 -92 8 ) ( 64 -140 4 ) common/entity 0 0 0 1 1 0 0 0
-( -64 -92 -8 ) ( -64 -140 -4 ) ( 64 -92 -8 ) common/entity 0 0 0 1 1 0 0 0
-( -16 -44 12 ) ( 16 -44 -24 ) ( 16 -44 12 ) common/caulk 0 0 0 1 1 0 0 0
-( 4 -44 -64 ) ( -12 -140 -64 ) ( 4 -44 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -64 -140 4 ) ( -64 -92 8 ) ( 64 -140 4 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -64 -92 -8 ) ( -64 -140 -4 ) ( 64 -92 -8 ) colors/green_bright 0 0 0 1 1 0 0 0
+( -30 -136 -64 ) ( -26 -136 -64 ) ( -30 -136 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 -136 -64 ) ( -16 -138 -64 ) ( -16 -136 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 43
 {
@@ -421,12 +421,12 @@
 }
 // brush 46
 {
-( 8 140 -20 ) ( -24 140 20 ) ( -24 140 -20 ) common/entity 0 0 0 1 1 0 0 0
 ( -32 140 20 ) ( -32 92 -20 ) ( -32 140 -20 ) colors/grey50 0 0 0 1 1 0 0 0
 ( 64 140 4 ) ( -64 92 8 ) ( -64 140 4 ) common/entity 0 0 0 1 1 0 0 0
 ( 64 92 -8 ) ( -64 140 -4 ) ( -64 92 -8 ) common/entity 0 0 0 1 1 0 0 0
 ( 16 44 12 ) ( 16 44 -24 ) ( -16 44 12 ) common/caulk 0 0 0 1 1 0 0 0
 ( 4 44 64 ) ( -12 140 -64 ) ( 4 44 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -28 136 -64 ) ( -20 136 -64 ) ( -28 136 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 47
 {
@@ -616,6 +616,42 @@ colors/grey50
 ( 64 -12 44 ) ( -64 -8 -4 ) ( -64 -12 44 ) common/entity 0 0 0 1 1 0 0 0
 ( -40 -64 20 ) ( -48 64 20 ) ( -40 64 20 ) common/caulk 0 0 0 1 1 0 0 0
 }
+// brush 64
+{
+( -32 -140 -20 ) ( -32 -92 -20 ) ( -32 -140 20 ) colors/grey50 0 0 0 1 1 0 0 0
+( -64 -140 4 ) ( -64 -92 8 ) ( 64 -140 4 ) common/entity 0 0 0 1 1 0 0 0
+( -64 -92 -8 ) ( -64 -140 -4 ) ( 64 -92 -8 ) common/entity 0 0 0 1 1 0 0 0
+( -16 -44 12 ) ( 16 -44 -24 ) ( 16 -44 12 ) common/caulk 0 0 0 1 1 0 0 0
+( 4 -44 -64 ) ( -12 -140 -64 ) ( 4 -44 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -30 -136 64 ) ( -26 -136 -64 ) ( -30 -136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 65
+{
+( -24 -140 -20 ) ( -24 -140 20 ) ( 8 -140 -20 ) common/entity 0 0 0 1 1 0 0 0
+( -64 -140 4 ) ( -64 -92 8 ) ( 64 -140 4 ) common/entity 0 0 0 1 1 0 0 0
+( -64 -92 -8 ) ( -64 -140 -4 ) ( 64 -92 -8 ) common/entity 0 0 0 1 1 0 0 0
+( 4 -44 -64 ) ( -12 -140 -64 ) ( 4 -44 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -30 -136 -64 ) ( -26 -136 -64 ) ( -30 -136 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 -136 64 ) ( -16 -138 -64 ) ( -16 -136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 66
+{
+( 8 140 -20 ) ( -24 140 20 ) ( -24 140 -20 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -32 140 20 ) ( -32 92 -20 ) ( -32 140 -20 ) colors/grey50 0 0 0 1 1 0 0 0
+( 64 140 4 ) ( -64 92 8 ) ( -64 140 4 ) colors/red_bright 0 0 0 1 1 0 0 0
+( 64 92 -8 ) ( -64 140 -4 ) ( -64 92 -8 ) colors/red_bright 0 0 0 1 1 0 0 0
+( -28 136 64 ) ( -20 136 -64 ) ( -28 136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 140 -64 ) ( -16 138 -64 ) ( -16 140 64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 67
+{
+( 8 140 -20 ) ( -24 140 20 ) ( -24 140 -20 ) common/entity 0 0 0 1 1 0 0 0
+( 64 140 4 ) ( -64 92 8 ) ( -64 140 4 ) common/entity 0 0 0 1 1 0 0 0
+( 64 92 -8 ) ( -64 140 -4 ) ( -64 92 -8 ) common/entity 0 0 0 1 1 0 0 0
+( 4 44 64 ) ( -12 140 -64 ) ( 4 44 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -28 136 64 ) ( -20 136 -64 ) ( -28 136 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -16 140 64 ) ( -16 138 -64 ) ( -16 140 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
 }
 // entity 1
 {
@@ -630,22 +666,16 @@ colors/grey50
 // entity 2
 {
 "classname" "light"
-"origin" "-12 140 0"
-"light" "10"
+"origin" "-24.000000 138.000000 0.000000"
+"light" "20"
 "_color" "1 0 0"
-"spawnflags" "1"
-"offset" "0"
-"time" "0.2"
 }
 // entity 3
 {
 "classname" "light"
-"origin" "-12 -140 0"
-"light" "10"
+"origin" "-24.000000 -138.000000 0.000000"
+"light" "20"
 "_color" "0 1 0"
-"spawnflags" "1"
-"offset" "0.5"
-"time" "0.2"
 }
 // entity 4
 {
@@ -685,3 +715,24 @@ colors/grey50
 "origin" "32.000000 0.000000 0.000000"
 "model" "maps/independent/sections/avenger_cockpit"
 }
+// entity 10
+{
+"classname" "light"
+"origin" "-24.000000 -138.000000 0.000000"
+"light" "25"
+"_color" "0 1 0"
+"spawnflags" "1"
+"offset" "0.5"
+"time" "0.2"
+}
+// entity 11
+{
+"classname" "light"
+"origin" "-24.000000 138.000000 0.000000"
+"light" "25"
+"_color" "1 0 0"
+"spawnflags" "1"
+"offset" "0"
+"time" "0.2"
+"flare" "4"
+}