Merge branch 'master' into packer/warpzones

diff --combined maps/erbium.map
index 0d4ac94409d0990fb21bb8ee1a76f7e502c03834,77fd5ab661bc13cb6934f4e42cfaa6bb521cecbc..10ee72346ac729a941ba88f3468a80dd2d828f20
--- 1/maps/erbium.map
--- 2/maps/erbium.map
+++ b/maps/erbium.map
@@@ -3,6 -3,7 +3,6 @@@
  "author" "Justin, Mirio"
  "message" "Erbium"
  "_description" "Industrial, nature... Duel!"
 -"model" "models/effects_warpzone/blueedge.md3"
  {
  brushDef
  {
@@@ -4959,17 -4960,6 +4959,6 @@@ brushDe
  {
  brushDef
  {
- ( 2144 416 660 ) ( 2144 384 660 ) ( 2128 416 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
- ( 2144 416 660 ) ( 2144 416 636 ) ( 2144 384 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
- ( 2128 384 636 ) ( 2144 384 636 ) ( 2128 416 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
- ( 2128 384 636 ) ( 2128 416 636 ) ( 2128 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
- ( 2144 388 -64 ) ( 2128 404 -64 ) ( 2144 388 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
- ( 2140 500 -64 ) ( 2144 500 -64 ) ( 2140 500 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
- }
- }
- {
- brushDef
- {
  ( 1008 248 272 ) ( 1036 174 272 ) ( 1008 174 272 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
  ( 1036 248 272 ) ( 1036 174 268 ) ( 1036 174 272 ) ( ( 0.0131578948 0 509.5263366699 ) ( 0 0.25 4 ) ) exx/trim-horz01 134217728 0 0
  ( 1036 248 268 ) ( 1008 174 268 ) ( 1036 174 268 ) ( ( 0.0135135138 0 125.648651123 ) ( 0 0.0357142873 37 ) ) phillipk2x/lights-pk02_light01a-surfacelight 134217728 0 0
@@@ -7537,7 -7527,7 +7526,7 @@@ brushDe
  ( 1968 388 660 ) ( 2288 404 660 ) ( 2296 388 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
  ( 1968 388 636 ) ( 2288 404 636 ) ( 1968 404 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
  ( 2052 388 -132 ) ( 2044 404 -132 ) ( 2052 388 -4 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
- ( 2128 404 -64 ) ( 2132 400 -64 ) ( 2128 404 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+ ( 2128 400 -64 ) ( 2128 392 -64 ) ( 2128 400 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
  }
  }
  {
@@@ -11609,8 -11599,8 +11598,8 @@@ brushDe
  ( 2144 596 144 ) ( 2144 580 144 ) ( 2144 596 272 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
  ( 2128 556 160 ) ( 2128 564 160 ) ( 2128 556 288 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
  ( 2128 404 288 ) ( 2112 404 160 ) ( 2128 404 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
- ( 2136 380 160 ) ( 2128 380 160 ) ( 2136 380 288 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
- ( 1924 400 636 ) ( 1924 392 636 ) ( 1796 400 636 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+ ( 2136 384 160 ) ( 2128 384 160 ) ( 2136 384 288 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+ ( 1924 400 636 ) ( 1924 392 636 ) ( 1796 400 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
  ( 1924 348 496 ) ( 1924 356 496 ) ( 1796 348 496 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
  }
  }
@@@ -21130,6 -21120,17 +21119,17 @@@ brushDe
  ( -488 -972 64 ) ( -487 -973 -64 ) ( -488 -972 -64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
  }
  }
+ {
+ brushDef
+ {
+ ( 2144 416 660 ) ( 2144 384 660 ) ( 2128 416 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+ ( 2144 416 660 ) ( 2144 416 636 ) ( 2144 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+ ( 2128 384 636 ) ( 2144 384 636 ) ( 2128 416 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+ ( 2128 384 636 ) ( 2128 416 636 ) ( 2128 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+ ( 2140 500 -64 ) ( 2144 500 -64 ) ( 2140 500 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+ ( 2129 384 64 ) ( 2137 384 -64 ) ( 2129 384 -64 ) ( ( 0.0078125 0 511.9921875 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+ }
+ }
  }
  {
  "classname" "info_player_deathmatch"