Merge branch 'master' into Lyberta/Survival

[xonotic/xonotic-maps.pk3dir.git] / maps / runningmanctf.map

diff --git a/maps/runningmanctf.map b/maps/runningmanctf.map
index f041f69a2c4199cf13276079e84b62147038a4db..ec071498aa0390f217c9248538cbcfaee0cf233a 100644 (file)
--- a/maps/runningmanctf.map
+++ b/maps/runningmanctf.map
@@ -29677,6 +29677,22 @@ exx/base-metal03
 ( -2216 1904 64 ) ( -2224 1904 -64 ) ( -2216 1904 -64 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( -2216 1744 -64 ) ( -2232 1744 -64 ) ( -2216 1744 64 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 }
+{
+( 720 -448 672 ) ( 720 -512 672 ) ( 712 -448 672 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( 720 -448 672 ) ( 712 -448 672 ) ( 720 -448 192 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( 728 -448 672 ) ( 728 -448 192 ) ( 728 -512 672 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( 712 -512 192 ) ( 720 -512 192 ) ( 712 -448 192 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( 712 -544 192 ) ( 712 -544 672 ) ( 720 -544 192 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( 704 -512 192 ) ( 704 -448 192 ) ( 704 -512 672 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -2112 2384 672 ) ( -2112 2368 672 ) ( -2176 2384 672 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -2112 2392 672 ) ( -2176 2392 672 ) ( -2112 2392 192 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -2112 2384 672 ) ( -2112 2384 192 ) ( -2112 2368 672 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -2176 2368 192 ) ( -2112 2368 192 ) ( -2176 2384 192 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -2176 2368 192 ) ( -2176 2368 672 ) ( -2112 2368 192 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -2208 2368 192 ) ( -2208 2384 192 ) ( -2208 2368 672 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "item_health_medium"
@@ -29889,7 +29905,7 @@ exx/base-metal03
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "192.000000 -176.000000 -416.000000"
 "angle" "-90.000000"
 }
@@ -30018,7 +30034,7 @@ exx/base-metal03
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "784.000000 272.000000 16.000000"
 "angle" "-90.000000"
 }
@@ -30043,7 +30059,7 @@ exx/base-metal03
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "-1208.000000 -208.000000 192.000000"
 "angle" "-90.000000"
 }
@@ -30084,7 +30100,7 @@ exx/base-metal03
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "832.000000 -192.000000 216.000000"
 "angle" "-90.000000"
 }
@@ -33319,7 +33335,7 @@ exx/base-metal03
 "angle" "0.000003"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "-1840.000000 1856.000000 -416.000000"
 "angle" "0.000003"
 }
@@ -33448,7 +33464,7 @@ exx/base-metal03
 "angle" "0.000003"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "-1392.000000 2448.000000 16.000000"
 "angle" "0.000003"
 }
@@ -33473,7 +33489,7 @@ exx/base-metal03
 "angle" "0.000003"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "-1872.000000 456.000000 192.000000"
 "angle" "0.000003"
 }
@@ -33514,7 +33530,7 @@ exx/base-metal03
 "angle" "0.000003"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "-1856.000000 2496.000000 216.000000"
 "angle" "0.000003"
 }