Merge branch 'master' into fruitiex/stormkeepsounds

diff --cc maps/stormkeep.map
index fd92d2e812f59668d587d8e5b626dcadde272ad0,da2b8e83e1849f7ec1a249a72b4372fe6c1172ae..08058767e876f31300adc276cabac5647d4587f9
--- 1/maps/stormkeep.map
--- 2/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@@ -10199,43 -9071,38 +9071,38 @@@ exx/base-metal0
  ( -656 832 320 ) ( -720 832 320 ) ( -720 832 288 ) common/caulk 0 0 0 0.25 0.25 0 4 0
  ( -384 360 320 ) ( -384 480 320 ) ( -384 480 288 ) exx/trim-psimple04 0 0 90 0.25 0.25 0 0 0
  }
- // brush 1126
  {
 -( 2304 -2048 1280 ) ( -1344 -2112 1280 ) ( -1344 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1344 -2112 1280 ) ( -1344 -2048 -1024 ) ( -1344 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 -2048 -1024 ) ( -1344 -2048 1280 ) ( -1344 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 -2112 -1024 ) ( -1344 -2048 -1024 ) ( -1344 -2112 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 -2048 1280 ) ( 2304 -2112 -1024 ) ( 2304 -2112 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 -2112 1280 ) ( -1344 -2112 -1024 ) ( -1344 -2112 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2048 1280 ) ( -1344 -2112 1280 ) ( -1344 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1344 -2112 1280 ) ( -1344 -2048 -1024 ) ( -1344 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2048 -1024 ) ( -1344 -2048 1280 ) ( -1344 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2112 -1024 ) ( -1344 -2048 -1024 ) ( -1344 -2112 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2048 1280 ) ( 2304 -2112 -1024 ) ( 2304 -2112 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2112 1280 ) ( -1344 -2112 -1024 ) ( -1344 -2112 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
  }
- // brush 1127
  {
 -( 2304 1152 1280 ) ( 2368 -2048 1280 ) ( 2304 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2368 -2048 1280 ) ( 2304 -2048 -1024 ) ( 2304 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1152 -1024 ) ( 2304 -2048 1280 ) ( 2304 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2368 1152 -1024 ) ( 2304 -2048 -1024 ) ( 2368 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1152 1280 ) ( 2368 1152 320 ) ( 2368 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2368 1152 1280 ) ( 2368 -2048 -1024 ) ( 2368 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 +( 2304 1152 1280 ) ( 2368 -2048 1280 ) ( 2304 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2368 -2048 1280 ) ( 2304 -2048 -1024 ) ( 2304 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1152 -1024 ) ( 2304 -2048 1280 ) ( 2304 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2368 1152 -1024 ) ( 2304 -2048 -1024 ) ( 2368 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1152 1280 ) ( 2368 1152 320 ) ( 2368 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2368 1152 1280 ) ( 2368 -2048 -1024 ) ( 2368 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
  }
- // brush 1128
  {
 -( -1344 -2048 1280 ) ( -1408 -2048 1280 ) ( -1408 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1344 1152 -1024 ) ( -1408 1152 1280 ) ( -1408 1152 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1344 -2048 -1024 ) ( -1344 1152 1280 ) ( -1344 1152 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1344 -2048 -1024 ) ( -1408 1152 -1024 ) ( -1408 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1344 -2048 1280 ) ( -1408 -2048 -1024 ) ( -1408 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1408 -2048 1280 ) ( -1408 1152 -1024 ) ( -1408 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 +( -1344 -2048 1280 ) ( -1408 -2048 1280 ) ( -1408 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1344 1152 -1024 ) ( -1408 1152 1280 ) ( -1408 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1344 -2048 -1024 ) ( -1344 1152 1280 ) ( -1344 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1344 -2048 -1024 ) ( -1408 1152 -1024 ) ( -1408 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1344 -2048 1280 ) ( -1408 -2048 -1024 ) ( -1408 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1408 -2048 1280 ) ( -1408 1152 -1024 ) ( -1408 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
  }
- // brush 1129
  {
 -( 2304 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1216 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1216 1280 ) ( 2304 1152 320 ) ( 2304 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1152 1280 ) ( -1344 1152 320 ) ( -1344 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1152 320 ) ( -1344 1216 320 ) ( -1344 1152 320 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1344 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1152 320 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1216 320 ) ( -1344 1216 1280 ) ( -1344 1216 320 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 +( 2304 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1216 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1216 1280 ) ( 2304 1152 320 ) ( 2304 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1152 1280 ) ( -1344 1152 320 ) ( -1344 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1152 320 ) ( -1344 1216 320 ) ( -1344 1152 320 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1344 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1152 320 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1216 320 ) ( -1344 1216 1280 ) ( -1344 1216 320 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
  }
- // brush 1130
  {
  ( 2272 -2048 1280 ) ( -1376 -2048 1280 ) ( -1376 1152 1280 ) common/clip 64 0 0 0.5 0.5 0 0 0
  ( 2304 1152 320 ) ( -1344 1152 352 ) ( -1344 1152 320 ) common/clip 0 0 0 0.5 0.5 0 0 0
@@@ -10244,16 -9111,14 +9111,14 @@@
  ( 2304 -2048 352 ) ( -1344 -2048 320 ) ( -1344 -2048 352 ) common/clip 0 0 0 0.5 0.5 0 0 0
  ( -1344 -2048 352 ) ( -1344 1152 320 ) ( -1344 1152 352 ) common/clip 0 0 0 0.5 0.5 0 0 0
  }
- // brush 1131
  {
 -( 2304 -2048 1344 ) ( -1344 -2048 1344 ) ( -1344 1152 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1152 1280 ) ( -1344 1152 1344 ) ( -1344 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 1152 1344 ) ( 2304 -2048 1280 ) ( 2304 -2048 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 -2048 1280 ) ( -1344 1152 1280 ) ( -1344 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( 2304 -2048 1344 ) ( -1344 -2048 1280 ) ( -1344 -2048 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 -( -1344 -2048 1344 ) ( -1344 1152 1280 ) ( -1344 1152 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2048 1344 ) ( -1344 -2048 1344 ) ( -1344 1152 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1152 1280 ) ( -1344 1152 1344 ) ( -1344 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 1152 1344 ) ( 2304 -2048 1280 ) ( 2304 -2048 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2048 1280 ) ( -1344 1152 1280 ) ( -1344 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( 2304 -2048 1344 ) ( -1344 -2048 1280 ) ( -1344 -2048 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 +( -1344 -2048 1344 ) ( -1344 1152 1280 ) ( -1344 1152 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
  }
- // brush 1132
  {
  ( 448 -128 -192 ) ( 448 -1024 -192 ) ( -128 -128 -192 ) exx/floor-metal02 0 0 0 0.25 0.25 0 0 0
  ( 448 16 -192 ) ( -128 16 -192 ) ( 448 16 -224 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@@ -12694,25 -11313,22 +11313,22 @@@ exx/floor-metal0
  ( -1344 -512 -960 ) ( -1344 1152 -960 ) ( -1344 -512 -384 ) exx/floor-wrn01 0 0 0 0.5 0.5 0 0 0
  ( -64 -448 -896 ) ( -64 -256 -896 ) ( 64 -448 -896 ) common/caulk 0 0 0 0.5 0.5 0 0 0
  }
- // brush 1379
  {
 -( 2304 1088 -384 ) ( 2304 1024 -384 ) ( 1920 1088 -384 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 2304 1216 1280 ) ( 1920 1216 1280 ) ( 2304 1216 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 2304 1216 1280 ) ( 2304 1216 -1024 ) ( 2304 1152 1280 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 1920 1152 -1024 ) ( 2304 1152 -1024 ) ( 1920 1216 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 1920 1152 -1024 ) ( 1920 1152 1280 ) ( 2304 1152 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 1536 1216 -1024 ) ( 1536 1280 -1024 ) ( 1536 1216 1280 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 +( 2304 1088 -384 ) ( 2304 1024 -384 ) ( 1920 1088 -384 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 2304 1216 1280 ) ( 1920 1216 1280 ) ( 2304 1216 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 2304 1216 1280 ) ( 2304 1216 -1024 ) ( 2304 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 1920 1152 -1024 ) ( 2304 1152 -1024 ) ( 1920 1216 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 1920 1152 -1024 ) ( 1920 1152 1280 ) ( 2304 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 1536 1216 -1024 ) ( 1536 1280 -1024 ) ( 1536 1216 1280 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
  }
- // brush 1380
  {
 -( 2304 -2048 -1024 ) ( -1344 -2048 -1024 ) ( -1344 1152 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 2304 1152 -1088 ) ( -1344 1152 -1024 ) ( -1344 1152 -1088 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 2304 1152 -1024 ) ( 2304 -2048 -1088 ) ( 2304 -2048 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 2304 -2048 -1088 ) ( -1344 1152 -1088 ) ( -1344 -2048 -1088 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( 2304 -2048 -1024 ) ( -1344 -2048 -1088 ) ( -1344 -2048 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 -( -1344 -2048 -1024 ) ( -1344 1152 -1088 ) ( -1344 1152 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
 +( 2304 -2048 -1024 ) ( -1344 -2048 -1024 ) ( -1344 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 2304 1152 -1088 ) ( -1344 1152 -1024 ) ( -1344 1152 -1088 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 2304 1152 -1024 ) ( 2304 -2048 -1088 ) ( 2304 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 2304 -2048 -1088 ) ( -1344 1152 -1088 ) ( -1344 -2048 -1088 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( 2304 -2048 -1024 ) ( -1344 -2048 -1088 ) ( -1344 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 +( -1344 -2048 -1024 ) ( -1344 1152 -1088 ) ( -1344 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
  }
- // brush 1381
  {
  ( 1792 72 -128 ) ( 1792 -504 -128 ) ( 1792 -504 -136 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 4 0
  ( 2176 -960 256 ) ( 2176 -640 256 ) ( 2176 -640 0 ) exx/base-metal04 0 0 0 0.25 0.25 0 4 0
@@@ -22794,25 -20206,21 +20206,21 @@@ exx/trim-0
  {
  "classname" "target_speaker"
  "origin" "-1136.000000 432.000000 336.000000"
 -"noise" "sound/desertfactory/windoutside_loop.wav"
 +"noise" "sounds/supernatural/space-loop.wav"
  "atten" "1.5"
  }
- // entity 252
  {
  "classname" "target_speaker"
  "origin" "32.000000 336.000000 336.000000"
 -"noise" "sound/desertfactory/windoutside_loop.wav"
 +"noise" "sounds/supernatural/space-loop.wav"
  "atten" "1.5"
  }
- // entity 253
  {
  "classname" "target_speaker"
  "origin" "1200.000000 640.000000 336.000000"
 -"noise" "sound/desertfactory/windoutside_loop.wav"
 +"noise" "sounds/supernatural/space-loop.wav"
  "atten" "1.5"
  }
- // entity 254
  {
  "classname" "target_speaker"
  "origin" "1184.000000 640.000000 -16.000000"
@@@ -22823,11 -20231,9 +20231,9 @@@
  {
  "classname" "target_speaker"
  "origin" "-416.000000 -672.000000 -16.000000"
 -"noise" "sound/desertfactory/machinevat_loop.wav"
 +"noise" "sounds/machines/Slime_Bubbling.wav"
  "atten" "3"
  }
- // entity 256
  {
  "classname" "target_speaker"
  "origin" "1712.000000 -224.000000 -208.000000"