Merge branch 'master' into fruitiex/glowplant

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 462ec4b6c184a5651b8cbe6d17ec23698967693f..ccf2f0ea2b9267021754a4809fa1d63b8f7c8122 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -218,7 +218,7 @@
 ( -2048 1152 1216 ) ( -2048 1176 1216 ) ( -952 1176 1216 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2048 1176 576 ) ( -2048 1152 576 ) ( -952 1152 576 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2064 1168 1152 ) ( -2064 1168 576 ) ( -944 1168 576 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -960 1152 1088 ) ( -960 1152 512 ) ( -2048 1152 512 ) map_glowplant/sky 0 0 0 0.25 0.25 0 0 0
+( -960 1152 1056 ) ( -960 1152 480 ) ( -2048 1152 480 ) map_glowplant/sky 0 -0 0 0.25 0.25 0 0 0
 ( -944 1152 576 ) ( -944 1152 1152 ) ( -928 1168 1152 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2064 1168 640 ) ( -2064 1168 1216 ) ( -2048 1152 1216 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
@@ -16359,7 +16359,7 @@ map_glowplant/sand
 ( 3 3 0 0 0 )
 (
 ( ( -1280 320 8 0 0 ) ( -1280 448 8 0 -1 ) ( -1280 576 8 0 -2 ) )
-( ( -1088 320 8 1.8027756214 0 ) ( -1088 448 40 1.8027756214 -1 ) ( -1088 576 136 1.8027756214 -2 ) )
+( ( -1088 320 8 1.8027756214 0 ) ( -1088 448 41 1.8027756214 -1 ) ( -1088 576 74 1.8027756214 -2 ) )
 ( ( -896 320 8 3.6055512428 0 ) ( -896 448 8 3.6055512428 -1 ) ( -896 576 8 3.6055512428 -2 ) )
 )
 }
@@ -16382,8 +16382,8 @@ patchDef2
 map_glowplant/sand
 ( 3 7 0 0 0 )
 (
-( ( -1664 -384 8 0 0 ) ( -1664 -256 40 0 -1 ) ( -1664 -128 40 0 -2 ) ( -1664 0 104 0 -3 ) ( -1664 128 40 0 -4 ) ( -1664 256 8 0 -5 ) ( -1664 384 8 0 -6 ) )
-( ( -1376 -384 8 2.4141509533 0 ) ( -1376 -256 8 2.4141509533 -1 ) ( -1376 -128 8 2.4141509533 -2 ) ( -1376 0 -8 2.4141509533 -3 ) ( -1376 128 24 2.4141509533 -4 ) ( -1376 256 24 2.4141509533 -5 ) ( -1376 384 8 2.4141509533 -6 ) )
+( ( -1664 -384 8 0 0 ) ( -1664 -256 40 0 -1 ) ( -1664 -128 40 0 -2 ) ( -1664 0 48 0 -3 ) ( -1664 128 40 0 -4 ) ( -1664 256 8 0 -5 ) ( -1664 384 8 0 -6 ) )
+( ( -1376 -384 8 2.4141509533 0 ) ( -1376 -256 8 2.4141509533 -1 ) ( -1376 -128 8 2.4141509533 -2 ) ( -1376 0 0 2.4141509533 -3 ) ( -1376 128 24 2.4141509533 -4 ) ( -1376 256 24 2.4141509533 -5 ) ( -1376 384 8 2.4141509533 -6 ) )
 ( ( -1280 -384 8 3.1744964123 0 ) ( -1280 -256 8 3.1744964123 -1 ) ( -1280 -128 8 3.1744964123 -2 ) ( -1280 0 8 3.1744964123 -3 ) ( -1280 128 8 3.1744964123 -4 ) ( -1280 256 8 3.1744964123 -5 ) ( -1280 384 8 3.1744964123 -6 ) )
 )
 }
@@ -38159,3 +38159,21 @@ exx/floor-panel01
 "classname" "item_armor_medium"
 "origin" "192.000000 -384.000000 528.000000"
 }
+// entity 689
+{
+"classname" "target_speaker"
+"origin" "-1760.000000 128.000000 928.000000"
+"noise" "sounds/wind/Howling-Wind.wav"
+}
+// entity 690
+{
+"classname" "target_speaker"
+"origin" "640.000000 1248.000000 336.000000"
+"noise" "sounds/machines/radiostatic_loop.wav"
+}
+// entity 691
+{
+"classname" "target_speaker"
+"origin" "240.000000 -576.000000 192.000000"
+"noise" "sounds/machines/Big_machine.wav"
+}