Merge branch 'packer/afterslime' into 'master'

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

diff --git a/maps/implosion.map b/maps/implosion.map
index e8caf7d8c7791cf7bca49d278af20c1ee1602c67..fe54fac39cf13134bfa9d55477be1bded12d16d4 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -61083,14 +61083,6 @@ trak5x/light-light2b-surfacelight
 ( -428 -1992 0 ) ( -428 -1968 0 ) ( -428 -1992 8 ) trak5x/base-base1b 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 1552 4488 -1468 ) ( 1552 -6264 -1468 ) ( -1520 4488 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 1536 292 -1468 ) ( -1536 292 -1468 ) ( 1536 292 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 6136 4380 -1468 ) ( 6136 4380 -1532 ) ( 6136 -6372 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1520 -6264 -1532 ) ( 1552 -6264 -1532 ) ( -1520 4488 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1516 -6220 -1532 ) ( -1516 -6220 -1468 ) ( 1556 -6220 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1544 -6256 -1532 ) ( -1544 4496 -1532 ) ( -1544 -6256 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-}
-{
 ( 2064 -2688 384 ) ( 2064 -3144 384 ) ( 1984 -2688 384 ) trak5x/floor-tile4e 64 240 0 0.5 0.5 0 0 0
 ( 2064 -2720 384 ) ( 1984 -2720 384 ) ( 2064 -2720 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 2400 -2680 384 ) ( 2400 -2680 320 ) ( 2400 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -72766,7 +72758,7 @@ trak5x/trim-trim1b
 {
 ( 1984 -3456 296 ) ( 1984 -3392 296 ) ( 2000 -3456 296 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
 ( 1984 -3448 288 ) ( 2000 -3448 288 ) ( 1984 -3448 128 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
-( 1984 -3456 288 ) ( 1984 -3456 128 ) ( 1984 -3392 288 ) trak5x/panel-ceil1a 426.66796875 85.3334960938 0 0.09375 0.09375 0 0 0
+( 1976 -3456 288 ) ( 1976 -3456 128 ) ( 1976 -3392 288 ) trak5x/panel-ceil1a 426.66796875 85.3334960938 0 0.09375 0.09375 0 0 0
 ( 2000 -3392 248 ) ( 1984 -3392 248 ) ( 2000 -3456 248 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
 ( 2000 -3400 128 ) ( 2000 -3400 288 ) ( 1984 -3400 128 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
 ( 2000 -3392 128 ) ( 2000 -3456 128 ) ( 2000 -3392 288 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -74598,7 +74590,7 @@ trak5x/trim-trim1b
 {
 ( 2432 -2432 296 ) ( 2432 -2496 296 ) ( 2416 -2432 296 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
 ( 2432 -2440 288 ) ( 2416 -2440 288 ) ( 2432 -2440 128 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
-( 2432 -2432 288 ) ( 2432 -2432 128 ) ( 2432 -2496 288 ) trak5x/panel-ceil1a 426.66796875 85.3334960938 0 0.09375 0.09375 0 0 0
+( 2440 -2432 288 ) ( 2440 -2432 128 ) ( 2440 -2496 288 ) trak5x/panel-ceil1a 426.66796875 85.3334960938 0 0.09375 0.09375 0 0 0
 ( 2416 -2496 248 ) ( 2432 -2496 248 ) ( 2416 -2432 248 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
 ( 2416 -2488 128 ) ( 2416 -2488 288 ) ( 2432 -2488 128 ) trak5x/panel-comp1e 112 168 0 0.5 0.5 0 0 0
 ( 2416 -2496 128 ) ( 2416 -2432 128 ) ( 2416 -2496 288 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -77954,11 +77946,11 @@ logos/logo02_yellow_glowy
 "angle" "-90.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "4232.000000 -3552.000000 -384.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "192.000000 -2336.000000 -384.000000"
 }
 {
@@ -78047,7 +78039,7 @@ logos/logo02_yellow_glowy
 "origin" "2112.000000 -2752.000000 8.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-352.000000 -3560.000000 0.000000"
 }
 {
@@ -78056,7 +78048,7 @@ logos/logo02_yellow_glowy
 "angle" "180.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "4776.000000 -2336.000000 0.000000"
 "angle" "180.000000"
 }