4 files changed, 86 insertions, 19 deletions
diff --git a/CREDITS b/CREDITS
index 3ddda90..4fe7717 100644
--- a/CREDITS
+++ b/CREDITS
@@ -19,3 +19,11 @@ Several images contain text made with the following font:
 
 sound/analmango/hpc.wav was ripped from one of Hydraulic Press Channel videos
 	I hope they won't mind.
+
+sound/analmango/elevator.wav was created from the following sound:
+	http://freesound.org/people/tsbertalan/sounds/77789/
+	"Elevator door opening and closing, elevator ascending two floors.WAV"
+	by Tom Bertalan, CC 0
+
+sound/analmango/chaccaron.wav is a sample of the Chaccaron Maccaron.
+	I hope they won't mind.
diff --git a/maps/p6_engineering.map b/maps/p6_engineering.map
index cf30c31..55468e0 100644
--- a/maps/p6_engineering.map
+++ b/maps/p6_engineering.map
@@ -5158,6 +5158,15 @@ nexus6/barrel_rst_top
 ( 472 -2640 -328 ) ( 424 -2176 -328 ) ( 472 -2176 -328 ) niveus/e8xgirder_s 21.3332977295 236.9122467041 0 0.375 0.375 134217728 0 0
 ( 472 -2176 -376 ) ( 424 -2176 -328 ) ( 424 -2176 -376 ) common/caulk 0 48 0 0.5 0.5 134217728 0 0
 }
+// brush 555
+{
+( 8 -2792 -512 ) ( 8 -2816 -512 ) ( -8 -2792 -512 ) common/clip 0 0 0 0.5 0.5 134217728 0 0
+( 8 -2792 -512 ) ( -8 -2792 -512 ) ( 8 -2792 -520 ) common/clip 0 48 0 0.5 0.5 134217728 0 0
+( 8 -2792 -512 ) ( 8 -2792 -520 ) ( 8 -2816 -512 ) common/clip 0 48 0 0.5 0.5 134217728 0 0
+( -8 -2816 -536 ) ( 8 -2816 -536 ) ( -8 -2792 -536 ) common/clip 0 0 0 0.5 0.5 134217728 0 0
+( -8 -2816 -520 ) ( -8 -2816 -512 ) ( 8 -2816 -520 ) common/clip 0 48 0 0.5 0.5 134217728 0 0
+( -16 -2816 -520 ) ( -16 -2792 -520 ) ( -16 -2816 -512 ) common/clip 0 48 0 0.5 0.5 134217728 0 0
+}
 }
 // entity 1
 {
@@ -5267,9 +5276,9 @@ nexus6/barrel_rst_top
 {
 "classname" "func_door"
 "targetname" "antilift_1"
-"lip" "654"
+"lip" "658"
 "angle" "-2"
-"wait" "6"
+"wait" "5"
 "sound1to2" "sound/null.wav"
 "sound2to1" "sound/null.wav"
 "soundPos1" "sound/null.wav"
@@ -5978,6 +5987,7 @@ nexus6/barrel_rst_top
 "angle" "270"
 "target" "antilift_1"
 "lip" "3"
+"wait" "7"
 // brush 0
 {
 ( 46 -2824 -596 ) ( 50 -2820 -596 ) ( 50 -2824 -596 ) nexus6/blackwall 0 80 0 0.25 0.25 0 0 0
@@ -5994,19 +6004,12 @@ nexus6/barrel_rst_top
 }
 // entity 18
 {
-"classname" "target_delay"
-"origin" "16.000000 -2720.000000 -576.000000"
-"targetname" "antilift_1"
-"target" "antilift_2"
-"wait" "1.5"
-}
-// entity 19
-{
 "classname" "func_door"
 "angle" "-1"
 "targetname" "antilift_1"
-"spawnflags" "1"
-"wait" "6"
+"spawnflags" "5"
+"wait" "7"
+"speed" "800"
 // brush 0
 {
 ( 160 -2720 -512 ) ( 144 -2784 -512 ) ( 144 -2720 -512 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6035,12 +6038,14 @@ nexus6/barrel_rst_top
 ( 160 -2784 -640 ) ( 144 -2784 -512 ) ( 144 -2784 -640 ) common/caulk 0 -0 0 0.5 0.5 0 0 0
 }
 }
-// entity 20
+// entity 19
 {
 "classname" "func_door"
 "angle" "-1"
-"targetname" "antilift_2"
-"wait" "4.5"
+"targetname" "antilift_2b"
+"wait" "2"
+"spawnflags" "4"
+"speed" "800"
 // brush 0
 {
 ( -48 -2784 -512 ) ( -64 -2800 -512 ) ( -64 -2784 -512 ) common/caulk 32 0 0 0.5 0.5 0 0 0
@@ -6069,7 +6074,7 @@ nexus6/barrel_rst_top
 ( -48 -2720 -512 ) ( -64 -2720 -640 ) ( -64 -2720 -512 ) common/caulk 32 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 21
+// entity 20
 {
 "classname" "func_door"
 "targetname" "func_door1"
@@ -6103,7 +6108,7 @@ nexus6/barrel_rst_top
 ( 160 -2608 -112 ) ( 144 -2608 16 ) ( 144 -2608 -112 ) common/caulk 0 32 0 0.5 0.5 0 0 0
 }
 }
-// entity 22
+// entity 21
 {
 "classname" "trigger_multiple"
 "target" "func_door1"
@@ -6117,16 +6122,70 @@ nexus6/barrel_rst_top
 ( 96 -2624 -112 ) ( 96 -2528 -112 ) ( 96 -2624 16 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 23
+// entity 22
 {
 "classname" "light"
 "origin" "48.000000 -2752.000000 -360.000000"
 "light" "25"
 "_color" "1 0.0185092 0"
 }
-// entity 24
+// entity 23
 {
 "classname" "team_human_reactor"
 "origin" "416.000000 -2784.000000 -576.000000"
 "mapcat_discard" " "
 }
+// entity 24
+{
+"classname" "target_speaker"
+"origin" "-8.000000 -2808.000000 -528.000000"
+"noise" "sound/analmango/chaccaron.wav"
+"spawnflags" "1"
+}
+// entity 25
+{
+"classname" "target_delay"
+"origin" "16.000000 -2720.000000 -576.000000"
+"targetname" "antilift_1"
+"target" "antilift_2b"
+"wait" "2.5"
+}
+// entity 26
+{
+"classname" "target_delay"
+"origin" "16.000000 -2720.000000 -576.000000"
+"targetname" "antilift_1"
+"target" "antilift_2"
+"wait" "2.5"
+}
+// entity 27
+{
+"classname" "target_speaker"
+"origin" "48.000000 -2752.000000 -544.000000"
+"noise" "sound/analmango/elevator.wav"
+"targetname" "antilift_15"
+}
+// entity 28
+{
+"classname" "target_delay"
+"origin" "72.000000 -2720.000000 -544.000000"
+"targetname" "antilift_1"
+"target" "antilift_15"
+"wait" "5.2"
+}
+// entity 29
+{
+"classname" "target_delay"
+"origin" "72.000000 -2720.000000 -576.000000"
+"targetname" "antilift_1"
+"target" "antilift_15"
+"wait" "0.2"
+}
+// entity 30
+{
+"classname" "misc_model"
+"origin" "-8.000000 -2808.000000 -512.000000"
+"model" "models/mapobjects/analmango/speaker.md3"
+"angle" "45.000000"
+"modelscale" "0.600000"
+}
diff --git a/sound/analmango/chaccaron.wav b/sound/analmango/chaccaron.wav
new file mode 100644
index 0000000..5494dab
--- /dev/null
+++ b/sound/analmango/chaccaron.wav
diff --git a/sound/analmango/elevator.wav b/sound/analmango/elevator.wav
new file mode 100644
index 0000000..7ea5f3c
--- /dev/null
+++ b/sound/analmango/elevator.wav