Some fixes here, merging there...

diff --git a/maps/8bit_arena.map b/maps/8bit_arena.map
index 4cbfddab06281d0a0043282bdfd3645a5c1628a4..e7f1b5e959e8d9a34a94c04c8a813d225681db3f 100644 (file)
--- a/maps/8bit_arena.map
+++ b/maps/8bit_arena.map
@@ -130890,56 +130890,56 @@ effects_forcefield/forcefield1_d_surflight
 "classname" "light"
 "origin" "-18480.000000 360.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18480.000000 392.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18480.000000 424.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18480.000000 328.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18384.000000 328.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18384.000000 360.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18384.000000 392.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18384.000000 424.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
@@ -132086,28 +132086,28 @@ effects_forcefield/forcefield1_d_surflight
 "classname" "light"
 "origin" "-18104.000000 -48.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18072.000000 -48.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18040.000000 -48.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18008.000000 -48.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
@@ -132312,28 +132312,28 @@ effects_forcefield/forcefield1_d_surflight
 "classname" "light"
 "origin" "-18072.000000 48.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18040.000000 48.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18008.000000 48.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18104.000000 48.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
@@ -132688,28 +132688,28 @@ effects_forcefield/forcefield1_d_surflight
 "classname" "light"
 "origin" "-18480.000000 -328.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18480.000000 -360.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18480.000000 -392.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18480.000000 -424.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
@@ -133094,28 +133094,28 @@ effects_forcefield/forcefield1_d_surflight
 "classname" "light"
 "origin" "-18384.000000 -360.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18384.000000 -392.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18384.000000 -424.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18384.000000 -328.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
@@ -133488,28 +133488,28 @@ effects_forcefield/forcefield1_d_surflight
 "classname" "light"
 "origin" "-18760.000000 48.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18792.000000 48.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18824.000000 48.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18856.000000 48.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
@@ -133876,28 +133876,28 @@ effects_forcefield/forcefield1_d_surflight
 "classname" "light"
 "origin" "-18792.000000 -48.000000 24.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18824.000000 -48.000000 40.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18856.000000 -48.000000 56.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
 "classname" "light"
 "origin" "-18760.000000 -48.000000 8.000000"
 "light" "10"
-"_color" "0 0 1"
+"_color" "1 0 0"
 "gametypefilter" "teamspawns"
 }
 {
@@ -158626,7 +158626,6 @@ map_arena/pulseblue_scroll
 }
 {
 "classname" "func_wall"
-"gametype" "teamspawns"
 "gametypefilter" "teamspawns"
 {
 patchDef2