Merge branch 'Mirio/dance' into 'master'

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

diff --git a/maps/atelier.map b/maps/atelier.map
index 908419fcd8add596af8ac9e4fa786e71b4e61c2f..c2d9f0d8e45a1a637db7a56e9fcf1415e77d0cdd 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -17327,11 +17327,11 @@ trak5x/base-pipe1d
 }
 {
 ( -776 952 312 ) ( -760 824 312 ) ( -760 952 312 ) exx/trim-01 13.7662734985 127.3338394165 45 0.25 0.25 134217728 0 0
-( -1032 1072 312 ) ( -1024 1088 312 ) ( -1024 1088 440 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
-( -760 824 440 ) ( -880 944 440 ) ( -880 944 312 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( -1068 1108 320 ) ( -1068 1108 312 ) ( -1056 1120 312 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
+( -1056 1120 320 ) ( -1056 1120 312 ) ( -832 896 312 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 ( -776 952 320 ) ( -760 824 320 ) ( -776 824 320 ) common/caulk 32 192 0 0.25 0.25 134217728 0 0
 ( -832 896 312 ) ( -848 888 312 ) ( -848 888 440 ) common/caulk 64 32 0 0.25 -0.25 134217728 0 0
-( -776 816 312 ) ( -888 928 312 ) ( -888 928 440 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( -1068 1108 312 ) ( -1068 1108 320 ) ( -848 888 320 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 }
 {
 ( -928 352 768 ) ( -928 128 768 ) ( -992 352 768 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
@@ -17530,11 +17530,11 @@ trak5x/base-pipe1d
 }
 {
 ( -264 952 312 ) ( -264 824 312 ) ( -248 952 312 ) exx/trim-01 61.4566879272 303.0244140625 135 0.25 -0.25 134217728 0 0
-( 0 1088 440 ) ( 0 1088 312 ) ( 8 1072 312 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
-( -144 944 312 ) ( -144 944 440 ) ( -264 824 440 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( 44 1108 312 ) ( 44 1108 320 ) ( 32 1120 320 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
+( 32 1120 312 ) ( 32 1120 320 ) ( -192 896 320 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 ( -248 824 320 ) ( -264 824 320 ) ( -248 952 320 ) common/caulk 32 192 0 -0.25 0.25 134217728 0 0
 ( -176 888 440 ) ( -176 888 312 ) ( -192 896 312 ) common/caulk 64 32 180 0.25 0.25 134217728 0 0
-( -136 928 440 ) ( -136 928 312 ) ( -248 816 312 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( 44 1108 320 ) ( 44 1108 312 ) ( -176 888 320 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 }
 {
 ( -32 352 768 ) ( -96 128 768 ) ( -96 352 768 ) common/caulk 128 0 0 -0.25 0.25 134217728 0 0
@@ -36835,7 +36835,7 @@ exx/base-metal01
 "origin" "128.000000 -1152.000000 416.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-1792.000000 768.000000 320.000000"
 }
 {
@@ -36867,7 +36867,7 @@ exx/base-metal01
 "origin" "-352.000000 -354.000000 512.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "960.000000 -960.000000 192.000000"
 }
 {
@@ -36895,7 +36895,7 @@ exx/base-metal01
 "origin" "800.000000 96.000000 512.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "800.000000 1024.000000 128.000000"
 }
 {
@@ -39966,49 +39966,49 @@ common/clip
 {
 "classname" "target_speaker"
 "origin" "1032.000000 672.000000 656.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "-624.000000 832.000000 488.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "-400.000000 832.000000 488.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "-1544.000000 920.000000 488.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "-1544.000000 608.000000 488.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "-152.000000 -1000.000000 584.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "-144.000000 -1296.000000 584.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "400.000000 -1000.000000 584.000000"
-"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"noise" "sound/machines/fluorescent_stereo_looped.wav"
 "spawnflags" "1"
 }
 {