Merge branch 'master' into pending-release

[xonotic/xonotic-maps.pk3dir.git] / maps / glowplant.map

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 194b62b85e02df67374e476337b71a2b0305cb4f..96395ff2177b51ab1180668d594aa60b6fd30cfe 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -10918,12 +10918,12 @@ common/clip
 ( -1632 -736 64 ) ( -1504 -736 64 ) ( -1504 -600 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 }
 {
-( -1054 -800 62 ) ( -1017 -800 192 ) ( -1017 -672 192 ) common/full_clip 0 160 0 0.25 0.2403180003 134217728 5 0
+( -1054 -800 62 ) ( -1017 -800 192 ) ( -1017 -672 192 ) common/weapclip 0 160 0 0.25 0.2403180003 134217728 5 0
 ( -1024 -672 195 ) ( -1024 -800 195 ) ( -1062 -800 64 ) exx/floor-grate01 -127 297 -180 0.25 -0.2403109968 134217728 256 0
-( -1044 -680 67 ) ( -1067 -680 74 ) ( -1067 -808 74 ) common/full_clip 0 7 90 0.25 -0.2402949929 134217728 5 0
-( -1009 -672 190 ) ( -1032 -672 197 ) ( -1069 -672 66 ) common/full_clip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
-( -1009 -800 190 ) ( -1032 -800 197 ) ( -1032 -672 197 ) common/full_clip 0 -101 90 0.25 -0.2402949929 134217728 5 0
-( -1046 -800 59 ) ( -1069 -800 66 ) ( -1032 -800 197 ) common/full_clip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
+( -1044 -680 67 ) ( -1067 -680 74 ) ( -1067 -808 74 ) common/weapclip 0 7 90 0.25 -0.2402949929 134217728 5 0
+( -1009 -672 190 ) ( -1032 -672 197 ) ( -1069 -672 66 ) common/weapclip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
+( -1009 -800 190 ) ( -1032 -800 197 ) ( -1032 -672 197 ) common/weapclip 0 -101 90 0.25 -0.2402949929 134217728 5 0
+( -1046 -800 59 ) ( -1069 -800 66 ) ( -1032 -800 197 ) common/weapclip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
 }
 {
 ( -240 752 8 ) ( -264 752 136 ) ( -264 688 136 ) common/weapclip -64 -193 -180 0.25 -0.25 134217728 5 0
@@ -44768,7 +44768,7 @@ trak5x/base-pipe1a
 "mdl" "sparks"
 "impulse" "4"
 "count" "6"
-"noise" "sound/map_drain/spark.ogg"
+"noise" "sound/map_glowplant/spark.ogg"
 "velocity" "50 -100 30"
 "spawnflags" "4"
 {