updates from supertanker, bumblebee

1 files changed, 87 insertions, 51 deletions

diff --git a/base/maps/ships/supertanker.map b/base/maps/ships/supertanker.map
index 79579c0..a8127b1 100644
--- a/base/maps/ships/supertanker.map
+++ b/base/maps/ships/supertanker.map
@@ -1806,25 +1806,24 @@
 }
 // brush 178
 {
-( 544 -704 -192 ) ( 992 -800 -192 ) ( 992 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -864 -128 ) ( 992 -864 -128 ) ( 992 -800 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
-( 544 -640 -128 ) ( 992 -704 -192 ) ( 992 -640 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 848 -816 -176 ) ( 832 -800 -192 ) ( 832 -816 -176 ) colors/grey75 0 0 0 1 1 0 0 0
+( 832 -688 -176 ) ( 832 -816 -176 ) ( 832 -800 -192 ) common/caulk 0 0 0 1 1
+( 848 -688 -176 ) ( 832 -688 -176 ) ( 832 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
 ( 992 64 -32 ) ( 960 64 -64 ) ( 992 -64 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( -64 -736 -176 ) ( -64 -720 -176 ) ( 64 -736 -176 ) colors/grey75 0 0 0 1 1 0 0 0
+( 848 -688 -176 ) ( 832 -816 -176 ) ( 832 -688 -176 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 179
 {
-( 640 -384 32 ) ( 736 -800 32 ) ( 640 -800 32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 736 -384 -192 ) ( 640 -800 -192 ) ( 736 -800 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( 736 -864 -128 ) ( 640 -864 -32 ) ( 736 -864 -32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -704 32 ) ( 832 -704 32 ) ( 832 -800 32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -704 -192 ) ( 832 -800 -192 ) ( 832 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -864 -128 ) ( 832 -864 -32 ) ( 832 -864 -128 ) colors/grey75 0 0 0 1 1 0 0 0
 ( 512 -384 -224 ) ( 512 -800 64 ) ( 512 -800 -224 ) common/caulk 0 0 0 1 1
-( 640 -864 -128 ) ( 736 -768 -224 ) ( 640 -768 -224 ) colors/grey75 0 0 0 1 1 0 0 0
-( 640 -864 -32 ) ( 640 -768 64 ) ( 736 -768 64 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -704 64 ) ( 544 -672 -64 ) ( 544 -704 -64 ) colors/grey75 0 0 0 1 1 0 0 0
-( 992 -704 32 ) ( 992 -672 0 ) ( 1120 -704 32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 992 -640 -64 ) ( 992 -640 -96 ) ( 1120 -640 -64 ) colors/grey75 0 0 0 1 1 0 0 0
-( 992 -640 -128 ) ( 992 -672 -160 ) ( 1120 -640 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -864 -128 ) ( 832 -864 -128 ) ( 832 -800 -192 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -864 -32 ) ( 832 -800 32 ) ( 832 -864 -32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 832 -640 -32 ) ( 832 -800 -192 ) ( 832 -800 32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -640 -32 ) ( 832 -640 -32 ) ( 832 -704 32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -640 -32 ) ( 832 -640 -128 ) ( 832 -640 -32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 512 -640 -128 ) ( 832 -704 -192 ) ( 832 -640 -128 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 180
 {
@@ -1890,68 +1889,68 @@
 }
 // brush 186
 {
-( 544 -864 -128 ) ( 992 -864 -32 ) ( 992 -864 -128 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -864 -128 ) ( 992 -864 -128 ) ( 992 -800 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -864 -32 ) ( 992 -800 32 ) ( 992 -864 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
+( 992 -864 -32 ) ( 832 -864 -128 ) ( 832 -864 -32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 896 -864 -128 ) ( 832 -848 -144 ) ( 832 -864 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -864 -32 ) ( 832 -864 -32 ) ( 832 -848 -16 ) colors/grey75 0 0 0 1 1 0 0 0
+( 832 -864 -32 ) ( 832 -848 -144 ) ( 832 -848 -16 ) common/caulk 0 0 0 1 1
 ( 992 -864 -128 ) ( 992 -704 32 ) ( 992 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
 ( 992 64 -32 ) ( 960 64 -64 ) ( 992 -64 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 64 -848 -104 ) ( -64 -848 -88 ) ( -64 -848 -104 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -848 -16 ) ( 832 -848 -16 ) ( 832 -848 -144 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 187
 {
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
+( 832 -640 -128 ) ( 832 -656 -16 ) ( 832 -656 -144 ) common/caulk 0 0 0 1 1
 ( 992 -864 -128 ) ( 992 -704 32 ) ( 992 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -640 -32 ) ( 992 -640 -32 ) ( 992 -704 32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -640 -32 ) ( 992 -640 -128 ) ( 992 -640 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -640 -128 ) ( 992 -704 -192 ) ( 992 -640 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -640 -32 ) ( 832 -656 -16 ) ( 832 -640 -32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -640 -32 ) ( 832 -640 -32 ) ( 832 -640 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 896 -640 -128 ) ( 832 -640 -128 ) ( 832 -656 -144 ) colors/grey75 0 0 0 1 1 0 0 0
 ( 992 64 -32 ) ( 960 64 -64 ) ( 992 -64 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 64 -656 -56 ) ( -64 -656 -72 ) ( -64 -656 -56 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -656 -16 ) ( 832 -656 -144 ) ( 832 -656 -16 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 188
 {
-( 544 -704 32 ) ( 992 -704 32 ) ( 992 -800 32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -864 -32 ) ( 992 -800 32 ) ( 992 -864 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
+( 992 -704 32 ) ( 832 -800 32 ) ( 832 -704 32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -816 16 ) ( 832 -816 16 ) ( 832 -800 32 ) colors/grey75 0 0 0 1 1 0 0 0
+( 832 -688 16 ) ( 832 -800 32 ) ( 832 -816 16 ) common/caulk 0 0 0 1 1
 ( 992 -864 -128 ) ( 992 -704 32 ) ( 992 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -640 -32 ) ( 992 -640 -32 ) ( 992 -704 32 ) colors/grey75 0 0 0 1 1 0 0 0
-( 64 -736 16 ) ( -64 -712 16 ) ( -64 -736 16 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -688 16 ) ( 832 -704 32 ) ( 832 -688 16 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -816 16 ) ( 832 -688 16 ) ( 832 -816 16 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 189
 {
-( 544 -864 -32 ) ( 992 -800 32 ) ( 992 -864 -32 ) common/entity 0 0 0 1 1
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
+( 992 -848 -16 ) ( 832 -848 -16 ) ( 832 -816 16 ) common/entity 0 0 0 1 1
+( 832 -848 -32 ) ( 832 -800 16 ) ( 832 -816 16 ) common/caulk 0 0 0 1 1
 ( 992 -864 -128 ) ( 992 -704 32 ) ( 992 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( -64 -848 -104 ) ( -64 -848 -88 ) ( 64 -848 -104 ) common/caulk 0 0 0 1 1 0 0 0
-( -64 -736 16 ) ( -64 -712 16 ) ( 64 -736 16 ) common/caulk 0 0 0 1 1 0 0 0
-( -64 -800 16 ) ( -64 -816 0 ) ( 64 -800 16 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -848 -16 ) ( 832 -848 -32 ) ( 832 -848 -16 ) common/caulk 0 0 0 1 1 0 0 0
+( 992 -800 16 ) ( 832 -816 16 ) ( 832 -800 16 ) common/caulk 0 0 0 1 1 0 0 0
+( 992 -848 -32 ) ( 832 -800 16 ) ( 832 -848 -32 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 190
 {
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
+( 832 -656 -32 ) ( 832 -688 16 ) ( 832 -704 16 ) common/caulk 0 0 0 1 1
 ( 992 -864 -128 ) ( 992 -704 32 ) ( 992 -704 -192 ) colors/grey75 0 0 0 1 1 0 0 0
-( 544 -640 -32 ) ( 992 -640 -32 ) ( 992 -704 32 ) colors/grey75 0 0 0 1 1 0 0 0
-( -64 -656 -56 ) ( -64 -656 -72 ) ( 64 -656 -56 ) common/caulk 0 0 0 1 1 0 0 0
-( -64 -736 16 ) ( -64 -712 16 ) ( 64 -736 16 ) common/caulk 0 0 0 1 1 0 0 0
-( 64 -704 16 ) ( -64 -696 8 ) ( -64 -704 16 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -656 -16 ) ( 832 -688 16 ) ( 832 -656 -16 ) colors/grey75 0 0 0 1 1 0 0 0
+( 992 -656 -32 ) ( 832 -656 -16 ) ( 832 -656 -32 ) common/caulk 0 0 0 1 1 0 0 0
+( 992 -688 16 ) ( 832 -704 16 ) ( 832 -688 16 ) common/caulk 0 0 0 1 1 0 0 0
+( 992 -704 16 ) ( 832 -656 -32 ) ( 832 -704 16 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 191
 {
-( 544 -864 -128 ) ( 992 -864 -128 ) ( 992 -800 -192 ) common/entity 0 0 0 1 1
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
+( 880 -848 -144 ) ( 832 -816 -176 ) ( 832 -848 -144 ) common/entity 0 0 0 1 1
+( 832 -848 -128 ) ( 832 -816 -176 ) ( 832 -800 -176 ) common/caulk 0 0 0 1 1
 ( 992 64 -32 ) ( 960 64 -64 ) ( 992 -64 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( -64 -848 -104 ) ( -64 -848 -88 ) ( 64 -848 -104 ) common/caulk 0 0 0 1 1 0 0 0
-( 64 -736 -176 ) ( -64 -720 -176 ) ( -64 -736 -176 ) common/caulk 0 0 0 1 1 0 0 0
-( -64 -848 -128 ) ( -64 -832 -144 ) ( 64 -848 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 896 -848 -128 ) ( 832 -848 -144 ) ( 832 -848 -128 ) common/caulk 0 0 0 1 1 0 0 0
+( 848 -816 -176 ) ( 832 -800 -176 ) ( 832 -816 -176 ) common/caulk 0 0 0 1 1 0 0 0
+( 896 -848 -128 ) ( 832 -848 -128 ) ( 832 -800 -176 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 192
 {
-( 544 -704 -64 ) ( 544 -672 -64 ) ( 544 -704 64 ) common/caulk 0 0 0 1 1
-( 544 -640 -128 ) ( 992 -704 -192 ) ( 992 -640 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 832 -656 -128 ) ( 832 -704 -176 ) ( 832 -688 -176 ) common/caulk 0 0 0 1 1
+( 880 -656 -144 ) ( 832 -656 -144 ) ( 832 -688 -176 ) colors/grey75 0 0 0 1 1 0 0 0
 ( 992 64 -32 ) ( 960 64 -64 ) ( 992 -64 -32 ) colors/grey75 0 0 0 1 1 0 0 0
-( -64 -656 -56 ) ( -64 -656 -72 ) ( 64 -656 -56 ) common/caulk 0 0 0 1 1 0 0 0
-( 64 -736 -176 ) ( -64 -720 -176 ) ( -64 -736 -176 ) common/caulk 0 0 0 1 1 0 0 0
-( 64 -656 -128 ) ( -64 -664 -136 ) ( -64 -656 -128 ) colors/grey75 0 0 0 1 1 0 0 0
+( 896 -656 -128 ) ( 832 -656 -128 ) ( 832 -656 -144 ) common/caulk 0 0 0 1 1 0 0 0
+( 848 -704 -176 ) ( 832 -688 -176 ) ( 832 -704 -176 ) common/caulk 0 0 0 1 1 0 0 0
+( 896 -656 -128 ) ( 832 -704 -176 ) ( 832 -656 -128 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 // brush 193
 {
@@ -2588,48 +2587,81 @@
 ( -64 320 -64 ) ( 128 320 -64 ) ( -64 320 64 ) common/caulk 0 0 0 1 1
 ( -64 192 64 ) ( 64 192 -64 ) ( -64 192 -64 ) common/caulk 0 0 0 1 1
 }
+// brush 262
+{
+( 976 -640 -32 ) ( 976 -800 -192 ) ( 976 -800 32 ) colors/white 0 0 0 1 1 0 1 0
+( -64 -768 16 ) ( -64 -752 16 ) ( 64 -768 16 ) common/caulk 0 0 0 1 1
+( -64 -704 16 ) ( -64 -688 0 ) ( 64 -704 16 ) common/caulk 0 0 0 1 1
+( -64 -656 -64 ) ( -64 -656 -80 ) ( 64 -656 -64 ) common/caulk 0 0 0 1 1
+( -64 -656 -128 ) ( -64 -688 -160 ) ( 64 -656 -128 ) common/caulk 0 0 0 1 1
+( -64 -800 -176 ) ( -64 -816 -160 ) ( 64 -800 -176 ) common/caulk 0 0 0 1 1
+( -64 -848 -128 ) ( -64 -848 -96 ) ( 64 -848 -128 ) common/caulk 0 0 0 1 1
+( -64 -848 -32 ) ( -64 -832 -16 ) ( 64 -848 -32 ) common/caulk 0 0 0 1 1
+( 976 64 -32 ) ( 832 64 -176 ) ( 976 -64 -32 ) colors/white 0 0 0 1 1 0 1 0
+( 832 64 -176 ) ( 832 64 -144 ) ( 832 -64 -176 ) common/caulk 0 0 0 1 1
+}
+// brush 263
+{
+( 976 864 -32 ) ( 976 704 -192 ) ( 976 704 32 ) colors/white 0 0 0 1 1 0 1 0
+( -64 736 16 ) ( -64 752 16 ) ( 64 736 16 ) common/caulk 0 0 0 1 1
+( -64 800 16 ) ( -64 816 0 ) ( 64 800 16 ) common/caulk 0 0 0 1 1
+( -64 848 -64 ) ( -64 848 -80 ) ( 64 848 -64 ) common/caulk 0 0 0 1 1
+( -64 848 -128 ) ( -64 816 -160 ) ( 64 848 -128 ) common/caulk 0 0 0 1 1
+( -64 704 -176 ) ( -64 688 -160 ) ( 64 704 -176 ) common/caulk 0 0 0 1 1
+( -64 656 -128 ) ( -64 656 -96 ) ( 64 656 -128 ) common/caulk 0 0 0 1 1
+( -64 656 -32 ) ( -64 672 -16 ) ( 64 656 -32 ) common/caulk 0 0 0 1 1
+( 976 1568 -32 ) ( 832 1568 -176 ) ( 976 1440 -32 ) colors/white 0 0 0 1 1 0 1 0
+( 832 1568 -176 ) ( 832 1568 -144 ) ( 832 1440 -176 ) common/caulk 0 0 0 1 1
+}
 }
 // entity 1
 {
 "classname" "target_engine"
 "origin" "-848 752 -80"
-"radius" "170"
+"radius" "185"
+"_color" "0.500008 0.8 1"
 }
 // entity 2
 {
 "classname" "target_engine"
 "origin" "-848 -752 -80"
-"radius" "170"
+"radius" "185"
+"_color" "0.500008 0.8 1"
 }
 // entity 3
 {
 "classname" "target_engine"
 "origin" "-1040 432 -64"
 "radius" "170"
+"_color" "0.500008 0.8 1"
 }
 // entity 4
 {
 "classname" "target_engine"
 "origin" "-1040 -464 -64"
 "radius" "170"
+"_color" "0.500008 0.8 1"
 }
 // entity 5
 {
 "classname" "target_engine"
 "origin" "-1104 -208 -64"
 "radius" "170"
+"_color" "0.500008 0.8 1"
 }
 // entity 6
 {
 "classname" "target_engine"
 "origin" "-1104 176 -64"
 "radius" "170"
+"_color" "0.500008 0.8 1"
 }
 // entity 7
 {
 "classname" "target_engine"
 "origin" "-1104 -16 -64"
 "radius" "170"
+"_color" "0.500008 0.8 1"
 }
 // entity 8
 {
@@ -2690,6 +2722,7 @@
 "time" "0.25"
 "spawnflags" "1"
 "light" "20"
+"_color" "0 1 0"
 }
 // entity 14
 {
@@ -2700,6 +2733,7 @@
 "time" "0.25"
 "spawnflags" "1"
 "light" "20"
+"_color" "0 1 0"
 }
 // entity 15
 {
@@ -2740,6 +2774,7 @@
 "time" "0.25"
 "spawnflags" "1"
 "light" "20"
+"_color" "1 0 0"
 }
 // entity 19
 {
@@ -2750,6 +2785,7 @@
 "time" "0.25"
 "spawnflags" "1"
 "light" "20"
+"_color" "1 0 0"
 }
 // entity 20
 {