2 files changed, 70 insertions, 10 deletions

diff --git a/maps/p0_master.map b/maps/p0_master.map
new file mode 100644
index 0000000..a11412b
--- /dev/null
+++ b/maps/p0_master.map
@@ -0,0 +1,69 @@
+
+// entity 0
+{
+"classname" "worldspawn"
+"message" "An Almango"
+// brush 0
+{
+( 72 -64 -320 ) ( 64 -64 -320 ) ( 72 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 72 -64 -320 ) ( 72 64 -320 ) ( 72 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 72 -64 -320 ) ( 72 -64 -448 ) ( 64 -64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 64 -448 ) ( 64 -64 -448 ) ( 72 64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 64 -448 ) ( 64 64 -320 ) ( 64 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 64 -448 ) ( 72 64 -448 ) ( 64 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 1
+{
+( -64 -64 -320 ) ( -72 -64 -320 ) ( -64 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -320 ) ( -64 64 -320 ) ( -64 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -320 ) ( -64 -64 -448 ) ( -72 -64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -72 64 -448 ) ( -72 -64 -448 ) ( -64 64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -72 64 -448 ) ( -72 64 -320 ) ( -72 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -72 64 -448 ) ( -64 64 -448 ) ( -72 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 2
+{
+( 64 64 -448 ) ( 64 -64 -448 ) ( -64 64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 64 -448 ) ( -64 64 -448 ) ( 64 64 -456 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 64 -448 ) ( 64 64 -456 ) ( 64 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -456 ) ( 64 -64 -456 ) ( -64 64 -456 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -456 ) ( -64 -64 -448 ) ( 64 -64 -456 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -456 ) ( -64 64 -456 ) ( -64 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 3
+{
+( 64 -64 -320 ) ( 64 -72 -320 ) ( -64 -64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 -64 -320 ) ( -64 -64 -320 ) ( 64 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 -64 -320 ) ( 64 -64 -448 ) ( 64 -72 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -72 -448 ) ( 64 -72 -448 ) ( -64 -64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -72 -448 ) ( -64 -72 -320 ) ( 64 -72 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -72 -448 ) ( -64 -64 -448 ) ( -64 -72 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 4
+{
+( 64 64 -312 ) ( 64 -64 -312 ) ( -64 64 -312 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 64 -312 ) ( -64 64 -312 ) ( 64 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 64 -312 ) ( 64 64 -320 ) ( 64 -64 -312 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -320 ) ( 64 -64 -320 ) ( -64 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -320 ) ( -64 -64 -312 ) ( 64 -64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 -64 -320 ) ( -64 64 -320 ) ( -64 -64 -312 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 5
+{
+( 64 72 -320 ) ( 64 64 -320 ) ( -64 72 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 72 -320 ) ( -64 72 -320 ) ( 64 72 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 72 -320 ) ( 64 72 -448 ) ( 64 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 64 -448 ) ( 64 64 -448 ) ( -64 72 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 64 -448 ) ( -64 64 -320 ) ( 64 64 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -64 64 -448 ) ( -64 72 -448 ) ( -64 64 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+}
+// entity 1
+{
+"classname" "func_timer"
+"origin" "0.000000 0.000000 -384.000000"
+"spawnflags" "1"
+"target" "global_announcement"
+"wait" "120"
+"random" "60"
+}
diff --git a/maps/p2_clockroom.map b/maps/p2_clockroom.map
index 10ee93a..ce928ec 100644
--- a/maps/p2_clockroom.map
+++ b/maps/p2_clockroom.map
@@ -5264,15 +5264,6 @@ nexus6/barrel_rst_top
 {
 "classname" "target_speaker"
 "origin" "128.000000 -1080.000000 64.000000"
-"targetname" "global_speaker"
+"targetname" "global_announcement"
 "noise" "sound/analmango/analmango.wav"
 }
-// entity 35
-{
-"classname" "func_timer"
-"origin" "184.000000 -1000.000000 64.000000"
-"target" "global_speaker"
-"spawnflags" "1"
-"wait" "120"
-"random" "60"
-}