Restore exx to pre-merge
authorMario <zacjardine@y7mail.com>
Sat, 20 Dec 2014 06:17:29 +0000 (17:17 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 20 Dec 2014 06:17:29 +0000 (17:17 +1100)
scripts/exx.shader

index 78b7163..961244e 100644 (file)
@@ -1,12 +1,17 @@
 textures/exx/base-crete01
 {
        qer_editorimage textures/exx/base/base_crete01.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 65
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/base/base_crete01.tga
+               
+
        }
        {
                map $lightmap
@@ -18,12 +23,17 @@ textures/exx/base-crete01
 textures/exx/base-crete01blue
 {
        qer_editorimage textures/exx/base/base_crete01blue.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/base/base_crete01blue.tga
+               
+
        }
        {
                map $lightmap
@@ -35,12 +45,17 @@ textures/exx/base-crete01blue
 textures/exx/base-crete01red
 {
        qer_editorimage textures/exx/base/base_crete01red.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/base/base_crete01red.tga
+               
+
        }
        {
                map $lightmap
@@ -52,12 +67,17 @@ textures/exx/base-crete01red
 textures/exx/base-crete02
 {
        qer_editorimage textures/exx/base/base_crete02.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 65
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/base/base_crete02.tga
+               
+
        }
        {
                map $lightmap
@@ -69,12 +89,17 @@ textures/exx/base-crete02
 textures/exx/base-crete03
 {
        qer_editorimage textures/exx/base/base_crete03.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 65
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/base/base_crete03.tga
+               
+
        }
        {
                map $lightmap
@@ -85,54 +110,19 @@ textures/exx/base-crete03
 }
 textures/exx/base-metal01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
        qer_editorimage textures/exx/base/base_metal01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/base/base_metal01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/base-metal01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/base/base_metal01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/base/base_metal01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/base-metal02
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/base/base_metal02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/base/base_metal02.tga
+               
+
        }
        {
                map $lightmap
@@ -143,16 +133,19 @@ textures/exx/base-metal02
 }
 textures/exx/base-metal02
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal02.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/base/base_metal02.tga
+               
+
        }
        {
                map $lightmap
@@ -163,35 +156,19 @@ textures/exx/base-metal02
 }
 textures/exx/base-metal03
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/base/base_metal03.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/base/base_metal03.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/base-metal03
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal03.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/base/base_metal03.tga
+               
+
        }
        {
                map $lightmap
@@ -202,35 +179,19 @@ textures/exx/base-metal03
 }
 textures/exx/base-metal04
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/base/base_metal04.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/base/base_metal04.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/base-metal04
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal04.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/base/base_metal04.tga
+               
+
        }
        {
                map $lightmap
@@ -241,35 +202,19 @@ textures/exx/base-metal04
 }
 textures/exx/base-metal05rust
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/base/base_metal05rust.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 70
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/base/base_metal05rust.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/base-metal05rust
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal05rust.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 70
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/base/base_metal05rust.tga
+               
+
        }
        {
                map $lightmap
@@ -280,35 +225,19 @@ textures/exx/base-metal05rust
 }
 textures/exx/base-metal06rust
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/base/base_metal06rust.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 70
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/base/base_metal06rust.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/base-metal06rust
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal06rust.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 70
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/base/base_metal06rust.tga
+               
+
        }
        {
                map $lightmap
@@ -319,35 +248,19 @@ textures/exx/base-metal06rust
 }
 textures/exx/base-metal07rust
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/base/base_metal07rust.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 70
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/base/base_metal07rust.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/base-metal07rust
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal07rust.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 70
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/base/base_metal07rust.tga
+               
+
        }
        {
                map $lightmap
@@ -358,35 +271,20 @@ textures/exx/base-metal07rust
 }
 textures/exx/floor-clang01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_clang01.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 37
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       surfaceparm metalsteps
-       {
-               map textures/exx/floor/floor_clang01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-clang01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_clang01.tga
-       q3map_bounceScale 0.75
+       
+       q3map_bounceScale  0.75
        dpoffsetmapping - 2 match8 37
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       dpglossintensitymod  3
+       dpglossexponentmod  4
        surfaceparm metalsteps
-       dpreflectcube env/exomorph/exomorph
+
+
+
        {
                map textures/exx/floor/floor_clang01.tga
+               
+
        }
        {
                map $lightmap
@@ -397,35 +295,19 @@ textures/exx/floor-clang01
 }
 textures/exx/floor-clang01b
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_clang01b.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 37
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       surfaceparm metalsteps
-       {
-               map textures/exx/floor/floor_clang01b.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-clang01b
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_clang01b.tga
-       q3map_bounceScale 0.75
+       
+       q3map_bounceScale  0.75
        dpoffsetmapping - 2 match8 37
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       dpglossintensitymod  3
+       dpglossexponentmod  4
        surfaceparm metalsteps
-       dpreflectcube env/exomorph/exomorph
+       
+
        {
                map textures/exx/floor/floor_clang01b.tga
+               
+
        }
        {
                map $lightmap
@@ -437,12 +319,17 @@ textures/exx/floor-clang01b
 textures/exx/floor-crete01
 {
        qer_editorimage textures/exx/floor/floor_crete01.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 148
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/floor/floor_crete01.tga
+               
+
        }
        {
                map $lightmap
@@ -454,12 +341,17 @@ textures/exx/floor-crete01
 textures/exx/floor-crete01-phoenix
 {
        qer_editorimage textures/exx/floor/floor_crete01_phoenix.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 148
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/floor/floor_crete01_phoenix.tga
+               
+
        }
        {
                map $lightmap
@@ -471,12 +363,17 @@ textures/exx/floor-crete01-phoenix
 textures/exx/floor-crete01-phoenixb
 {
        qer_editorimage textures/exx/floor/floor_crete01_phoenixb.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 148
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/floor/floor_crete01_phoenixb.tga
+               
+
        }
        {
                map $lightmap
@@ -488,12 +385,17 @@ textures/exx/floor-crete01-phoenixb
 textures/exx/floor-crete01b
 {
        qer_editorimage textures/exx/floor/floor_crete01b.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 48
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/floor/floor_crete01b.tga
+               
+
        }
        {
                map $lightmap
@@ -504,20 +406,21 @@ textures/exx/floor-crete01b
 }
 textures/exx/floor-grate01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
        qer_editorimage textures/exx/floor/floor_grate01.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
        dpoffsetmapping - 2 match8 126
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/floor/floor_grate01.tga
-               alphaFunc GT0
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -526,23 +429,22 @@ textures/exx/floor-grate01
                blendfunc filter
        }
 }
-textures/exx/floor-grate01
+textures/exx/floor-grate01-cull
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_grate01.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       Cull None
        dpoffsetmapping - 2 match8 126
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/floor/floor_grate01.tga
-               alphaFunc GT0
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -551,21 +453,23 @@ textures/exx/floor-grate01
                blendfunc filter
        }
 }
-textures/exx/floor-grate01-cull
+textures/exx/floor-grate02
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_grate01.tga
+       qer_editorimage textures/exx/floor/floor_grate02.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2 match8 126
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       Cull None
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate01.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_grate02.tga
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -574,22 +478,22 @@ textures/exx/floor-grate01-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate01-cull
+textures/exx/floor-grate02-cull
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_grate01.tga
+       qer_editorimage textures/exx/floor/floor_grate02.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2 match8 126
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate01.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_grate02.tga
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -598,22 +502,23 @@ textures/exx/floor-grate01-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate02
+textures/exx/floor-grate03
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_grate02.tga
+       qer_editorimage textures/exx/floor/floor_grate03.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
-       dpoffsetmapping - 2 match8 224
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate02.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_grate03.tga
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -622,23 +527,22 @@ textures/exx/floor-grate02
                blendfunc filter
        }
 }
-textures/exx/floor-grate02
+textures/exx/floor-grate03-cull
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_grate02.tga
+       qer_editorimage textures/exx/floor/floor_grate03.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       Cull None
-       dpoffsetmapping - 2 match8 224
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate02.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_grate03.tga
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -647,21 +551,23 @@ textures/exx/floor-grate02
                blendfunc filter
        }
 }
-textures/exx/floor-grate02-cull
+textures/exx/floor-grate04
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_grate02.tga
+       qer_editorimage textures/exx/floor/floor_grate04.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2 match8 224
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       Cull None
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate02.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_grate04.tga
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -670,22 +576,23 @@ textures/exx/floor-grate02-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate02-cull
+
+textures/exx/floor-grate04-cull
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_grate02.tga
+       qer_editorimage textures/exx/floor/floor_grate04.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2 match8 224
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate02.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_grate04.tga
+            alphaFunc GT0
        }
        {
                map $lightmap
@@ -694,22 +601,23 @@ textures/exx/floor-grate02-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate03
+
+
+textures/exx/floor-metal02
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_grate03.tga
-       surfaceparm trans
+       qer_editorimage textures/exx/floor/floor_metal02.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       Cull None
-       dpoffsetmapping - 2 match8 223
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate03.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_metal02.tga
+               
+
        }
        {
                map $lightmap
@@ -718,23 +626,20 @@ textures/exx/floor-grate03
                blendfunc filter
        }
 }
-textures/exx/floor-grate03
+textures/exx/floor-panel01
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_grate03.tga
-       surfaceparm trans
+       qer_editorimage textures/exx/floor/floor_panel01.tga
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       Cull None
-       dpoffsetmapping - 2 match8 223
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 172
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate03.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_panel01.tga
+               
+
        }
        {
                map $lightmap
@@ -743,21 +648,21 @@ textures/exx/floor-grate03
                blendfunc filter
        }
 }
-textures/exx/floor-grate03-cull
+textures/exx/floor-rnd01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_grate03.tga
-       surfaceparm trans
+       qer_editorimage textures/exx/floor/floor_rnd01.tga
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       dpoffsetmapping - 2 match8 223
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 128
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate03.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_rnd01.tga
+               
+
        }
        {
                map $lightmap
@@ -766,22 +671,21 @@ textures/exx/floor-grate03-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate03-cull
+textures/exx/floor-rnd02
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_grate03.tga
-       surfaceparm trans
+       qer_editorimage textures/exx/floor/floor_rnd02.tga
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       dpoffsetmapping - 2 match8 223
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/floor/floor_grate03.tga
-               alphaFunc GT0
+               map textures/exx/floor/floor_rnd02.tga
+               
+
        }
        {
                map $lightmap
@@ -790,289 +694,21 @@ textures/exx/floor-grate03-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate04
+textures/exx/floor-simple05
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_grate04.tga
-       surfaceparm trans
+       qer_editorimage textures/exx/floor/floor_simple05.tga
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       Cull None
-       dpoffsetmapping - 2 match8 248
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_grate04.tga
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-grate04
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_grate04.tga
-       surfaceparm trans
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       Cull None
-       dpoffsetmapping - 2 match8 248
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_grate04.tga
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-grate04-cull
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_grate04.tga
-       surfaceparm trans
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       dpoffsetmapping - 2 match8 248
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_grate04.tga
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-grate04-cull
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_grate04.tga
-       surfaceparm trans
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       surfaceparm alphashadow
-       surfaceparm nomarks
-       dpoffsetmapping - 2 match8 248
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_grate04.tga
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-metal02
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_metal02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 241
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_metal02.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-metal02
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_metal02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 241
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_metal02.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-panel01
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_panel01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 172
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_panel01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-panel01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_panel01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 172
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_panel01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-rnd01
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_rnd01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 128
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_rnd01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-rnd01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_rnd01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 128
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_rnd01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-rnd02
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_rnd02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 110
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_rnd02.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-rnd02
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_rnd02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 110
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_rnd02.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-simple05
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_simple05.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 4 match8 32
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_simple05.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-simple05
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_simple05.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
+       
+       q3map_bounceScale  0.75
        dpoffsetmapping - 4 match8 32
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/floor/floor_simple05.tga
+               
+
        }
        {
                map $lightmap
@@ -1083,52 +719,18 @@ textures/exx/floor-simple05
 }
 textures/exx/floor-simplines
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
        qer_editorimage textures/exx/floor/floor_simplines.tga
-       q3map_bounceScale 0.75
+       
+       q3map_bounceScale  0.75
        dpoffsetmapping - 1 match8 244
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/floor/floor_simplines.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-simplines
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_simplines.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 1 match8 244
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_simplines.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-tile03
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_tile03.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 218
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_tile03.tga
+               
+
        }
        {
                map $lightmap
@@ -1139,757 +741,19 @@ textures/exx/floor-tile03
 }
 textures/exx/floor-tile03
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_tile03.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 218
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_tile03.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-tread01
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/floor/floor_tread01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 1 match8 221
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_tread01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-tread01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/floor/floor_tread01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 1 match8 221
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/floor/floor_tread01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-wrn01
-{
-       qer_editorimage textures/exx/floor/floor_wrn01.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_wrn01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-wrn01-blue
-{
-       qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_wrn01-blue.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-wrn01-red
-{
-       qer_editorimage textures/exx/floor/floor_wrn01-red.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_wrn01-red.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/floor-wrn01-purple
-{
-       qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/floor/floor_wrn01-purple.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-panel01
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/light/light_panel01.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 79
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/light/light_panel01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-panel01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/light/light_panel01.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 79
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/light/light_panel01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-panel01-surfacelight
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/light/light_panel01.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 79
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       q3map_surfacelight 2500
-       q3map_lightSubdivide 64
-       {
-               map textures/exx/light/light_panel01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-panel01-surfacelight
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/light/light_panel01.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 79
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       q3map_surfacelight 2500
-       q3map_lightSubdivide 64
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/light/light_panel01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-u201
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/light/light_u201.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 76
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/light/light_u201.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-u201
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/light/light_u201.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 76
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/light/light_u201.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-u201-surfacelight
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/light/light_u201.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 76
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       q3map_surfacelight 2500
-       q3map_lightSubdivide 64
-       {
-               map textures/exx/light/light_u201.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/light-u201-surfacelight
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/light/light_u201.tga
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 76
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       q3map_surfacelight 2500
-       q3map_lightSubdivide 64
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/light/light_u201.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-grate01
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_grate01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
-       cull none
-       nopicmip 
-       nomipmaps 
-       {
-               map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
-               rgbgen vertex
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-grate01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_grate01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
-       cull none
-       nopicmip 
-       nomipmaps 
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
-               rgbgen vertex
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-grate01-cull
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_grate01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
-       nopicmip 
-       nomipmaps 
-       {
-               map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
-               rgbgen vertex
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-grate01-cull
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_grate01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
-       nopicmip 
-       nomipmaps 
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
-               rgbgen vertex
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal01
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metal01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 101
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metal01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metal01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 101
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metal01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal01b
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metal01b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 101
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metal01b.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal01b
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metal01b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 101
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metal01b.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal01c
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metal01c.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 116
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metal01c.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal01c
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metal01c.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 116
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metal01c.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal02
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metal02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 216
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metal02.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal02
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metal02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 216
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metal02.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal03
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metal03.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 241
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metal03.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal03
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metal03.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 241
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metal03.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal04
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metal04.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 229
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metal04.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal04
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metal04.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 229
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metal04.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal05
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metal05.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 238
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metal05.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metal05
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metal05.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 238
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metal05.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metalbig04
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metalbig04.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 165
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metalbig04.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metalbig04
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metalbig04.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 165
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metalbig04.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metalbig04b
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_metalbig04b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 177
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/panel/panel_metalbig04b.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-metalbig04b
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_metalbig04b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 177
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
-       {
-               map textures/exx/panel/panel_metalbig04b.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/panel-q201
-{
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_q201.tga
+       qer_editorimage textures/exx/floor/floor_tile03.tga
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 138
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 218
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/panel/panel_q201.tga
+               map textures/exx/floor/floor_tile03.tga
+               
+
        }
        {
                map $lightmap
@@ -1898,18 +762,21 @@ textures/exx/panel-q201
                blendfunc filter
        }
 }
-textures/exx/panel-q201
+textures/exx/floor-tread01
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_q201.tga
+       qer_editorimage textures/exx/floor/floor_tread01.tga
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 138
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 1 match8 221
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/panel/panel_q201.tga
+               map textures/exx/floor/floor_tread01.tga
+               
+
        }
        {
                map $lightmap
@@ -1918,17 +785,20 @@ textures/exx/panel-q201
                blendfunc filter
        }
 }
-textures/exx/panel-q201b
+textures/exx/floor-wrn01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_q201b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 81
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       qer_editorimage textures/exx/floor/floor_wrn01.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/panel/panel_q201b.tga
+               map textures/exx/floor/floor_wrn01.tga
+               
+
        }
        {
                map $lightmap
@@ -1937,18 +807,21 @@ textures/exx/panel-q201b
                blendfunc filter
        }
 }
-textures/exx/panel-q201b
+
+textures/exx/floor-wrn01-blue
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_q201b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 81
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/panel/panel_q201b.tga
+               map textures/exx/floor/floor_wrn01-blue.tga
+               
+
        }
        {
                map $lightmap
@@ -1957,17 +830,21 @@ textures/exx/panel-q201b
                blendfunc filter
        }
 }
-textures/exx/panel-q201c
+
+textures/exx/floor-wrn01-red
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_q201c.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 98
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       qer_editorimage textures/exx/floor/floor_wrn01-red.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/panel/panel_q201c.tga
+               map textures/exx/floor/floor_wrn01-red.tga
+               
+
        }
        {
                map $lightmap
@@ -1976,18 +853,21 @@ textures/exx/panel-q201c
                blendfunc filter
        }
 }
-textures/exx/panel-q201c
+
+textures/exx/floor-wrn01-purple
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_q201c.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 98
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/panel/panel_q201c.tga
+               map textures/exx/floor/floor_wrn01-purple.tga
+               
+
        }
        {
                map $lightmap
@@ -1996,17 +876,20 @@ textures/exx/panel-q201c
                blendfunc filter
        }
 }
-textures/exx/panel-q201d
+
+textures/exx/light-panel01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_q201d.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 189
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       qer_editorimage textures/exx/light/light_panel01.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
        {
-               map textures/exx/panel/panel_q201d.tga
+               map textures/exx/light/light_panel01.tga
+               
+
        }
        {
                map $lightmap
@@ -2015,18 +898,22 @@ textures/exx/panel-q201d
                blendfunc filter
        }
 }
-textures/exx/panel-q201d
+textures/exx/light-panel01-surfacelight
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_q201d.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 189
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       qer_editorimage textures/exx/light/light_panel01.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       q3map_surfacelight 2500
+       q3map_lightSubdivide 64
+
        {
-               map textures/exx/panel/panel_q201d.tga
+               map textures/exx/light/light_panel01.tga
+               
+
        }
        {
                map $lightmap
@@ -2035,17 +922,19 @@ textures/exx/panel-q201d
                blendfunc filter
        }
 }
-textures/exx/panel-q201e
+textures/exx/light-u201
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_q201e.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 132
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       qer_editorimage textures/exx/light/light_u201.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
        {
-               map textures/exx/panel/panel_q201e.tga
+               map textures/exx/light/light_u201.tga
+               
+
        }
        {
                map $lightmap
@@ -2054,18 +943,22 @@ textures/exx/panel-q201e
                blendfunc filter
        }
 }
-textures/exx/panel-q201e
+textures/exx/light-u201-surfacelight
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_q201e.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 132
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       qer_editorimage textures/exx/light/light_u201.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       q3map_surfacelight 2500
+       q3map_lightSubdivide 64
+
        {
-               map textures/exx/panel/panel_q201e.tga
+               map textures/exx/light/light_u201.tga
+               
+
        }
        {
                map $lightmap
@@ -2074,17 +967,27 @@ textures/exx/panel-q201e
                blendfunc filter
        }
 }
-textures/exx/panel-rs01
+textures/exx/panel-grate01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/panel/panel_rs01.tga
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 178
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  2
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+
+       cull none
+       nopicmip
+       nomipmaps
        {
-               map textures/exx/panel/panel_rs01.tga
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
        }
        {
                map $lightmap
@@ -2093,18 +996,26 @@ textures/exx/panel-rs01
                blendfunc filter
        }
 }
-textures/exx/panel-rs01
+textures/exx/panel-grate01-cull
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/panel/panel_rs01.tga
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 178
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  2
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+
+       nopicmip
+       nomipmaps
        {
-               map textures/exx/panel/panel_rs01.tga
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
        }
        {
                map $lightmap
@@ -2113,17 +1024,21 @@ textures/exx/panel-rs01
                blendfunc filter
        }
 }
-textures/exx/trim-01
+textures/exx/panel-metal01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_01.tga
+       qer_editorimage textures/exx/panel/panel_metal01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 169
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_01.tga
+               map textures/exx/panel/panel_metal01.tga
+               
+
        }
        {
                map $lightmap
@@ -2132,18 +1047,21 @@ textures/exx/trim-01
                blendfunc filter
        }
 }
-textures/exx/trim-01
+textures/exx/panel-metal01b
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_01.tga
+       qer_editorimage textures/exx/panel/panel_metal01b.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 169
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_01.tga
+               map textures/exx/panel/panel_metal01b.tga
+               
+
        }
        {
                map $lightmap
@@ -2152,17 +1070,21 @@ textures/exx/trim-01
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard
+textures/exx/panel-metal01c
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_baseboard.tga
+       qer_editorimage textures/exx/panel/panel_metal01c.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 181
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 116
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_baseboard.tga
+               map textures/exx/panel/panel_metal01c.tga
+               
+
        }
        {
                map $lightmap
@@ -2171,18 +1093,21 @@ textures/exx/trim-baseboard
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard
+textures/exx/panel-metal02
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_baseboard.tga
+       qer_editorimage textures/exx/panel/panel_metal02.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 181
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 216
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_baseboard.tga
+               map textures/exx/panel/panel_metal02.tga
+               
+
        }
        {
                map $lightmap
@@ -2191,17 +1116,21 @@ textures/exx/trim-baseboard
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard02
+textures/exx/panel-metal03
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_baseboard02.tga
+       qer_editorimage textures/exx/panel/panel_metal03.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 162
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_baseboard02.tga
+               map textures/exx/panel/panel_metal03.tga
+               
+
        }
        {
                map $lightmap
@@ -2210,18 +1139,21 @@ textures/exx/trim-baseboard02
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard02
+textures/exx/panel-metal04
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_baseboard02.tga
+       qer_editorimage textures/exx/panel/panel_metal04.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 162
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 229
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_baseboard02.tga
+               map textures/exx/panel/panel_metal04.tga
+               
+
        }
        {
                map $lightmap
@@ -2230,17 +1162,21 @@ textures/exx/trim-baseboard02
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard03
+textures/exx/panel-metal05
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_baseboard03.tga
+       qer_editorimage textures/exx/panel/panel_metal05.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 110
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 238
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_baseboard03.tga
+               map textures/exx/panel/panel_metal05.tga
+               
+
        }
        {
                map $lightmap
@@ -2249,18 +1185,21 @@ textures/exx/trim-baseboard03
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard03
+textures/exx/panel-metalbig04
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_baseboard03.tga
+       qer_editorimage textures/exx/panel/panel_metalbig04.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 110
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 165
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_baseboard03.tga
+               map textures/exx/panel/panel_metalbig04.tga
+               
+
        }
        {
                map $lightmap
@@ -2269,17 +1208,21 @@ textures/exx/trim-baseboard03
                blendfunc filter
        }
 }
-textures/exx/trim-metalsupp01
+textures/exx/panel-metalbig04b
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_metalsupp01.tga
+       qer_editorimage textures/exx/panel/panel_metalbig04b.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 8 match8 243
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 177
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_metalsupp01.tga
+               map textures/exx/panel/panel_metalbig04b.tga
+               
+
        }
        {
                map $lightmap
@@ -2288,18 +1231,21 @@ textures/exx/trim-metalsupp01
                blendfunc filter
        }
 }
-textures/exx/trim-metalsupp01
+textures/exx/panel-q201
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_metalsupp01.tga
+       qer_editorimage textures/exx/panel/panel_q201.tga
        surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 8 match8 243
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 138
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_metalsupp01.tga
+               map textures/exx/panel/panel_q201.tga
+               
+
        }
        {
                map $lightmap
@@ -2308,17 +1254,21 @@ textures/exx/trim-metalsupp01
                blendfunc filter
        }
 }
-textures/exx/trim-psimple04
+textures/exx/panel-q201b
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_psimple04.tga
+       qer_editorimage textures/exx/panel/panel_q201b.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 44
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 81
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_psimple04.tga
+               map textures/exx/panel/panel_q201b.tga
+               
+
        }
        {
                map $lightmap
@@ -2327,18 +1277,21 @@ textures/exx/trim-psimple04
                blendfunc filter
        }
 }
-textures/exx/trim-psimple04
+textures/exx/panel-q201c
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_psimple04.tga
+       qer_editorimage textures/exx/panel/panel_q201c.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 44
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 98
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_psimple04.tga
+               map textures/exx/panel/panel_q201c.tga
+               
+
        }
        {
                map $lightmap
@@ -2347,17 +1300,21 @@ textures/exx/trim-psimple04
                blendfunc filter
        }
 }
-textures/exx/trim-psimple05
+textures/exx/panel-q201d
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_psimple05.tga
+       qer_editorimage textures/exx/panel/panel_q201d.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 230
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 189
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_psimple05.tga
+               map textures/exx/panel/panel_q201d.tga
+               
+
        }
        {
                map $lightmap
@@ -2366,18 +1323,21 @@ textures/exx/trim-psimple05
                blendfunc filter
        }
 }
-textures/exx/trim-psimple05
+textures/exx/panel-q201e
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_psimple05.tga
+       qer_editorimage textures/exx/panel/panel_q201e.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 230
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 132
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_psimple05.tga
+               map textures/exx/panel/panel_q201e.tga
+               
+
        }
        {
                map $lightmap
@@ -2386,17 +1346,21 @@ textures/exx/trim-psimple05
                blendfunc filter
        }
 }
-textures/exx/trim-simple01
+textures/exx/panel-rs01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_simple01.tga
+       qer_editorimage textures/exx/panel/panel_rs01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 213
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 178
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_simple01.tga
+               map textures/exx/panel/panel_rs01.tga
+               
+
        }
        {
                map $lightmap
@@ -2405,18 +1369,21 @@ textures/exx/trim-simple01
                blendfunc filter
        }
 }
-textures/exx/trim-simple01
+textures/exx/trim-01
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_simple01.tga
+       qer_editorimage textures/exx/trim/trim_01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 213
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 169
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_simple01.tga
+               map textures/exx/trim/trim_01.tga
+               
+
        }
        {
                map $lightmap
@@ -2425,18 +1392,21 @@ textures/exx/trim-simple01
                blendfunc filter
        }
 }
-textures/exx/trim-simple03
+textures/exx/trim-baseboard
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_simple03.tga
+       qer_editorimage textures/exx/trim/trim_baseboard.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 142
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 181
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_simple03.tga
+               map textures/exx/trim/trim_baseboard.tga                
        }
+
        {
                map $lightmap
                rgbGen identity
@@ -2444,18 +1414,21 @@ textures/exx/trim-simple03
                blendfunc filter
        }
 }
-textures/exx/trim-simple03
+textures/exx/trim-baseboard02
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_simple03.tga
+       qer_editorimage textures/exx/trim/trim_baseboard02.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 142
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 162
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_simple03.tga
+               map textures/exx/trim/trim_baseboard02.tga
+               
+
        }
        {
                map $lightmap
@@ -2464,17 +1437,21 @@ textures/exx/trim-simple03
                blendfunc filter
        }
 }
-textures/exx/trim-steptop01
+textures/exx/trim-baseboard03
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_steptop01.tga
+       qer_editorimage textures/exx/trim/trim_baseboard03.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 140
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_steptop01.tga
+               map textures/exx/trim/trim_baseboard03.tga
+               
+
        }
        {
                map $lightmap
@@ -2483,18 +1460,21 @@ textures/exx/trim-steptop01
                blendfunc filter
        }
 }
-textures/exx/trim-steptop01
+textures/exx/trim-metalsupp01
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_steptop01.tga
+       qer_editorimage textures/exx/trim/trim_metalsupp01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 0.75
-       dpoffsetmapping - 2 match8 140
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  2
+       dpoffsetmapping - 8 match8 243
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_steptop01.tga
+               map textures/exx/trim/trim_metalsupp01.tga
+               
+
        }
        {
                map $lightmap
@@ -2503,17 +1483,21 @@ textures/exx/trim-steptop01
                blendfunc filter
        }
 }
-textures/exx/trim-support03
+textures/exx/trim-psimple04
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_support03.tga
+       qer_editorimage textures/exx/trim/trim_psimple04.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 111
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 44
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_support03.tga
+               map textures/exx/trim/trim_psimple04.tga
+               
+
        }
        {
                map $lightmap
@@ -2522,18 +1506,21 @@ textures/exx/trim-support03
                blendfunc filter
        }
 }
-textures/exx/trim-support03
+textures/exx/trim-psimple05
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_support03.tga
+       qer_editorimage textures/exx/trim/trim_psimple05.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 111
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 230
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_support03.tga
+               map textures/exx/trim/trim_psimple05.tga
+               
+
        }
        {
                map $lightmap
@@ -2542,17 +1529,21 @@ textures/exx/trim-support03
                blendfunc filter
        }
 }
-textures/exx/trim-vert01
+textures/exx/trim-simple01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_vert01.tga
+       qer_editorimage textures/exx/trim/trim_simple01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 231
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  1.75
+       dpoffsetmapping - 2 match8 213
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_vert01.tga
+               map textures/exx/trim/trim_simple01.tga
+               
+
        }
        {
                map $lightmap
@@ -2561,18 +1552,21 @@ textures/exx/trim-vert01
                blendfunc filter
        }
 }
-textures/exx/trim-vert01
+textures/exx/trim-simple03
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_vert01.tga
+       qer_editorimage textures/exx/trim/trim_simple03.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 231
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 142
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_vert01.tga
+               map textures/exx/trim/trim_simple03.tga
+               
+
        }
        {
                map $lightmap
@@ -2581,17 +1575,21 @@ textures/exx/trim-vert01
                blendfunc filter
        }
 }
-textures/exx/trim-horz01
+textures/exx/trim-steptop01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/trim/trim_horz01.tga
+       qer_editorimage textures/exx/trim/trim_steptop01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 231
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 140
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_horz01.tga
+               map textures/exx/trim/trim_steptop01.tga
+               
+
        }
        {
                map $lightmap
@@ -2600,18 +1598,21 @@ textures/exx/trim-horz01
                blendfunc filter
        }
 }
-textures/exx/trim-horz01
+textures/exx/trim-support03
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/trim/trim_horz01.tga
+       qer_editorimage textures/exx/trim/trim_support03.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.5
-       dpoffsetmapping - 2 match8 231
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 111
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/trim/trim_horz01.tga
+               map textures/exx/trim/trim_support03.tga
+               
+
        }
        {
                map $lightmap
@@ -2620,17 +1621,21 @@ textures/exx/trim-horz01
                blendfunc filter
        }
 }
-textures/exx/wall-bigrib02
+textures/exx/trim-vert01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_bigrib02.tga
+       qer_editorimage textures/exx/trim/trim_vert01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 250
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 231
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/wall/wall_bigrib02.tga
+               map textures/exx/trim/trim_vert01.tga
+               
+
        }
        {
                map $lightmap
@@ -2639,18 +1644,21 @@ textures/exx/wall-bigrib02
                blendfunc filter
        }
 }
-textures/exx/wall-bigrib02
+textures/exx/trim-horz01
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
-       qer_editorimage textures/exx/wall/wall_bigrib02.tga
+       qer_editorimage textures/exx/trim/trim_horz01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 250
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 231
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/wall/wall_bigrib02.tga
+               map textures/exx/trim/trim_horz01.tga
+               
+
        }
        {
                map $lightmap
@@ -2659,17 +1667,22 @@ textures/exx/wall-bigrib02
                blendfunc filter
        }
 }
-textures/exx/wall-bplate06
+
+textures/exx/wall-bigrib02
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_bplate06.tga
+       qer_editorimage textures/exx/wall/wall_bigrib02.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 8 match8 114
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       q3map_bounceScale  1.75
+       dpoffsetmapping - 2 match8 250
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
-               map textures/exx/wall/wall_bplate06.tga
+               map textures/exx/wall/wall_bigrib02.tga
+               
+
        }
        {
                map $lightmap
@@ -2680,16 +1693,19 @@ textures/exx/wall-bplate06
 }
 textures/exx/wall-bplate06
 {
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_bplate06.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
+       q3map_bounceScale  1.75
        dpoffsetmapping - 8 match8 114
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_bplate06.tga
+               
+
        }
        {
                map $lightmap
@@ -2701,12 +1717,17 @@ textures/exx/wall-bplate06
 textures/exx/wall-crete01
 {
        qer_editorimage textures/exx/wall/wall_crete01.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 44
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/wall/wall_crete01.tga
+               
+
        }
        {
                map $lightmap
@@ -2718,12 +1739,17 @@ textures/exx/wall-crete01
 textures/exx/wall-crete02
 {
        qer_editorimage textures/exx/wall/wall_crete02.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 242
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/wall/wall_crete02.tga
+               
+
        }
        {
                map $lightmap
@@ -2735,12 +1761,17 @@ textures/exx/wall-crete02
 textures/exx/wall-crete03
 {
        qer_editorimage textures/exx/wall/wall_crete03.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 233
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/wall/wall_crete03.tga
+               
+
        }
        {
                map $lightmap
@@ -2752,12 +1783,17 @@ textures/exx/wall-crete03
 textures/exx/wall-crete03b
 {
        qer_editorimage textures/exx/wall/wall_crete03b.tga
-       q3map_bounceScale 0.5
+       
+       q3map_bounceScale  0.5
        dpoffsetmapping - 2 match8 38
-       dpglossintensitymod 1
-       dpglossexponentmod 1
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
        {
                map textures/exx/wall/wall_crete03b.tga
+               
+
        }
        {
                map $lightmap
@@ -2768,35 +1804,19 @@ textures/exx/wall-crete03b
 }
 textures/exx/wall-des01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_des01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 55
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_des01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-des01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_des01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 1.75
+
+       surfaceparm metalsteps  
+       q3map_bounceScale  1.75
        dpoffsetmapping - 2 match8 55
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_des01.tga
+               
+
        }
        {
                map $lightmap
@@ -2807,35 +1827,19 @@ textures/exx/wall-des01
 }
 textures/exx/wall-metal01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_metal01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 225
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_metal01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-metal01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metal01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 225
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_metal01.tga
+               
+
        }
        {
                map $lightmap
@@ -2846,35 +1850,19 @@ textures/exx/wall-metal01
 }
 textures/exx/wall-metal01b
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_metal01b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 225
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_metal01b.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-metal01b
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metal01b.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 225
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_metal01b.tga
+               
+
        }
        {
                map $lightmap
@@ -2886,13 +1874,18 @@ textures/exx/wall-metal01b
 textures/exx/wall-metal01c
 {
        qer_editorimage textures/exx/wall/wall_metal01c.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 225
-       dpglossintensitymod 3
-       dpglossexponentmod 4
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_metal01c.tga
+               
+
        }
        {
                map $lightmap
@@ -2903,35 +1896,19 @@ textures/exx/wall-metal01c
 }
 textures/exx/wall-metal02
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_metal02.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 177
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_metal02.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-metal02
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metal02.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 177
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_metal02.tga
+               
+
        }
        {
                map $lightmap
@@ -2942,35 +1919,19 @@ textures/exx/wall-metal02
 }
 textures/exx/wall-metalb01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_metalb01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 1 match8 37
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_metalb01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-metalb01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metalb01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 1 match8 37
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_metalb01.tga
+               
+
        }
        {
                map $lightmap
@@ -2981,35 +1942,19 @@ textures/exx/wall-metalb01
 }
 textures/exx/wall-metalrib01
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_metalrib01.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 2
-       dpoffsetmapping - 2 match8 216
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_metalrib01.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-metalrib01
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metalrib01.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 2
+       q3map_bounceScale  2
        dpoffsetmapping - 2 match8 216
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_metalrib01.tga
+               
+
        }
        {
                map $lightmap
@@ -3020,35 +1965,19 @@ textures/exx/wall-metalrib01
 }
 textures/exx/wall-panel05
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_panel05.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 66
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_panel05.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-panel05
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_panel05.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
+       q3map_bounceScale  1.75
        dpoffsetmapping - 2 match8 66
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_panel05.tga
+               
+
        }
        {
                map $lightmap
@@ -3059,35 +1988,19 @@ textures/exx/wall-panel05
 }
 textures/exx/wall-panels08
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_panels08.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 195
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_panels08.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-panels08
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_panels08.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
+       q3map_bounceScale  1.75
        dpoffsetmapping - 2 match8 195
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_panels08.tga
+               
+
        }
        {
                map $lightmap
@@ -3098,35 +2011,19 @@ textures/exx/wall-panels08
 }
 textures/exx/wall-panels08b
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_panels08b.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 195
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_panels08b.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-panels08b
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_panels08b.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
+       q3map_bounceScale  1.75
        dpoffsetmapping - 2 match8 195
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_panels08b.tga
+               
+
        }
        {
                map $lightmap
@@ -3137,35 +2034,19 @@ textures/exx/wall-panels08b
 }
 textures/exx/wall-pipe
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_pipe.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 1.25
-       dpoffsetmapping - 2 match8 157
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_pipe.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-pipe
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_pipe.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.25
+       q3map_bounceScale  1.25
        dpoffsetmapping - 2 match8 157
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_pipe.tga
+               
+
        }
        {
                map $lightmap
@@ -3176,35 +2057,19 @@ textures/exx/wall-pipe
 }
 textures/exx/wall-u207
 {
-       dpshaderkillifcvar cl_cubemaps_extra >= 1
-       qer_editorimage textures/exx/wall/wall_u207.tga
-       surfaceparm metalsteps
-       q3map_bounceScale 1.75
-       dpoffsetmapping - 2 match8 109
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       {
-               map textures/exx/wall/wall_u207.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/exx/wall-u207
-{
-       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_u207.tga
+       
        surfaceparm metalsteps
-       q3map_bounceScale 1.75
+       q3map_bounceScale  1.75
        dpoffsetmapping - 2 match8 109
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       dpreflectcube env/exomorph/exomorph
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
        {
                map textures/exx/wall/wall_u207.tga
+               
+
        }
        {
                map $lightmap