updates from Thorn

1 files changed, 189 insertions, 74 deletions

diff --git a/base/maps/ships/sharkan.map b/base/maps/ships/sharkan.map
index 60f7716..8b3819e 100644
--- a/base/maps/ships/sharkan.map
+++ b/base/maps/ships/sharkan.map
@@ -4,12 +4,12 @@
 "classname" "worldspawn"
 // brush 0
 {
-( -64 4 140 ) ( -64 0 140 ) ( -64 4 38 ) common/entity 0 0 0 1 1
-( -8 -2 38 ) ( -12 -2 38 ) ( -8 -2 140 ) common/entity 0 0 0 1 1
-( 38 -2 44 ) ( -57 -2 88 ) ( -57 0 88 ) common/entity 0 0 0 1 1
+( -64 4 140 ) ( -64 0 140 ) ( -64 4 38 ) common/entity_second 0 0 0 1 1
+( -8 -2 38 ) ( -12 -2 38 ) ( -8 -2 140 ) colors/grey75 0 0 0 1 1
+( 38 -2 44 ) ( -57 -2 88 ) ( -57 0 88 ) common/entity_second 0 0 0 1 1
 ( -64 0 88 ) ( -57 0 88 ) ( -57 -2 88 ) common/entity 0 0 0 1 1
 ( 64 -4 44 ) ( -64 10 44 ) ( -64 -4 44 ) common/caulk 0 0 0 1 1
-( -12 2 140 ) ( -12 2 38 ) ( -8 2 140 ) common/entity 0 0 0 1 1
+( -12 2 140 ) ( -12 2 38 ) ( -8 2 140 ) colors/grey75 0 0 0 1 1
 }
 // brush 1
 {
@@ -140,117 +140,114 @@
 {
 ( -64 2 32 ) ( 38 4 32 ) ( 38 2 32 ) common/caulk 0 0 0 1 1
 ( 38 0 26 ) ( -64 0 30 ) ( 38 0 30 ) common/caulk 0 0 0 1 1
-( 38 4 28 ) ( 38 2 24 ) ( 38 2 28 ) common/entity 0 0 0 1 1
+( 38 4 28 ) ( 38 2 24 ) ( 38 2 28 ) common/entity_second 0 0 0 1 1
 ( 38 6 24 ) ( -64 6 28 ) ( -64 6 24 ) common/entity 0 0 0 1 1
-( -64 4 28 ) ( -64 2 24 ) ( -64 4 24 ) common/entity 0 0 0 1 1
+( -64 4 28 ) ( -64 2 24 ) ( -64 4 24 ) common/entity_second 0 0 0 1 1
 ( 64 0 28 ) ( -64 12 24 ) ( -64 0 28 ) common/caulk 0 0 0 1 1
 }
 // brush 15
 {
 ( 38 -2 32 ) ( 38 -4 32 ) ( -64 -2 32 ) common/caulk 0 0 0 1 1
 ( 38 0 30 ) ( -64 0 30 ) ( 38 0 26 ) common/caulk 0 0 0 1 1
-( 38 -2 28 ) ( 38 -2 24 ) ( 38 -4 28 ) common/entity 0 0 0 1 1
+( 38 -2 28 ) ( 38 -2 24 ) ( 38 -4 28 ) common/entity_second 0 0 0 1 1
 ( -64 -6 24 ) ( -64 -6 28 ) ( 38 -6 24 ) common/entity 0 0 0 1 1
-( -64 -4 24 ) ( -64 -2 24 ) ( -64 -4 28 ) common/entity 0 0 0 1 1
+( -64 -4 24 ) ( -64 -2 24 ) ( -64 -4 28 ) common/entity_second 0 0 0 1 1
 ( -64 0 28 ) ( -64 -12 24 ) ( 64 0 28 ) common/caulk 0 0 0 1 1
 }
 // brush 16
 {
-( -64 4 134 ) ( -64 0 134 ) ( -64 4 32 ) common/entity 0 0 0 1 1
-( 38 -4 38 ) ( -64 -4 38 ) ( -64 -2 44 ) common/entity 0 0 0 1 1
-( 38 -2 32 ) ( 38 -2 134 ) ( 38 2 32 ) common/entity 0 0 0 1 1
+( -64 4 134 ) ( -64 0 134 ) ( -64 4 32 ) common/entity_second 0 0 0 1 1
+( 38 -4 38 ) ( -64 -4 38 ) ( -64 -2 44 ) colors/grey75 0 0 0 1 1
+( 38 -2 32 ) ( 38 -2 134 ) ( 38 2 32 ) common/entity_second 0 0 0 1 1
 ( -64 -4 44 ) ( -64 10 44 ) ( 64 -4 44 ) common/caulk 0 0 0 1 1
 ( -64 -4 32 ) ( 38 -4 32 ) ( 38 0 32 ) common/caulk 0 0 0 1 1
-( -64 4 38 ) ( 38 4 38 ) ( 38 2 44 ) common/entity 0 0 0 1 1
+( -64 4 38 ) ( 38 4 38 ) ( 38 2 44 ) colors/grey75 0 0 0 1 1
 }
 // brush 17
 {
-( 40 6 22.625 ) ( -64 6 22.625 ) ( -64 6 32 ) common/caulk 0 0 0 1 1
-( -64 4 28 ) ( -64 4 16 ) ( -64 16 28 ) common/entity 0 0 0 1 1
-( 38 16 16 ) ( 38 4 16 ) ( 38 16 28 ) common/entity 0 0 0 1 1
-( 34 0 28 ) ( 34 12 24 ) ( -94 0 28 ) common/caulk 0 0 0 1 1
-( -90 6 32 ) ( 38 12 30 ) ( 38 6 32 ) common/entity 0 0 0 1 1
-( -90 12 30 ) ( 38 16 26 ) ( 38 12 30 ) common/entity 0 0 0 1 1
-( -90 18 24 ) ( 38 16 24 ) ( 38 18 24 ) common/caulk 0 0 0 1 1
-}
-// brush 18
-{
-( -64 4 28 ) ( -64 4 16 ) ( -64 16 28 ) common/entity 0 0 0 1 1
-( 38 16 16 ) ( 38 4 16 ) ( 38 16 28 ) common/entity 0 0 0 1 1
-( 38 18 24 ) ( 38 16 24 ) ( -90 18 24 ) common/caulk 0 0 0 1 1
-( 38 22 20 ) ( -64 22 20 ) ( 38 16 20 ) common/caulk 0 0 0 1 1
-( 36 12 24 ) ( 36 16 20 ) ( -92 12 24 ) common/caulk 0 0 0 1 1
-( -64 18 24 ) ( -64 20 22 ) ( 64 18 24 ) common/entity 0 0 0 1 1
-}
-// brush 19
-{
 ( -66 -6 22.625 ) ( 38 -6 22.625 ) ( 38 -6 32 ) common/caulk 0 0 0 1 1
-( 38 -4 28 ) ( 38 -4 16 ) ( 38 -16 28 ) common/entity 0 0 0 1 1
-( -64 -16 16 ) ( -64 -4 16 ) ( -64 -16 28 ) common/entity 0 0 0 1 1
+( 38 -4 28 ) ( 38 -4 16 ) ( 38 -16 28 ) common/entity_second 0 0 0 1 1
+( -64 -16 16 ) ( -64 -4 16 ) ( -64 -16 28 ) common/entity_second 0 0 0 1 1
 ( -60 0 28 ) ( -60 -12 24 ) ( 68 0 28 ) common/caulk 0 0 0 1 1
-( 64 -6 32 ) ( -64 -12 30 ) ( -64 -6 32 ) common/entity 0 0 0 1 1
-( 64 -12 30 ) ( -64 -16 26 ) ( -64 -12 30 ) common/entity 0 0 0 1 1
+( 64 -6 32 ) ( -64 -12 30 ) ( -64 -6 32 ) colors/grey75 0 0 0 1 1
+( 64 -12 30 ) ( -64 -16 26 ) ( -64 -12 30 ) colors/grey75 0 0 0 1 1
 ( 64 -18 24 ) ( -64 -16 24 ) ( -64 -18 24 ) common/caulk 0 0 0 1 1
 }
-// brush 20
+// brush 18
 {
-( 38 -12 24 ) ( 38 -22 20 ) ( 38 -18 24 ) common/entity 0 0 0 1 1
-( -64 -16 16 ) ( -64 -4 16 ) ( -64 -16 28 ) common/entity 0 0 0 1 1
-( 64 -12 30 ) ( -64 -16 26 ) ( -64 -12 30 ) common/entity 0 0 0 1 1
+( 38 -4 28 ) ( 38 -4 16 ) ( 38 -16 28 ) common/entity_second 0 0 0 1 1
+( -64 -16 16 ) ( -64 -4 16 ) ( -64 -16 28 ) common/entity_second 0 0 0 1 1
 ( -64 -18 24 ) ( -64 -16 24 ) ( 64 -18 24 ) common/caulk 0 0 0 1 1
-( -64 -20 22 ) ( 38 -22 20 ) ( -64 -20 20 ) common/entity 0 0 0 1 1
-( -64 -20 20 ) ( 38 -22 20 ) ( -64 -16 20 ) common/caulk 0 0 0 1 1
+( -64 -22 20 ) ( 38 -22 20 ) ( -64 -16 20 ) common/caulk 0 0 0 1 1
 ( -62 -12 24 ) ( -62 -16 20 ) ( 66 -12 24 ) common/caulk 0 0 0 1 1
+( 38 -18 24 ) ( 38 -20 22 ) ( -90 -18 24 ) colors/grey75 0 0 0 1 1
 }
-// brush 21
+// brush 19
 {
-( -64 -28 20 ) ( -64 -16 20 ) ( 56 -16 20 ) common/entity 0 0 0 1 1
-( 38 -16 8 ) ( 38 -24 22 ) ( 38 -16 22 ) common/entity 0 0 0 1 1
+( -64 -28 20 ) ( -64 -16 20 ) ( 56 -16 20 ) colors/grey75 0 0 0 1 1
+( 38 -16 8 ) ( 38 -24 22 ) ( 38 -16 22 ) common/entity_second 0 0 0 1 1
 ( -64 -20 8 ) ( 56 -16 20 ) ( -64 -16 20 ) common/caulk 0 0 0 1 1
-( 56 -28 8 ) ( -64 -20 8 ) ( -64 -28 8 ) common/entity 0 0 0 1 1
-( -64 -20 8 ) ( -64 -28 22 ) ( -64 -28 8 ) common/entity 0 0 0 1 1
+( 56 -28 8 ) ( -64 -20 8 ) ( -64 -28 8 ) colors/grey75 0 0 0 1 1
+( -64 -20 8 ) ( -64 -28 22 ) ( -64 -28 8 ) common/entity_second 0 0 0 1 1
 ( -64 -36 22 ) ( 56 -36 8 ) ( -64 -36 8 ) common/caulk 0 0 0 1 1
-( -74 -28 20 ) ( -74 -36 16 ) ( -202 -28 20 ) common/entity 0 0 0 1 1
-( -74 -36 12 ) ( -74 -28 8 ) ( -202 -36 12 ) common/entity 0 0 0 1 1
+( -74 -28 20 ) ( -74 -36 16 ) ( -202 -28 20 ) colors/grey75 0 0 0 1 1
+( -74 -36 12 ) ( -74 -28 8 ) ( -202 -36 12 ) colors/grey75 0 0 0 1 1
 }
-// brush 22
+// brush 20
 {
-( 56 16 20 ) ( -64 16 20 ) ( -64 28 20 ) common/entity 0 0 0 1 1
-( 38 16 22 ) ( 38 24 22 ) ( 38 16 8 ) common/entity 0 0 0 1 1
+( 56 16 20 ) ( -64 16 20 ) ( -64 28 20 ) colors/grey75 0 0 0 1 1
+( 38 16 22 ) ( 38 24 22 ) ( 38 16 8 ) common/entity_second 0 0 0 1 1
 ( -64 16 20 ) ( 56 16 20 ) ( -64 20 8 ) common/caulk 0 0 0 1 1
-( -64 28 8 ) ( -64 20 8 ) ( 56 28 8 ) common/entity 0 0 0 1 1
-( -64 28 8 ) ( -64 28 22 ) ( -64 20 8 ) common/entity 0 0 0 1 1
+( -64 28 8 ) ( -64 20 8 ) ( 56 28 8 ) colors/grey75 0 0 0 1 1
+( -64 28 8 ) ( -64 28 22 ) ( -64 20 8 ) common/entity_second 0 0 0 1 1
 ( -64 36 8 ) ( 56 36 8 ) ( -64 36 22 ) common/caulk 0 0 0 1 1
-( -202 28 20 ) ( -74 36 16 ) ( -74 28 20 ) common/entity 0 0 0 1 1
-( -202 36 12 ) ( -74 28 8 ) ( -74 36 12 ) common/entity 0 0 0 1 1
+( -202 28 20 ) ( -74 36 16 ) ( -74 28 20 ) colors/grey75 0 0 0 1 1
+( -202 36 12 ) ( -74 28 8 ) ( -74 36 12 ) colors/grey75 0 0 0 1 1
 }
-// brush 23
+// brush 21
 {
-( -56 -112 16 ) ( -64 -112 16 ) ( 38 -36 16 ) common/entity 0 0 0 1 1
+( -56 -112 16 ) ( -64 -112 16 ) ( 38 -36 16 ) colors/grey75 0 0 0 1 1
 ( -64 -36 16 ) ( 38 -36 12 ) ( 38 -36 16 ) common/entity 0 0 0 1 1
-( -64 -112 12 ) ( -56 -112 12 ) ( -64 -36 12 ) common/entity 0 0 0 1 1
-( -64 -112 16 ) ( -64 -112 12 ) ( -64 -36 16 ) common/entity 0 0 0 1 1
+( -64 -112 12 ) ( -56 -112 12 ) ( -64 -36 12 ) colors/grey75 0 0 0 1 1
+( -64 -112 16 ) ( -64 -112 12 ) ( -64 -36 16 ) common/entity_second 0 0 0 1 1
 ( -56 -112 16 ) ( -56 -112 12 ) ( -64 -112 16 ) common/entity 0 0 0 1 1
-( -56 -112 12 ) ( -56 -112 16 ) ( 38 -36 12 ) common/entity 0 0 0 1 1
+( -56 -112 12 ) ( -56 -112 16 ) ( 38 -36 12 ) common/entity_second 0 0 0 1 1
 }
-// brush 24
+// brush 22
 {
-( 38 36 16 ) ( -64 112 16 ) ( -56 112 16 ) common/entity 0 0 0 1 1
+( 38 36 16 ) ( -64 112 16 ) ( -56 112 16 ) colors/grey75 0 0 0 1 1
 ( 38 36 16 ) ( 38 36 12 ) ( -64 36 16 ) common/entity 0 0 0 1 1
-( -64 36 12 ) ( -56 112 12 ) ( -64 112 12 ) common/entity 0 0 0 1 1
-( -64 36 16 ) ( -64 112 12 ) ( -64 112 16 ) common/entity 0 0 0 1 1
+( -64 36 12 ) ( -56 112 12 ) ( -64 112 12 ) colors/grey75 0 0 0 1 1
+( -64 36 16 ) ( -64 112 12 ) ( -64 112 16 ) common/entity_second 0 0 0 1 1
 ( -64 112 16 ) ( -56 112 12 ) ( -56 112 16 ) common/entity 0 0 0 1 1
-( 38 36 12 ) ( -56 112 16 ) ( -56 112 12 ) common/entity 0 0 0 1 1
+( 38 36 12 ) ( -56 112 16 ) ( -56 112 12 ) common/entity_second 0 0 0 1 1
+}
+// brush 23
+{
+( 40 6 22.625 ) ( -64 6 22.625 ) ( -64 6 32 ) common/caulk 0 0 0 1 1
+( -64 4 28 ) ( -64 4 16 ) ( -64 16 28 ) common/entity_second 0 0 0 1 1
+( 38 16 16 ) ( 38 4 16 ) ( 38 16 28 ) common/entity_second 0 0 0 1 1
+( 34 0 28 ) ( 34 12 24 ) ( -94 0 28 ) common/caulk 0 0 0 1 1
+( -90 6 32 ) ( 38 12 30 ) ( 38 6 32 ) colors/grey75 0 0 0 1 1
+( -90 12 30 ) ( 38 16 26 ) ( 38 12 30 ) colors/grey75 0 0 0 1 1
+( -90 18 24 ) ( 38 16 24 ) ( 38 18 24 ) common/caulk 0 0 0 1 1
+}
+// brush 24
+{
+( -64 4 28 ) ( -64 4 16 ) ( -64 16 28 ) common/entity_second 0 0 0 1 1
+( 38 16 16 ) ( 38 4 16 ) ( 38 16 28 ) common/entity_second 0 0 0 1 1
+( 38 18 24 ) ( 38 16 24 ) ( -90 18 24 ) common/caulk 0 0 0 1 1
+( 38 22 20 ) ( -64 22 20 ) ( 38 16 20 ) common/caulk 0 0 0 1 1
+( 36 12 24 ) ( 36 16 20 ) ( -92 12 24 ) common/caulk 0 0 0 1 1
+( -64 18 24 ) ( -64 20 22 ) ( 64 18 24 ) colors/grey75 0 0 0 1 1
 }
 // brush 25
 {
 ( -64 20 -12 ) ( -64 -20 124 ) ( -64 -20 -12 ) colors/grey75 0 0 0 1 1
-( -80 0 28 ) ( -80 -12 24 ) ( -208 0 28 ) colors/grey75 0 0 0 1 1
 ( -208 -20 8 ) ( -80 -18 14 ) ( -80 -20 8 ) colors/grey75 0 0 0 1 1
 ( -80 -20 -8 ) ( -80 -18 -14 ) ( -208 -20 -8 ) colors/grey75 0 0 0 1 1
 ( -208 0 -28 ) ( -80 -6 -26 ) ( -80 0 -28 ) colors/grey75 0 0 0 1 1
 ( -80 0 -28 ) ( -80 6 -26 ) ( -208 0 -28 ) colors/grey75 0 0 0 1 1
-( -80 12 24 ) ( -80 0 28 ) ( -208 12 24 ) colors/grey75 0 0 0 1 1
 ( -208 18 14 ) ( -80 20 8 ) ( -80 18 14 ) colors/grey75 0 0 0 1 1
 ( -208 20 -8 ) ( -80 16 -20 ) ( -80 20 -8 ) colors/grey75 0 0 0 1 1
 ( -74 -12 24 ) ( -74 -14 22 ) ( -202 -12 24 ) colors/grey75 0 0 0 1 1
@@ -259,11 +256,128 @@
 ( -202 16 -20 ) ( -74 14 -22 ) ( -74 16 -20 ) colors/grey75 0 0 0 1 1
 ( 106 22 -12 ) ( 107 22 -12 ) ( 106 22 116 ) colors/grey75 0 0 0 1 1
 ( 64 -22 1 ) ( -64 -22 -1 ) ( -64 -22 1 ) colors/grey75 0 0 0 1 1
-( 176 -19 116 ) ( 176 -16 -12 ) ( 176 -19 -12 ) common/caulk 0 0 0 1 1
-( 176 -64 -4 ) ( 104 64 28 ) ( 176 64 -4 ) colors/grey75 0 0 0 1 1
-( 176 64 -12 ) ( 104 64 -28 ) ( 176 -64 -12 ) colors/grey75 0 0 0 1 1
-( 104 -22 64 ) ( 176 -4 -64 ) ( 104 -22 -64 ) colors/grey75 0 0 0 1 1
-( 176 4 64 ) ( 104 22 -64 ) ( 176 4 -64 ) colors/grey75 0 0 0 1 1
+( 160 -64 -8 ) ( 160 64 0 ) ( 160 64 -8 ) colors/grey25 0 0 0 1 1
+( -64 -12 24 ) ( -64 -8 24 ) ( 64 -12 24 ) common/engine 0 0 0 1 1
+}
+// brush 26
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -16 0 28 ) ( -16 -12 24 ) ( -144 0 28 ) colors/grey75 0 0 0 1 1
+( -144 -20 8 ) ( -16 -18 14 ) ( -16 -20 8 ) colors/grey75 0 0 0 1 1
+( 0 12 24 ) ( 0 0 28 ) ( -128 12 24 ) colors/grey75 0 0 0 1 1
+( -10 -12 24 ) ( -10 -14 22 ) ( -138 -12 24 ) colors/grey75 0 0 0 1 1
+( -144 0 24 ) ( -16 -12 20 ) ( -16 0 24 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 27
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -144 -20 8 ) ( -16 -18 14 ) ( -16 -20 8 ) colors/grey75 0 0 0 1 1
+( -16 -20 -8 ) ( -16 -18 -14 ) ( -144 -20 -8 ) colors/grey75 0 0 0 1 1
+( 128 -22 1 ) ( 0 -22 -1 ) ( 0 -22 1 ) colors/grey75 0 0 0 1 1
+( -16 0 24 ) ( -16 -12 20 ) ( -144 0 24 ) colors/grey75 0 0 0 1 1
+( -16 -16 8 ) ( -16 -14 14 ) ( -144 -16 8 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 28
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -16 -20 -8 ) ( -16 -18 -14 ) ( -144 -20 -8 ) colors/grey75 0 0 0 1 1
+( -144 0 -28 ) ( -16 -6 -26 ) ( -16 0 -28 ) colors/grey75 0 0 0 1 1
+( -10 -16 -20 ) ( -10 -14 -22 ) ( -138 -16 -20 ) colors/grey75 0 0 0 1 1
+( -144 -16 8 ) ( -16 -14 14 ) ( -16 -16 8 ) colors/grey75 0 0 0 1 1
+( -144 -16 -8 ) ( -16 -14 -14 ) ( -16 -16 -8 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 29
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -144 -16 8 ) ( -16 -14 14 ) ( -16 -16 8 ) colors/grey75 0 0 0 1 1
+( -16 -16 -8 ) ( -16 -14 -14 ) ( -144 -16 -8 ) colors/grey75 0 0 0 1 1
+( 0 -18 1 ) ( 0 -18 -1 ) ( 128 -18 1 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 30
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -144 20 -8 ) ( -16 16 -20 ) ( -16 20 -8 ) colors/grey75 0 0 0 1 1
+( 0 0 -24 ) ( 0 6 -22 ) ( -128 0 -24 ) colors/grey75 0 0 0 1 1
+( -144 14 14 ) ( -16 16 8 ) ( -16 14 14 ) colors/grey75 0 0 0 1 1
+( -16 16 -8 ) ( -16 12 -20 ) ( -144 16 -8 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 31
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -144 14 14 ) ( -16 16 8 ) ( -16 14 14 ) colors/grey75 0 0 0 1 1
+( -144 16 -8 ) ( -16 12 -20 ) ( -16 16 -8 ) colors/grey75 0 0 0 1 1
+( 170 18 116 ) ( 171 18 -12 ) ( 170 18 -12 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 32
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -144 18 14 ) ( -16 20 8 ) ( -16 18 14 ) colors/grey75 0 0 0 1 1
+( -144 20 -8 ) ( -16 16 -20 ) ( -16 20 -8 ) colors/grey75 0 0 0 1 1
+( 170 22 -12 ) ( 171 22 -12 ) ( 170 22 116 ) colors/grey75 0 0 0 1 1
+( 0 12 20 ) ( 0 0 24 ) ( -128 12 20 ) colors/grey75 0 0 0 1 1
+( -16 14 14 ) ( -16 16 8 ) ( -144 14 14 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 33
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( 0 12 24 ) ( 0 0 28 ) ( -128 12 24 ) colors/grey75 0 0 0 1 1
+( -144 18 14 ) ( -16 20 8 ) ( -16 18 14 ) colors/grey75 0 0 0 1 1
+( -122 12 24 ) ( 6 14 22 ) ( 6 12 24 ) colors/grey75 0 0 0 1 1
+( -16 0 24 ) ( -16 -12 20 ) ( -144 0 24 ) colors/grey75 0 0 0 1 1
+( -128 12 20 ) ( 0 0 24 ) ( 0 12 20 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 34
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( -144 0 -28 ) ( -16 -6 -26 ) ( -16 0 -28 ) colors/grey75 0 0 0 1 1
+( 0 0 -28 ) ( 0 6 -26 ) ( -128 0 -28 ) colors/grey75 0 0 0 1 1
+( -16 -16 -8 ) ( -16 -14 -14 ) ( -144 -16 -8 ) colors/grey75 0 0 0 1 1
+( -16 0 -24 ) ( -16 -6 -22 ) ( -144 0 -24 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 35
+{
+( 160 20 -12 ) ( 160 -20 124 ) ( 160 -20 -12 ) colors/grey75 0 0 0 1 1
+( 0 0 -28 ) ( 0 6 -26 ) ( -128 0 -28 ) colors/grey75 0 0 0 1 1
+( -144 20 -8 ) ( -16 16 -20 ) ( -16 20 -8 ) colors/grey75 0 0 0 1 1
+( -122 16 -20 ) ( 6 14 -22 ) ( 6 16 -20 ) colors/grey75 0 0 0 1 1
+( -144 0 -24 ) ( -16 -6 -22 ) ( -16 0 -24 ) colors/grey75 0 0 0 1 1
+( -128 0 -24 ) ( 0 6 -22 ) ( 0 0 -24 ) colors/grey75 0 0 0 1 1
+( 168 -64 -28 ) ( 240 64 28 ) ( 168 64 -28 ) colors/grey50 0 0 0 1 1
+}
+// brush 36
+{
+( -64 20 -12 ) ( -64 -20 124 ) ( -64 -20 -12 ) colors/grey75 0 0 0 1 1
+( -64 -12 24 ) ( 96 0 28 ) ( 80 -12 24 ) common/entity 0 0 0 1 1
+( 64 -12 24 ) ( -64 -8 24 ) ( -64 -12 24 ) common/caulk 0 0 0 1 1
+( 40 -2 -64 ) ( 48 -2 -64 ) ( 40 -2 64 ) common/caulk 0 0 0 1 1
+( 96 -2 -64 ) ( 86 -12 -64 ) ( 96 -2 64 ) colors/grey75 0 0 0 1 1
+}
+// brush 37
+{
+( -64 20 -12 ) ( -64 -20 124 ) ( -64 -20 -12 ) colors/grey75 0 0 0 1 1
+( 80 12 24 ) ( 96 0 28 ) ( -64 12 24 ) common/entity 0 0 0 1 1
+( 64 -12 24 ) ( -64 -8 24 ) ( -64 -12 24 ) common/caulk 0 0 0 1 1
+( 40 2 64 ) ( 48 2 -64 ) ( 40 2 -64 ) common/caulk 0 0 0 1 1
+( 96 2 64 ) ( 86 12 -64 ) ( 96 2 -64 ) colors/grey75 0 0 0 1 1
+}
+// brush 38
+{
+( 62 2 28 ) ( 58 2 28 ) ( 62 2 24 ) colors/grey75 0 0 0 1 1
+( 160 4 28 ) ( 160 4 24 ) ( 160 2 28 ) common/caulk 0 0 0 1 1
+( 58 0 24 ) ( 62 0 24 ) ( 58 2 24 ) common/caulk 0 0 0 1 1
+( 56 -2 24 ) ( 56 -2 28 ) ( 60 -2 24 ) colors/grey75 0 0 0 1 1
+( -64 -4 24 ) ( -64 -2 24 ) ( -64 -4 28 ) colors/grey75 0 0 0 1 1
+( 64 0 28 ) ( -64 -12 24 ) ( -64 0 28 ) colors/grey75 0 0 0 1 1
+( -64 0 28 ) ( -64 12 24 ) ( 64 0 28 ) colors/grey75 0 0 0 1 1
 }
 }
 // entity 1
@@ -305,7 +419,8 @@
 // entity 5
 {
 "classname" "target_flare"
-"origin" "170 0 -8"
-"radius" "25"
+"origin" "184 0 0"
 "flare" "2"
+"time" "-1"
+"radius" "40"
 }