Watch out. Things might become hot here and there. Also... suddenly, a nexgun and...

diff --git a/maps/confusor.map b/maps/confusor.map
index 9decea66d9fc4a2f9e15bb03396dfda896e056e9..aee6425abd3c4fc81c287858b47ceaec3b82be96 100644 (file)
--- a/maps/confusor.map
+++ b/maps/confusor.map
@@ -1065,7 +1065,7 @@
 ( -1600 256 128 ) ( -1408 192 0 ) ( -1408 192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1408 -64 0 ) ( -1408 192 128 ) ( -1408 192 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1600 -64 0 ) ( -1408 192 0 ) ( -1600 256 0 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
-( -1408 -64 128 ) ( -1600 -64 0 ) ( -1600 -64 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1408 -64 128 ) ( -1600 -64 0 ) ( -1600 -64 128 ) trak5x/floor-tile3c 256 256 0 0.25 0.25 0 0 0
 ( -1600 64 0 ) ( -1408 64 128 ) ( -1600 -64 0 ) trak5x/floor-floor2e -0 0 180 0.25 0.25 0 0 0
 }
 {
@@ -1133,12 +1133,12 @@
 ( 1280 256 -64 ) ( 1408 128 -64 ) ( 1280 256 64 ) trak5x/floor-tile3c 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( 1344 640 0 ) ( 1344 448 0 ) ( 1152 640 0 ) trak5x/floor-floor2d 0 0 -90 0.25 0.25 0 0 0
-( 1408 896 0 ) ( 1216 896 0 ) ( 1408 896 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1600 640 0 ) ( 1600 640 -128 ) ( 1600 448 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1152 448 -128 ) ( 1344 448 -128 ) ( 1152 640 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1152 128 -128 ) ( 1152 128 0 ) ( 1344 128 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 896 320 -128 ) ( 896 512 -128 ) ( 896 320 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 896 0 ) ( 1600 320 0 ) ( 1408 704 0 ) trak5x/floor-floor2d 256 0 180 0.25 0.25 0 0 0
+( 1600 896 0 ) ( 1600 320 -128 ) ( 1600 320 0 ) common/caulk -0 0 0 -0.25 0.25 0 0 0
+( 1408 320 -128 ) ( 1600 320 0 ) ( 1600 320 -128 ) common/caulk -0 0 0 -0.25 0.25 0 0 0
+( 1408 320 -128 ) ( 1600 320 -128 ) ( 1408 704 -128 ) common/caulk -0 0 -90 0.25 0.25 0 0 0
+( 1408 704 0 ) ( 1408 320 0 ) ( 1408 320 -128 ) trak5x/floor-tile5c 0 0 0 -0.25 0.25 0 0 0
+( 1600 896 -128 ) ( 1472 768 0 ) ( 1472 768 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 1216 256 128 ) ( 1216 64 128 ) ( 896 256 128 ) trak5x/floor-floor2e 0 0 90 0.25 0.25 0 0 0
@@ -1187,12 +1187,12 @@
 ( 1664 64 128 ) ( 1792 64 128 ) ( 1664 -64 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 1376 704 128 ) ( 1376 512 128 ) ( 1184 704 128 ) trak5x/panel-block1 384 0 0 0.25 0.25 0 0 0
-( 1440 640 128 ) ( 1248 640 128 ) ( 1440 640 0 ) trak5x/panel-crate1c 384 0 0 0.25 0.25 0 0 0
-( 1312 704 128 ) ( 1312 704 0 ) ( 1312 512 128 ) trak5x/panel-crate1c -0 0 0 0.25 0.25 0 0 0
-( 1184 512 0 ) ( 1376 512 0 ) ( 1184 704 0 ) common/caulk 128 0 0 0.25 0.25 0 0 0
-( 1184 512 0 ) ( 1184 512 128 ) ( 1376 512 0 ) trak5x/panel-crate1c 384 0 0 0.25 0.25 0 0 0
-( 1184 448 0 ) ( 1184 640 0 ) ( 1184 448 128 ) trak5x/panel-crate1c -0 0 0 0.25 0.25 0 0 0
+( 1280 608 128 ) ( 1280 416 128 ) ( 1088 608 128 ) trak5x/panel-block1 256 128 0 0.25 0.25 0 0 0
+( 1344 544 128 ) ( 1152 544 128 ) ( 1344 544 0 ) trak5x/panel-crate1c 256 0 0 0.25 0.25 0 0 0
+( 1216 608 128 ) ( 1216 608 0 ) ( 1216 416 128 ) trak5x/panel-crate1c 384 0 0 0.25 0.25 0 0 0
+( 1088 416 -128 ) ( 1280 416 -128 ) ( 1088 608 -128 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 1088 416 0 ) ( 1088 416 128 ) ( 1280 416 0 ) trak5x/panel-crate1c 256 0 0 0.25 0.25 0 0 0
+( 1088 352 0 ) ( 1088 544 0 ) ( 1088 352 128 ) trak5x/panel-crate1c 384 0 0 0.25 0.25 0 0 0
 }
 {
 ( 1536 1088 128 ) ( 896 1088 128 ) ( 1536 1088 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -2161,6 +2161,76 @@ trak5x/trim-trim1b
 ( 512 -384 448 ) ( 512 -384 576 ) ( 704 -384 448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 512 -384 448 ) ( 512 -128 448 ) ( 512 -384 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 1600 896 0 ) ( 1024 704 0 ) ( 896 896 0 ) trak5x/floor-floor2d 0 0 -90 0.25 0.25 0 0 0
+( 1408 896 0 ) ( 1216 896 0 ) ( 1408 896 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 896 0 ) ( 1408 704 -128 ) ( 1408 704 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 896 -128 ) ( 1024 704 -128 ) ( 1408 704 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1408 704 0 ) ( 1024 704 -128 ) ( 1024 704 0 ) trak5x/floor-tile5c 0 0 0 0.25 0.25 0 0 0
+( 896 896 0 ) ( 1024 704 0 ) ( 1024 704 -128 ) trak5x/floor-tile5c 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1088 256 0 ) ( 1088 64 0 ) ( 896 256 0 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( 1088 256 0 ) ( 896 256 0 ) ( 1088 256 -128 ) trak5x/floor-tile5c 0 0 0 0.25 0.25 0 0 0
+( 1280 256 0 ) ( 1280 256 -128 ) ( 1280 64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 896 64 -128 ) ( 1088 64 -128 ) ( 896 256 -128 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( 864 -64 -128 ) ( 864 -64 0 ) ( 1056 -64 -128 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( 896 64 -128 ) ( 896 256 -128 ) ( 896 64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1600 320 0 ) ( 1600 128 0 ) ( 1408 320 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 320 0 ) ( 1408 320 0 ) ( 1600 320 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 320 0 ) ( 1600 320 -128 ) ( 1600 128 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1408 128 -128 ) ( 1600 128 -128 ) ( 1408 320 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1408 128 -128 ) ( 1408 128 0 ) ( 1600 128 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1408 128 -128 ) ( 1408 320 -128 ) ( 1408 128 0 ) trak5x/floor-tile5c 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1280 -64 0 ) ( 1408 128 0 ) ( 1408 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 256 0 ) ( 1408 128 -128 ) ( 1408 128 0 ) trak5x/floor-tile5c 0 0 0 0.25 0.25 0 0 0
+( 1408 -64 -128 ) ( 1408 128 0 ) ( 1408 128 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 -64 -128 ) ( 1408 128 -128 ) ( 1280 256 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 -64 -128 ) ( 1280 -64 0 ) ( 1408 -64 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 -64 -128 ) ( 1280 128 -128 ) ( 1280 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1408 704 0 ) ( 1408 576 0 ) ( 1280 704 0 ) trak5x/floor-floor2d 256 0 180 0.25 0.25 0 0 0
+( 1408 704 0 ) ( 1280 704 0 ) ( 1408 704 -128 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( 1408 704 0 ) ( 1408 704 -128 ) ( 1408 576 0 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( 1280 576 -128 ) ( 1408 576 -128 ) ( 1280 704 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 704 -64 ) ( 1408 576 -192 ) ( 1280 704 -192 ) trak5x/floor-tile5c 0 -0 0 0.25 0.25 0 0 0
+}
+{
+( 1600 896 -32 ) ( 1600 320 -32 ) ( 896 896 -32 ) liquids_lava/lava0 0 0 0 0.25 0.25 0 0 0
+( 1600 928 -32 ) ( 896 928 -32 ) ( 1600 928 -192 ) liquids_lava/lava0 0 128 0 0.25 0.25 0 0 0
+( 1440 864 -32 ) ( 1440 864 -192 ) ( 1440 288 -32 ) liquids_lava/lava0 128 128 0 0.25 0.25 0 0 0
+( 896 320 -160 ) ( 1600 320 -160 ) ( 896 896 -160 ) liquids_lava/lava0 0 0 0 0.25 0.25 0 0 0
+( 928 96 -192 ) ( 928 96 -32 ) ( 1632 96 -192 ) liquids_lava/lava0 128 128 0 0.25 0.25 0 0 0
+( 864 320 -192 ) ( 864 896 -192 ) ( 864 320 -32 ) liquids_lava/lava0 0 128 0 0.25 0.25 0 0 0
+}
+{
+( 1600 896 -128 ) ( 1600 320 -128 ) ( 896 896 -128 ) trak5x/floor-floor1a 0 0 0 0.25 0.25 0 0 0
+( 1600 896 -128 ) ( 896 896 -128 ) ( 1600 896 -288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1408 864 -128 ) ( 1408 864 -288 ) ( 1408 288 -128 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( 896 320 -288 ) ( 1600 320 -288 ) ( 896 896 -288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 928 128 -288 ) ( 928 128 -128 ) ( 1632 128 -288 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( 896 320 -288 ) ( 896 896 -288 ) ( 896 320 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1024 384 0 ) ( 1024 256 0 ) ( 896 384 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 896 256 -128 ) ( 1024 256 -128 ) ( 896 384 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 896 256 -128 ) ( 896 256 0 ) ( 1024 256 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 896 256 -128 ) ( 896 384 -128 ) ( 896 256 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 896 384 -64 ) ( 1024 256 -64 ) ( 896 384 64 ) trak5x/floor-tile5c 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 896 576 0 ) ( 896 384 0 ) ( 768 576 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 896 896 0 ) ( 768 896 0 ) ( 896 896 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 896 576 0 ) ( 896 576 -128 ) ( 896 384 0 ) trak5x/floor-tile5c 0 0 0 0.25 0.25 0 0 0
+( 768 384 -128 ) ( 896 384 -128 ) ( 768 576 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 384 -128 ) ( 768 384 0 ) ( 896 384 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 384 -128 ) ( 768 576 -128 ) ( 768 384 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -2372,3 +2442,11 @@ trak5x/trim-trim1b
 "origin" "352.000000 -448.000000 264.000000"
 "targetname" "target_position2"
 }
+{
+"classname" "item_armor_large"
+"origin" "1152.000000 480.000000 128.000000"
+}
+{
+"classname" "weapon_nex"
+"origin" "-1856.000000 -128.000000 0.000000"
+}