Merge branch 'master' into Mirio/silentsiege

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

diff --git a/maps/silentsiege.map b/maps/silentsiege.map
index 6f2d8f0ee5568fe3bda8d58d0427030d68285a67..8137cde388c69152c6479ef568c102643dd7d287 100644 (file)
--- a/maps/silentsiege.map
+++ b/maps/silentsiege.map
@@ -2335,7 +2335,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -496 384 640 ) ( -496 384 0 ) ( -496 128 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -1152 128 0 ) ( -1152 128 640 ) ( -384 128 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 384 64 ) ( -544 352 -64 ) ( -544 384 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 352 -64 ) ( -512 352 -64 ) ( -544 352 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -2368,7 +2368,7 @@ phillipk2x/base-pk02_generic01b
 {
 patchDef2
 {
-trak5x/floor-floor2a
+phillipk2x/base-pk02_generic01b
 ( 3 3 0 0 0 )
 (
 ( ( -496 352 608 -3.875 -2.75 ) ( -496 400 608 -3.875 -3.125 ) ( -544 400 608 -4.25 -3.125 ) )
@@ -6210,7 +6210,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -384 400 640 ) ( -1152 400 640 ) ( -384 400 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -544 384 -64 ) ( -544 352 -64 ) ( -544 384 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 352 64 ) ( -512 352 -64 ) ( -544 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -848 352 -64 ) ( -848 368 -64 ) ( -848 352 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -22163,7 +22163,7 @@ phillipk2x/base-pk02_generic01b
 {
 patchDef2
 {
-trak5x/base-base1c
+phillipk2x/base-pk02_generic01b
 ( 3 3 0 0 0 )
 (
 ( ( 864 480 960 5.25 -6 ) ( 864 480 1120 5.25 -7.25 ) ( 736 480 1120 4.25 -7.25 ) )
@@ -24633,7 +24633,7 @@ brushDef
 brushDef
 {
 ( -736 -736 736 ) ( -736 -736 992 ) ( -320 -736 736 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -384 -736 -64 ) ( -416 -704 -64 ) ( -384 -736 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal04 0 0 0
+( -384 -736 -64 ) ( -416 -704 -64 ) ( -384 -736 64 ) ( ( 0 0.015625 0 ) ( -0.0052083335 0 0.5 ) ) exx/trim-metalsupp01 0 0 0
 ( -384 -672 0 ) ( -320 -736 0 ) ( -384 -672 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/base-base1c 0 0 0
 ( -416 -704 0 ) ( -384 -672 0 ) ( -416 -704 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 64 -672 896 ) ( -64 -640 896 ) ( -64 -672 896 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -35187,7 +35187,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-crete01 0 0 0
 ( -384 400 640 ) ( -1152 400 640 ) ( -384 400 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -544 352 64 ) ( -512 352 -64 ) ( -544 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -848 352 64 ) ( -848 368 -64 ) ( -848 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -896 128 -64 ) ( -896 144 -64 ) ( -896 128 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -49181,7 +49181,7 @@ brushDef
 "target" "info_null1"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "1064.000000 -752.000000 656.000000"
 }
 {
@@ -54095,7 +54095,7 @@ exx/floor-simple05
 }
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-488.000000 -1248.000000 320.000000"
 }
 {